Repository: brooklyn-server Updated Branches: refs/heads/master 7ca3bcb19 -> 5b6bf73a8
BROOKLYN-334: Write âApache Brooklynâ at startup Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3a4a48f0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3a4a48f0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3a4a48f0 Branch: refs/heads/master Commit: 3a4a48f090a3bcef53f9fce9555af17ce5539467 Parents: 01141a7 Author: Aled Sage <[email protected]> Authored: Fri May 5 11:47:31 2017 +0100 Committer: Aled Sage <[email protected]> Committed: Fri May 5 11:52:01 2017 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/cli/AbstractMain.java | 5 +++- .../main/java/org/apache/brooklyn/cli/Main.java | 12 +++++++-- .../java/org/apache/brooklyn/cli/CliTest.java | 28 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3a4a48f0/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java ---------------------------------------------------------------------- diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java index 1c0a803..ea06d6f 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java @@ -95,7 +95,9 @@ public abstract class AbstractMain { * methods are not an option (and one can't override static methods). */ protected static volatile String banner = DEFAULT_BANNER; - + + protected static volatile String productOneLineSummary = "Apache Brooklyn, " + BrooklynVersion.get(); + /** abstract superclass for commands defining global options, but not arguments, * as that prevents Help from being injectable in the {@link HelpCommand} subclass */ public static abstract class BrooklynCommand implements Callable<Void> { @@ -205,6 +207,7 @@ public abstract class AbstractMain { warnIfArguments(); System.out.println(banner); + System.out.println("Name: " + "Apache Brooklyn"); System.out.println("Version: " + BrooklynVersion.get()); if (BrooklynVersion.INSTANCE.isSnapshot()) { System.out.println("Git SHA1: " + BrooklynVersion.INSTANCE.getSha1FromOsgiManifest()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3a4a48f0/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java ---------------------------------------------------------------------- diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java index 3cf0bc9..4634f7d 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java @@ -392,7 +392,11 @@ public class Main extends AbstractMain { try { if (log.isDebugEnabled()) log.debug("Invoked launch command {}", this); - if (!quiet) stdout.println(banner); + if (!quiet) { + stdout.println(banner); + stdout.println(productOneLineSummary); + stdout.println(); + } if (verbose) { if (app != null) { @@ -937,7 +941,11 @@ public class Main extends AbstractMain { try { log.info("Retrieving and copying persisted state to "+destinationDir+(Strings.isBlank(destinationLocation) ? "" : " @ "+destinationLocation)); - if (!quiet) stdout.println(banner); + if (!quiet) { + stdout.println(banner); + stdout.println(productOneLineSummary); + stdout.println(); + } PersistMode persistMode = PersistMode.AUTO; HighAvailabilityMode highAvailabilityMode = HighAvailabilityMode.DISABLED; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3a4a48f0/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java ---------------------------------------------------------------------- diff --git a/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java b/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java index 987f054..c85af6e 100644 --- a/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java +++ b/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java @@ -360,6 +360,34 @@ public class CliTest { } @Test + public void testLaunchWritesOutApacheBrooklyn() throws Exception { + InputStream origIn = System.in; + PrintStream origOut = System.out; + try { + InputStream stdin = new ByteArrayInputStream("".getBytes()); + System.setIn(stdin); + + final ByteArrayOutputStream stdoutBytes = new ByteArrayOutputStream(); + PrintStream stdout = new PrintStream(stdoutBytes); + System.setOut(stdout); + + Cli<BrooklynCommand> cli = buildCli(); + BrooklynCommand command = cli.parse("launch", "--noConsole"); + submitCommandAndAssertRunnableSucceeds(command, new Runnable() { + @Override + public void run() { + String actualStdout = new String(stdoutBytes.toByteArray()); + assertTrue(actualStdout.contains("Apache Brooklyn"), "stdout="+actualStdout); + } + }); + + } finally { + System.setIn(origIn); + System.setOut(origOut); + } + } + + @Test public void testLaunchWillStartAppWhenGivenImpl() throws Exception { Cli<BrooklynCommand> cli = buildCli(); BrooklynCommand command = cli.parse("launch", "--noConsole", "--app", ExampleApp.class.getName(), "--location", "localhost");
