You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2014/07/28 12:29:28 UTC
[3/7] git commit: Miscellaneous tidies
Miscellaneous tidies
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/29543c0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/29543c0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/29543c0e
Branch: refs/heads/master
Commit: 29543c0ef0282a52cd4a0b8001d0b884d0c40928
Parents: b95a10f
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Jul 25 18:43:12 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Jul 25 19:31:20 2014 +0100
----------------------------------------------------------------------
usage/cli/src/main/java/brooklyn/cli/Main.java | 14 +++++---------
.../rest/jsgui/BrooklynJavascriptGuiLauncherTest.java | 10 +++++-----
.../entity/brooklynnode/DeployBlueprintTest.java | 5 +++--
3 files changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29543c0e/usage/cli/src/main/java/brooklyn/cli/Main.java
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/java/brooklyn/cli/Main.java b/usage/cli/src/main/java/brooklyn/cli/Main.java
index 601ded2..7b1153b 100644
--- a/usage/cli/src/main/java/brooklyn/cli/Main.java
+++ b/usage/cli/src/main/java/brooklyn/cli/Main.java
@@ -187,12 +187,8 @@ public class Main {
if (log.isDebugEnabled()) log.debug("Invoked info command: {}", this);
warnIfNoArguments();
- // Get current version
- String version = BrooklynVersion.get();
-
- // Display info text
System.out.println(BANNER);
- System.out.println("Version: " + version);
+ System.out.println("Version: " + BrooklynVersion.get());
System.out.println("Website: http://brooklyn.incubator.apache.org");
System.out.println("Source: https://github.com/apache/incubator-brooklyn");
System.out.println();
@@ -251,11 +247,11 @@ public class Main {
public Boolean noConsoleSecurity = false;
@Option(name = { "--ignoreWebStartupErrors" },
- description = "Ignore web subsystem failures on startup (default is to abort if that fails to start)")
+ description = "Ignore web subsystem failures on startup (default is to abort if it fails to start)")
public boolean ignoreWebErrors = false;
@Option(name = { "--ignorePersistenceStartupErrors" },
- description = "Ignore persistence/HA subsystem failures on startup (default is to abort if that fails to start)")
+ description = "Ignore persistence/HA subsystem failures on startup (default is to abort if it fails to start)")
public boolean ignorePersistenceErrors = false;
@Option(name = { "--ignoreManagedAppsStartupErrors" },
@@ -319,11 +315,11 @@ public class Main {
public String persist = PERSIST_OPTION_DISABLED;
@Option(name = { "--persistenceDir" }, title = "persistence dir",
- description = "the directory to read/write persisted state (or container name if using an object store)")
+ description = "The directory to read/write persisted state (or container name if using an object store)")
public String persistenceDir;
@Option(name = { "--persistenceLocation" }, title = "persistence location",
- description = "the location spec for an object store to read/write persisted state")
+ description = "The location spec for an object store to read/write persisted state")
public String persistenceLocation;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29543c0e/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java b/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
index 0cffff1..66ab7f6 100644
--- a/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
+++ b/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
@@ -27,6 +27,7 @@ import brooklyn.config.BrooklynServiceAttributes;
import brooklyn.entity.basic.Entities;
import brooklyn.management.ManagementContext;
import brooklyn.rest.BrooklynRestApiLauncherTest;
+import brooklyn.rest.BrooklynRestApiLauncherTestFixture;
import brooklyn.test.HttpTestUtils;
/** Convenience and demo for launching programmatically. */
@@ -53,8 +54,8 @@ public class BrooklynJavascriptGuiLauncherTest {
@Test
public void testJavascriptWithRest() throws Exception {
server = BrooklynJavascriptGuiLauncher.startJavascriptAndRest();
- BrooklynRestApiLauncherTest.forceUseOfDefaultCatalogWithJavaClassPath(server);
- BrooklynRestApiLauncherTest.enableAnyoneLogin(server);
+ BrooklynRestApiLauncherTestFixture.forceUseOfDefaultCatalogWithJavaClassPath(server);
+ BrooklynRestApiLauncherTestFixture.enableAnyoneLogin(server);
checkUrlContains("/index.html", "Brooklyn");
checkUrlContains("/v1/catalog/entities", "Tomcat");
}
@@ -64,9 +65,8 @@ public class BrooklynJavascriptGuiLauncherTest {
HttpTestUtils.assertContentContainsText(rootUrl+path, text);
}
- public static ManagementContext getManagementContextFromJettyServerAttributes(Server server) {
- ManagementContext mgmt = (ManagementContext) ((ContextHandler)server.getHandler()).getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
- return mgmt;
+ private ManagementContext getManagementContextFromJettyServerAttributes(Server server) {
+ return (ManagementContext) ((ContextHandler)server.getHandler()).getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29543c0e/usage/rest-server/src/test/java/brooklyn/entity/brooklynnode/DeployBlueprintTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/entity/brooklynnode/DeployBlueprintTest.java b/usage/rest-server/src/test/java/brooklyn/entity/brooklynnode/DeployBlueprintTest.java
index f66e992..d8214a4 100644
--- a/usage/rest-server/src/test/java/brooklyn/entity/brooklynnode/DeployBlueprintTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/entity/brooklynnode/DeployBlueprintTest.java
@@ -34,6 +34,7 @@ import brooklyn.event.feed.http.HttpValueFunctions;
import brooklyn.event.feed.http.JsonFunctions;
import brooklyn.rest.BrooklynRestApiLauncherTestFixture;
import brooklyn.test.HttpTestUtils;
+import brooklyn.util.guava.Functionals;
import brooklyn.util.http.HttpTool;
import com.google.common.base.Function;
@@ -66,9 +67,9 @@ public class DeployBlueprintTest extends BrooklynRestApiLauncherTestFixture {
}
private <T> List<T> parseJsonList(String json, List<String> elements, Class<T> clazz) {
- Function<String, List<T>> func = HttpValueFunctions.chain(
+ Function<String, List<T>> func = Functionals.chain(
JsonFunctions.asJson(),
- JsonFunctions.forEach(HttpValueFunctions.chain(
+ JsonFunctions.forEach(Functionals.chain(
JsonFunctions.walk(elements),
JsonFunctions.cast(clazz))));
return func.apply(json);