- org.springframework.bootstrap:spring-bootstrap-cli:jar:*
+ org.springframework.zero:spring-cli:jar:*
lib
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/Command.java b/spring-cli/src/main/java/org/springframework/cli/Command.java
similarity index 97%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/Command.java
rename to spring-cli/src/main/java/org/springframework/cli/Command.java
index d0adb210339..61bd9da595f 100644
--- a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/Command.java
+++ b/spring-cli/src/main/java/org/springframework/cli/Command.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.bootstrap.cli;
+package org.springframework.cli;
/**
* A single command that can be run from the CLI.
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java b/spring-cli/src/main/java/org/springframework/cli/CommandFactory.java
similarity index 95%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java
rename to spring-cli/src/main/java/org/springframework/cli/CommandFactory.java
index d7019d42304..96f57bc262d 100644
--- a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java
+++ b/spring-cli/src/main/java/org/springframework/cli/CommandFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.bootstrap.cli;
+package org.springframework.cli;
import java.util.Collection;
import java.util.ServiceLoader;
diff --git a/spring-cli/src/main/java/org/springframework/cli/Log.java b/spring-cli/src/main/java/org/springframework/cli/Log.java
new file mode 100644
index 00000000000..c1d48d51947
--- /dev/null
+++ b/spring-cli/src/main/java/org/springframework/cli/Log.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cli;
+
+/**
+ * Simple logger used by the CLI.
+ *
+ * @author Phillip Webb
+ */
+public abstract class Log {
+
+ public static void info(String message) {
+ System.out.println(message);
+ }
+
+ public static void error(String message) {
+ System.err.println(message);
+ }
+
+ public static void error(Exception ex) {
+ ex.printStackTrace(System.err);
+ }
+
+}
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java b/spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java
similarity index 86%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java
rename to spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java
index 206397db2fe..dde2e75a526 100644
--- a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java
+++ b/spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java
@@ -14,20 +14,20 @@
* limitations under the License.
*/
-package org.springframework.bootstrap.cli;
+package org.springframework.cli;
/**
* Exception thrown when an unknown command is specified.
*
* @author Phillip Webb
*/
-class NoSuchCommandException extends BootstrapCliException {
+class NoSuchCommandException extends SpringCliException {
private static final long serialVersionUID = 1L;
public NoSuchCommandException(String name) {
super(String.format("%1$s: '%2$s' is not a valid command. See '%1$s --help'.",
- SpringBootstrapCli.CLI_APP, name));
+ SpringCli.CLI_APP, name));
}
}
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java b/spring-cli/src/main/java/org/springframework/cli/SpringCli.java
similarity index 67%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java
rename to spring-cli/src/main/java/org/springframework/cli/SpringCli.java
index 3adcd499403..bd14a0b6d86 100644
--- a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java
+++ b/spring-cli/src/main/java/org/springframework/cli/SpringCli.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.bootstrap.cli;
+package org.springframework.cli;
import java.util.ArrayList;
import java.util.Arrays;
@@ -24,9 +24,9 @@ import java.util.ServiceLoader;
import java.util.Set;
/**
- * Spring Bootstrap Command Line Interface. This is the main entry-point for the spring
- * bootstrap command line application. This class will parse input arguments and delegate
- * to a suitable {@link Command} implementation based on the first argument.
+ * Spring Command Line Interface. This is the main entry-point for the Spring command line
+ * application. This class will parse input arguments and delegate to a suitable
+ * {@link Command} implementation based on the first argument.
*
*
* The '-d' and '--debug' switches are handled by this class, however, most argument
@@ -34,23 +34,22 @@ import java.util.Set;
*
* @author Phillip Webb
* @see #main(String...)
- * @see BootstrapCliException
+ * @see SpringCliException
* @see Command
*/
-public class SpringBootstrapCli {
+public class SpringCli {
public static final String CLI_APP = "spring";
- private static final Set NO_EXCEPTION_OPTIONS = EnumSet
- .noneOf(BootstrapCliException.Option.class);
+ private static final Set NO_EXCEPTION_OPTIONS = EnumSet
+ .noneOf(SpringCliException.Option.class);
private List commands;
/**
- * Create a new {@link SpringBootstrapCli} implementation with the default set of
- * commands.
+ * Create a new {@link SpringCli} implementation with the default set of commands.
*/
- public SpringBootstrapCli() {
+ public SpringCli() {
setCommands(ServiceLoader.load(CommandFactory.class, getClass().getClassLoader()));
}
@@ -87,25 +86,31 @@ public class SpringBootstrapCli {
try {
run(argsWithoutDebugFlags);
return 0;
- } catch (NoArgumentsException ex) {
+ }
+ catch (NoArgumentsException ex) {
showUsage();
return 1;
- } catch (Exception ex) {
- Set options = NO_EXCEPTION_OPTIONS;
- if (ex instanceof BootstrapCliException) {
- options = ((BootstrapCliException) ex).getOptions();
- }
- if (!(ex instanceof NoHelpCommandArgumentsException)) {
- errorMessage(ex.getMessage());
- }
- if (options.contains(BootstrapCliException.Option.SHOW_USAGE)) {
- showUsage();
- }
- if (debug || options.contains(BootstrapCliException.Option.STACK_TRACE)) {
- printStackTrace(ex);
- }
- return 1;
}
+ catch (Exception ex) {
+ return handleError(debug, ex);
+ }
+ }
+
+ private int handleError(boolean debug, Exception ex) {
+ Set options = NO_EXCEPTION_OPTIONS;
+ if (ex instanceof SpringCliException) {
+ options = ((SpringCliException) ex).getOptions();
+ }
+ if (!(ex instanceof NoHelpCommandArgumentsException)) {
+ errorMessage(ex.getMessage());
+ }
+ if (options.contains(SpringCliException.Option.SHOW_USAGE)) {
+ showUsage();
+ }
+ if (debug || options.contains(SpringCliException.Option.STACK_TRACE)) {
+ printStackTrace(ex);
+ }
+ return 1;
}
/**
@@ -132,28 +137,28 @@ public class SpringBootstrapCli {
}
protected void showUsage() {
- System.out.print("usage: " + CLI_APP + " ");
- System.out.println("");
- System.out.println(" []");
- System.out.println("");
- System.out.println("Available commands are:");
+ Log.info("usage: " + CLI_APP + " ");
+ Log.info("");
+ Log.info(" []");
+ Log.info("");
+ Log.info("Available commands are:");
for (Command command : this.commands) {
- System.out.println(String.format("\n %1$s %2$-15s\n %3$s",
- command.getName(), command.getUsageHelp(), command.getDescription()));
+ Log.info(String.format("\n %1$s %2$-15s\n %3$s", command.getName(),
+ command.getUsageHelp(), command.getDescription()));
}
- System.out.println("");
- System.out.println("See '" + CLI_APP
+ Log.info("");
+ Log.info("See '" + CLI_APP
+ " help ' for more information on a specific command.");
}
protected void errorMessage(String message) {
- System.err.println(message == null ? "Unexpected error" : message);
+ Log.error(message == null ? "Unexpected error" : message);
}
protected void printStackTrace(Exception ex) {
- System.err.println("");
- ex.printStackTrace(System.err);
- System.err.println("");
+ Log.error("");
+ Log.error(ex);
+ Log.error("");
}
private String[] removeDebugFlags(String[] args) {
@@ -184,18 +189,18 @@ public class SpringBootstrapCli {
throw new NoHelpCommandArgumentsException();
}
String commandName = args[0];
- for (Command command : SpringBootstrapCli.this.commands) {
+ for (Command command : SpringCli.this.commands) {
if (command.getName().equals(commandName)) {
- System.out.println(CLI_APP + " " + command.getName() + " - "
+ Log.info(CLI_APP + " " + command.getName() + " - "
+ command.getDescription());
- System.out.println();
+ Log.info("");
if (command.getUsageHelp() != null) {
- System.out.println("usage: " + CLI_APP + " " + command.getName()
- + " " + command.getUsageHelp());
- System.out.println();
+ Log.info("usage: " + CLI_APP + " " + command.getName() + " "
+ + command.getUsageHelp());
+ Log.info("");
}
if (command.getHelp() != null) {
- System.out.println(command.getHelp());
+ Log.info(command.getHelp());
}
return;
}
@@ -225,7 +230,7 @@ public class SpringBootstrapCli {
}
- static class NoHelpCommandArgumentsException extends BootstrapCliException {
+ static class NoHelpCommandArgumentsException extends SpringCliException {
private static final long serialVersionUID = 1L;
@@ -235,7 +240,7 @@ public class SpringBootstrapCli {
}
- static class NoArgumentsException extends BootstrapCliException {
+ static class NoArgumentsException extends SpringCliException {
private static final long serialVersionUID = 1L;
@@ -246,7 +251,7 @@ public class SpringBootstrapCli {
* @param args CLI arguments
*/
public static void main(String... args) {
- int exitCode = new SpringBootstrapCli().runAndHandleErrors(args);
+ int exitCode = new SpringCli().runAndHandleErrors(args);
if (exitCode != 0) {
System.exit(exitCode);
}
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java b/spring-cli/src/main/java/org/springframework/cli/SpringCliException.java
similarity index 72%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java
rename to spring-cli/src/main/java/org/springframework/cli/SpringCliException.java
index f8e59e31944..b6b9913d7b5 100644
--- a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java
+++ b/spring-cli/src/main/java/org/springframework/cli/SpringCliException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.bootstrap.cli;
+package org.springframework.cli;
import java.util.Arrays;
import java.util.Collections;
@@ -23,41 +23,41 @@ import java.util.Set;
/**
* Runtime exception wrapper that defines additional {@link Option}s that are understood
- * by the {@link SpringBootstrapCli}.
+ * by the {@link SpringCli}.
*
* @author Phillip Webb
*/
-public class BootstrapCliException extends RuntimeException {
+public class SpringCliException extends RuntimeException {
private static final long serialVersionUID = 0L;
private final EnumSet