rename non-java mentions of classes which have been moved -- in plans, comments, and docs
minor other tidies, to policies docs, and camp Service.toString, to remove prefixes rather than just change them; in docs, we've also updated `package_path`, policies docs, links, and confirmed the build of api docs and catalog Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/59eaffcd Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/59eaffcd Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/59eaffcd Branch: refs/heads/0.8.0-incubating Commit: 59eaffcd5c17d582547215a8e6072e7e9818ebdc Parents: b1105a4 Author: Alex Heneveld <[email protected]> Authored: Mon Aug 31 17:20:30 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Sep 1 12:05:39 2015 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml | 2 +- .../apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java | 3 +-- .../brooklyn/entity/webapp/jboss/JBoss6SshDriver.java | 3 +-- .../brooklyn/entity/webapp/jboss/JBoss7SshDriver.java | 3 +-- .../brooklyn/entity/webapp/tomcat/TomcatSshDriver.java | 3 +-- .../brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy | 9 --------- .../apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java | 3 +-- .../qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java | 3 ++- 8 files changed, 8 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/59eaffcd/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml index 5323885..d91fcc9 100644 --- a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml +++ b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml @@ -34,7 +34,7 @@ services: base_url: http://127.0.0.1:8091/ brooklyn.initializers: - - type: brooklyn.entity.software.ssh.SshCommandEffector + - type: org.apache.brooklyn.core.effector.ssh.SshCommandEffector brooklyn.config: name: pillow_fight description: runs cbc pillowfight http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/59eaffcd/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java index ac26374..f309ca4 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java @@ -326,8 +326,7 @@ public class NginxSshDriver extends AbstractSoftwareProcessSshDriver implements getEntity().doExtraConfigurationDuringStart(); - // We wait for evidence of running because, using - // brooklyn.ssh.config.tool.class=brooklyn.util.internal.ssh.cli.SshCliTool, + // We wait for evidence of running because, using SshCliTool, // we saw the ssh session return before the tomcat process was fully running // so the process failed to start. newScript(MutableMap.of("usePidFile", false), LAUNCHING) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/59eaffcd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java index 80933df..e542af6 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java @@ -142,8 +142,7 @@ public class JBoss6SshDriver extends JavaWebAppSshDriver implements JBoss6Driver // run.sh must be backgrounded otherwise the script will never return. // Don't automatically create pid; instead set JBOSS_PIDFILE to create the pid file we need - // We wait for evidence of tomcat running because, using - // brooklyn.ssh.config.tool.class=brooklyn.util.internal.ssh.cli.SshCliTool, + // We wait for evidence of tomcat running because, using SshCliTool, // we saw the ssh session return before the tomcat process was fully running // so the process failed to start. newScript(MutableMap.of(USE_PID_FILE, false), LAUNCHING) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/59eaffcd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java index 7cbfff8..8425b6a 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java @@ -198,8 +198,7 @@ public class JBoss7SshDriver extends JavaWebAppSshDriver implements JBoss7Driver public void launch() { entity.setAttribute(JBoss7Server.PID_FILE, Os.mergePathsUnix(getRunDir(), PID_FILENAME)); - // We wait for evidence of JBoss running because, using - // brooklyn.ssh.config.tool.class=brooklyn.util.internal.ssh.cli.SshCliTool, + // We wait for evidence of JBoss running because, using SshCliTool, // we saw the ssh session return before the JBoss process was fully running // so the process failed to start. newScript(MutableMap.of(USE_PID_FILE, false), LAUNCHING) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/59eaffcd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatSshDriver.java index 494f8a9..ed2dc60 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatSshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatSshDriver.java @@ -93,8 +93,7 @@ public class TomcatSshDriver extends JavaWebAppSshDriver implements TomcatDriver Map<String, Integer> ports = MutableMap.of("httpPort", getHttpPort(), "shutdownPort", getShutdownPort()); Networking.checkPortsValid(ports); - // We wait for evidence of tomcat running because, using - // brooklyn.ssh.config.tool.class=brooklyn.util.internal.ssh.cli.SshCliTool, + // We wait for evidence of tomcat running because, using SshCliTool, // we saw the ssh session return before the tomcat process was fully running // so the process failed to start. newScript(MutableMap.of(USE_PID_FILE, false), LAUNCHING) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/59eaffcd/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy index c8747fa..4706654 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy @@ -19,7 +19,6 @@ package org.apache.brooklyn.entity.webapp import static java.util.concurrent.TimeUnit.* -import static org.apache.brooklyn.test.TestUtils.* import static org.testng.Assert.* import org.apache.brooklyn.api.entity.Application @@ -36,8 +35,6 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server import org.apache.brooklyn.entity.webapp.jboss.JBoss7ServerImpl import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer import org.apache.brooklyn.entity.webapp.tomcat.TomcatServerImpl -import org.apache.brooklyn.test.TestUtils -import org.apache.brooklyn.util.groovy.TimeExtras; import org.slf4j.Logger import org.slf4j.LoggerFactory import org.testng.annotations.AfterMethod @@ -51,8 +48,6 @@ import org.testng.annotations.Test public class WebAppLiveIntegrationTest { private static final Logger logger = LoggerFactory.getLogger(WebAppLiveIntegrationTest.class) - static { TimeExtras.init() } - public static final int DEFAULT_HTTP_PORT = 8080 public static final int DEFAULT_JMX_PORT = 32199 @@ -79,10 +74,6 @@ public class WebAppLiveIntegrationTest { return [ [ tomcat ], [ jboss6 ], [ jboss7 ] ] } - private File getResource(String path) { - return TestUtils.getResource(path, getClass().getClassLoader()); - } - @BeforeMethod(alwaysRun = true) public void setUp() { Entities.manage(application) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/59eaffcd/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java index eb55d73..a050fd8 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java @@ -197,8 +197,7 @@ public class SimulatedJBoss7ServerImpl extends JBoss7ServerImpl { return; } - // We wait for evidence of JBoss running because, using - // brooklyn.ssh.config.tool.class=brooklyn.util.internal.ssh.cli.SshCliTool, + // We wait for evidence of JBoss running because, using SshCliTool, // we saw the ssh session return before the JBoss process was fully running // so the process failed to start. String pidFile = Os.mergePathsUnix(getRunDir(), PID_FILENAME); http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/59eaffcd/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java index bd6eb96..9f351ce 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java @@ -36,6 +36,7 @@ import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.brooklynnode.BrooklynEntityMirror; import org.apache.brooklyn.entity.brooklynnode.BrooklynNode; import org.apache.brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; +import org.apache.brooklyn.entity.machine.MachineEntity; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig; import org.apache.brooklyn.test.EntityTestUtils; @@ -212,7 +213,7 @@ public class SoftlayerObtainPrivateLiveTest { return Joiner.on('\n').join(ImmutableList.of( "location: " + getTestLocation(hasPublicNetwork), "services:", - "- type: brooklyn.entity.machine.MachineEntity", + "- type: "+MachineEntity.class.getName(), " name: " + (hasPublicNetwork ? "Public" : "Private") )); }
