From f7f8a66ac8000bea5e2331aa4154177a8dd06034 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 20 May 2011 14:47:44 +0200 Subject: [PATCH] added create-repository subcommand --- .../cli/cmd/CreateRepositorySubCommand.java | 215 ++++++++++++++++++ .../java/sonia/scm/cli/cmd/SubCommand.java | 8 +- .../sonia/scm/cli/cmd/TemplateSubCommand.java | 12 +- .../services/sonia.scm.cli.cmd.SubCommand | 1 + .../sonia/resources/get-repository.ftl | 4 +- .../resources/sonia/resources/i18n.properties | 5 + 6 files changed, 229 insertions(+), 16 deletions(-) create mode 100644 scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java new file mode 100644 index 0000000000..8c4fef81f6 --- /dev/null +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java @@ -0,0 +1,215 @@ +/** + * 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.client.ScmClientSession; +import sonia.scm.repository.Repository; + +//~--- JDK imports ------------------------------------------------------------ + +import java.util.HashMap; +import java.util.Map; + +/** + * + * @author Sebastian Sdorra + */ +@Command("create-repository") +public class CreateRepositorySubCommand extends TemplateSubCommand +{ + + /** + * Method description + * + * + * @return + */ + public String getContact() + { + return contact; + } + + /** + * Method description + * + * + * @return + */ + public String getDescription() + { + return description; + } + + /** + * Method description + * + * + * @return + */ + public String getType() + { + return type; + } + + /** + * Method description + * + * + * @return + */ + public boolean isPublicReadable() + { + return publicReadable; + } + + //~--- set methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param contact + */ + public void setContact(String contact) + { + this.contact = contact; + } + + /** + * Method description + * + * + * @param description + */ + public void setDescription(String description) + { + this.description = description; + } + + /** + * Method description + * + * + * @param publicReadable + */ + public void setPublicReadable(boolean publicReadable) + { + this.publicReadable = publicReadable; + } + + /** + * Method description + * + * + * @param type + */ + public void setType(String type) + { + this.type = type; + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + */ + @Override + protected void run() + { + Repository repository = new Repository(); + + repository.setName(name); + repository.setType(type); + repository.setContact(contact); + repository.setDescription(description); + + ScmClientSession session = createSession(); + + session.getRepositoryHandler().create(repository); + + Map env = new HashMap(); + + env.put("repository", repository); + renderTemplate(env, GetRepositorySubCommand.TEMPLATE); + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + @Option( + name = "--contact", + usage = "optionRepositoryContact", + aliases = { "-c" } + ) + private String contact; + + /** Field description */ + @Option( + name = "--description", + usage = "optionRepositoryDescription", + aliases = { "-d" } + ) + private String description; + + /** Field description */ + @Option( + name = "--name", + required = true, + usage = "optionRepositoryName", + aliases = { "-n" } + ) + private String name; + + /** Field description */ + @Option( + name = "--public", + usage = "optionRepositoryPublic", + aliases = { "-p" } + ) + private boolean publicReadable; + + /** Field description */ + @Option( + name = "--type", + required = true, + usage = "optionRepositoryType", + aliases = { "-t" } + ) + private String type; +} 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 33e47bece2..1f5fbccb2d 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 @@ -102,7 +102,7 @@ public abstract class SubCommand public void run(Collection args) { CmdLineParser parser = new CmdLineParser(this); - + try { parser.parseArgument(args); @@ -194,9 +194,6 @@ public abstract class SubCommand /** Field description */ protected BufferedReader input; - /** Field description */ - protected String name; - /** Field description */ protected PrintWriter output; @@ -208,6 +205,9 @@ 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/java/sonia/scm/cli/cmd/TemplateSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/TemplateSubCommand.java index 6960b9756d..99b7b5f982 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/TemplateSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/TemplateSubCommand.java @@ -160,18 +160,10 @@ public abstract class TemplateSubCommand extends SubCommand //~--- fields --------------------------------------------------------------- /** Field description */ - @Option( - name = "--template", - usage = "optionTemplate", - aliases = { "-t" } - ) + @Option(name = "--template", usage = "optionTemplate") private String template; /** Field description */ - @Option( - name = "--template-file", - usage = "optionTemplateFile", - aliases = { "-f" } - ) + @Option(name = "--template-file", usage = "optionTemplateFile") private File templateFile; } 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 159745614d..85e50ab285 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 @@ -32,6 +32,7 @@ sonia.scm.cli.cmd.StoreConfigSubCommand sonia.scm.cli.cmd.DeleteConfigSubCommand # repository +sonia.scm.cli.cmd.CreateRepositorySubCommand sonia.scm.cli.cmd.GetRepositorySubCommand sonia.scm.cli.cmd.ListRepositoriesSubCommand sonia.scm.cli.cmd.DeleteRepositorySubCommand \ No newline at end of file diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-repository.ftl b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-repository.ftl index 8eb0118dd2..e14acb7620 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-repository.ftl +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-repository.ftl @@ -1,8 +1,8 @@ ID: ${repository.id} Name: ${repository.name} Type: ${repository.type} -E-Mail: ${repository.contact} -Description: ${repository.description} +E-Mail: ${repository.contact!""} +Description: ${repository.description!""} Public: ${repository.publicReadable?string} Creation-Date: ${repository.creationDate!""?string} Last-Modified: ${repository.lastModified!""?string} diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties index 4f0c469ad8..eb28c90ebc 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties @@ -37,6 +37,11 @@ optionHelpText = Shows this help optionTemplate = Template optionTemplateFile = Template file optionRepositoryId = Repository Id +optionRepositoryName = Repository name +optionRepositoryType = Repository name +optionRepositoryContact = Repository contact +optionRepositoryDescription = Repository description +optionRepositoryPublic = Repository public readable repositoryNotFound = The repository is not available