From acbf57f48054358d35615515e1c0c425996dde0f Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 20 May 2011 22:01:52 +0200 Subject: [PATCH] added delete-permission subcommand --- .../sonia/scm/cli/cmd/CommandDescriptor.java | 2 +- .../cli/cmd/DeletePermissionSubCommand.java | 113 ++++++++++++++++++ .../java/sonia/scm/cli/cmd/SubCommand.java | 14 +-- .../services/sonia.scm.cli.cmd.SubCommand | 3 +- 4 files changed, 123 insertions(+), 9 deletions(-) create mode 100644 scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeletePermissionSubCommand.java diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CommandDescriptor.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CommandDescriptor.java index 351139644a..c8e71804cc 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CommandDescriptor.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CommandDescriptor.java @@ -110,7 +110,7 @@ public class CommandDescriptor try { command = commandClass.newInstance(); - command.setName(name); + command.setCommandName(name); } catch (Exception ex) { diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeletePermissionSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeletePermissionSubCommand.java new file mode 100644 index 0000000000..7dc7027330 --- /dev/null +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeletePermissionSubCommand.java @@ -0,0 +1,113 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of SCM-Manager; nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.cli.cmd; + +//~--- non-JDK imports -------------------------------------------------------- + +import org.kohsuke.args4j.Option; + +import sonia.scm.repository.Permission; + +//~--- JDK imports ------------------------------------------------------------ + +import java.util.Iterator; +import java.util.List; + +/** + * + * @author Sebastian Sdorra + */ +@Command("delete-permission") +public class DeletePermissionSubCommand extends PermissionSubCommand +{ + + /** + * Method description + * + * + * @return + */ + public String getName() + { + return name; + } + + //~--- set methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param name + */ + public void setName(String name) + { + this.name = name; + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param permissions + */ + @Override + protected void modifyPermissions(List permissions) + { + Iterator it = permissions.iterator(); + + while (it.hasNext()) + { + Permission p = it.next(); + + if (name.equals(p.getName())) + { + it.remove(); + } + } + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + @Option( + name = "--name", + usage = "optionPermissionName", + required = true, + aliases = { "-n" } + ) + private String name; +} diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java index 1f5fbccb2d..6226781246 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java @@ -140,9 +140,9 @@ public abstract class SubCommand * * @return */ - public String getName() + public String getCommandName() { - return name; + return commandName; } //~--- set methods ---------------------------------------------------------- @@ -153,9 +153,9 @@ public abstract class SubCommand * * @param name */ - public void setName(String name) + public void setCommandName(String name) { - this.name = name; + this.commandName = name; } //~--- methods -------------------------------------------------------------- @@ -197,6 +197,9 @@ public abstract class SubCommand /** Field description */ protected PrintWriter output; + /** Field description */ + private String commandName; + /** Field description */ @Option( name = "--help", @@ -205,9 +208,6 @@ public abstract class SubCommand ) private boolean help = false; - /** Field description */ - private String name; - /** Field description */ private ScmClientSession session; } diff --git a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand index 773150c294..61c724420a 100644 --- a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand +++ b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand @@ -39,4 +39,5 @@ sonia.scm.cli.cmd.ListRepositoriesSubCommand sonia.scm.cli.cmd.DeleteRepositorySubCommand # permissions -sonia.scm.cli.cmd.AddPermissionSubCommand \ No newline at end of file +sonia.scm.cli.cmd.AddPermissionSubCommand +sonia.scm.cli.cmd.DeletePermissionSubCommand \ No newline at end of file