Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 00:45:44 +01:00
Code Issues Packages Projects Releases Activity

added groups for subcommands

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-05-22 14:36:32 +02:00
parent 029aed3e82
commit 01e5e02c64
26 changed files with 87 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
View File

@@ -152,15 +152,7 @@ public class App
if ((args.length == 0) || (subcommand == null) || help)
{
parser.printUsage(output, i18n.getBundle());
output.println();
output.println(i18n.getMessage(I18n.SUBCOMMANDS_TITLE));
for (CommandDescriptor desc :
SubCommandHandler.getInstance().getDescriptors())
{
output.append(" ").println(desc.getName());
}
printHelp(parser, i18n);
}
else
{
@@ -199,6 +191,37 @@ public class App
}
}
/**
* Method description
*
*
* @param parser
* @param i18n
*/
private void printHelp(CmdLineParser parser, I18n i18n)
{
parser.printUsage(output, i18n.getBundle());
output.println();
output.println(i18n.getMessage(I18n.SUBCOMMANDS_TITLE));
output.println();
String group = null;
for (CommandDescriptor desc :
SubCommandHandler.getInstance().getDescriptors())
{
if ((group == null) ||!group.equals(desc.getGroup()))
{
output.println();
group = desc.getGroup();
output.append(i18n.getMessage(group)).println(":");
output.println();
}
output.append(" ").println(desc.getName());
}
}
//~--- fields ---------------------------------------------------------------
/** Field description */

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddMembersSubCommand.java
View File

@@ -45,7 +45,7 @@ import java.util.List;
*
* @author Sebastian Sdorra
*/
@Command("add-members")
@Command(name = "add-members", group = "group")
public class AddMembersSubCommand extends MembersSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java
View File

@@ -48,7 +48,7 @@ import java.util.List;
*
* @author Sebastian Sdorra
*/
@Command("add-permission")
@Command(name="add-permission", group="repository")
public class AddPermissionSubCommand extends PermissionSubCommand
{

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/Command.java
View File

@@ -47,6 +47,7 @@ import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME)
public @interface Command
{
String value() default "";
String name() default "";
String usage() default "";
String group() default "misc";
}

26
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CommandDescriptor.java
View File

@@ -69,7 +69,8 @@ public class CommandDescriptor implements Comparable<CommandDescriptor>
if (cmd != null)
{
this.name = cmd.value();
this.name = cmd.name();
this.group = cmd.group();
this.usage = cmd.usage();
}
@@ -108,7 +109,14 @@ public class CommandDescriptor implements Comparable<CommandDescriptor>
@Override
public int compareTo(CommandDescriptor desc)
{
return name.compareTo(desc.name);
int result = group.compareTo(desc.group);
if (result == 0)
{
result = name.compareTo(desc.name);
}
return result;
}
/**
@@ -147,6 +155,17 @@ public class CommandDescriptor implements Comparable<CommandDescriptor>
return commandClass;
}
/**
* Method description
*
*
* @return
*/
public String getGroup()
{
return group;
}
/**
* Method description
*
@@ -174,6 +193,9 @@ public class CommandDescriptor implements Comparable<CommandDescriptor>
/** Field description */
private Class<? extends SubCommand> commandClass;
/** Field description */
private String group = "misc";
/** Field description */
private String name;

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java
View File

@@ -50,7 +50,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("create-group")
@Command(name="create-group", group="group")
public class CreateGroupSubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java
View File

@@ -49,7 +49,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("create-repository")
@Command(name="create-repository",group="repository")
public class CreateRepositorySubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java
View File

@@ -49,7 +49,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("create-user")
@Command(name="create-user", group="user")
public class CreateUserSubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteConfigSubCommand.java
View File

@@ -41,7 +41,7 @@ import sonia.scm.cli.config.ScmClientConfig;
*
* @author Sebastian Sdorra
*/
@Command("delete-config")
@Command(name="delete-config", group="config")
public class DeleteConfigSubCommand extends SubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteGroupSubCommand.java
View File

@@ -43,7 +43,7 @@ import sonia.scm.client.ScmClientSession;
*
* @author Sebastian Sdorra
*/
@Command("delete-group")
@Command(name="delete-group",group="group")
public class DeleteGroupSubCommand extends SubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteMembersSubCommand.java
View File

@@ -45,7 +45,7 @@ import java.util.List;
*
* @author Sebastian Sdorra
*/
@Command("delete-members")
@Command(name="delete-members",group="group")
public class DeleteMembersSubCommand extends MembersSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeletePermissionSubCommand.java
View File

@@ -48,7 +48,7 @@ import java.util.List;
*
* @author Sebastian Sdorra
*/
@Command("delete-permission")
@Command(name="delete-permission",group="repository")
public class DeletePermissionSubCommand extends PermissionSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteRepositorySubCommand.java
View File

@@ -43,7 +43,7 @@ import sonia.scm.client.ScmClientSession;
*
* @author Sebastian Sdorra
*/
@Command("delete-repository")
@Command(name="delete-repository",group="repository")
public class DeleteRepositorySubCommand extends SubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteUserSubCommand.java
View File

@@ -43,7 +43,7 @@ import sonia.scm.client.ScmClientSession;
*
* @author Sebastian Sdorra
*/
@Command("delete-user")
@Command(name="delete-user",group="user")
public class DeleteUserSubCommand extends SubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java
View File

@@ -50,7 +50,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("get-group")
@Command(name="get-group",group="group")
public class GetGroupSubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java
View File

@@ -50,7 +50,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("get-repository")
@Command(name="get-repository",group="repository")
public class GetRepositorySubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java
View File

@@ -50,7 +50,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("get-user")
@Command(name="get-user",group="user")
public class GetUserSubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java
View File

@@ -48,7 +48,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("list-groups")
@Command(name="list-groups",group="group")
public class ListGroupsSubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java
View File

@@ -48,7 +48,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("list-repositories")
@Command(name="list-repositories",group="repository")
public class ListRepositoriesSubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java
View File

@@ -48,7 +48,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("list-users")
@Command(name="list-users",group="user")
public class ListUsersSubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java
View File

@@ -53,7 +53,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("modify-group")
@Command(name="modify-group",group="group")
public class ModifyGroupSubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java
View File

@@ -53,7 +53,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("modify-repository")
@Command(name="modify-repository",group="repository")
public class ModifyRepositorySubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java
View File

@@ -53,7 +53,7 @@ import java.util.Map;
*
* @author Sebastian Sdorra
*/
@Command("modify-user")
@Command(name="modify-user",group="user")
public class ModifyUserSubCommand extends TemplateSubCommand
{

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/StoreConfigSubCommand.java
View File

@@ -41,7 +41,7 @@ import sonia.scm.cli.config.ScmClientConfig;
*
* @author Sebastian Sdorra
*/
@Command("store-config")
@Command(name = "store-config", group = "config")
public class StoreConfigSubCommand extends SubCommand
{

2
scm-clients/scm-cli-client/src/main/resources/logback.xml
View File

@@ -18,7 +18,7 @@
</encoder>
</appender>
<logger name="sonia.scm.cli" level="TRACE" />
<logger name="sonia.scm.cli" level="ERROR" />
<root level="ERROR">
<appender-ref ref="STDOUT" />

8
scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
View File

@@ -31,7 +31,7 @@ VAL = value
FILE = file
error = Error
subCommandsTitle = SubCommands
subCommandsTitle = list of commands
optionConfig = Configuration name
optionServerUrl = SCM-Manager URL
@@ -70,3 +70,9 @@ groupNotFoun = The group could not be found
metaVar_config = configname
metaVar_arg = subcommand arguments
metaVar_command = subcommand
config = Configuration
misc = Miscellaneous
repository = Repository
group = Group
user = User