This closes #801
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/cc4ffb9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/cc4ffb9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/cc4ffb9d Branch: refs/heads/master Commit: cc4ffb9d7dd13aa2040183212558d82cd1a99725 Parents: 7154cc9 6f58ef3 Author: Hadrian Zbarcea <[email protected]> Authored: Thu Aug 6 20:54:10 2015 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Thu Aug 6 20:54:10 2015 -0400 ---------------------------------------------------------------------- .../brooklyn/demo/GlobalWebFabricExample.java | 2 +- .../brooklyn/demo/KafkaClusterExample.java | 2 +- .../demo/StandaloneQpidBrokerExample.java | 2 +- .../brooklyn/demo/CumulusRDFApplication.java | 2 +- .../demo/HighAvailabilityCassandraCluster.java | 2 +- .../brooklyn/demo/ResilientMongoDbApp.java | 2 +- .../brooklyn/demo/RiakClusterExample.java | 2 +- .../brooklyn/demo/SimpleCassandraCluster.java | 2 +- .../apache/brooklyn/demo/StormSampleApp.java | 2 +- .../brooklyn/demo/WideAreaCassandraCluster.java | 2 +- .../brooklyn/demo/SingleWebServerExample.java | 2 +- .../demo/WebClusterDatabaseExample.java | 2 +- .../demo/WebClusterDatabaseExampleApp.java | 2 +- .../apache/brooklyn/demo/WebClusterExample.java | 2 +- .../main/java/org/apache/brooklyn/cli/Main.java | 6 +- .../main/java/brooklyn/launcher/Activator.java | 39 - .../brooklyn/launcher/BrooklynLauncher.java | 1062 ------------------ .../launcher/BrooklynServerDetails.java | 47 - .../brooklyn/launcher/BrooklynWebServer.java | 652 ----------- .../camp/BrooklynCampPlatformLauncher.java | 72 -- .../launcher/camp/SimpleYamlLauncher.java | 35 - .../launcher/config/BrooklynGlobalConfig.java | 66 -- .../launcher/config/CustomResourceLocator.java | 127 --- .../config/StopWhichAppsOnShutdown.java | 23 - .../ContextHandlerCollectionHotSwappable.java | 62 - .../org/apache/brooklyn/launcher/Activator.java | 39 + .../brooklyn/launcher/BrooklynLauncher.java | 1062 ++++++++++++++++++ .../launcher/BrooklynServerDetails.java | 47 + .../brooklyn/launcher/BrooklynWebServer.java | 652 +++++++++++ .../camp/BrooklynCampPlatformLauncher.java | 72 ++ .../launcher/camp/SimpleYamlLauncher.java | 35 + .../config/BrooklynDevelopmentModes.java | 93 ++ .../launcher/config/BrooklynGlobalConfig.java | 66 ++ .../launcher/config/CustomResourceLocator.java | 127 +++ .../config/StopWhichAppsOnShutdown.java | 23 + .../ContextHandlerCollectionHotSwappable.java | 62 + .../entity/basic/VanillaSoftwareYamlTest.java | 97 -- .../BrooklynEntityMirrorIntegrationTest.java | 179 --- .../brooklynnode/BrooklynNodeRestTest.java | 146 --- .../database/mssql/MssqlBlueprintLiveTest.java | 60 - .../BrooklynLauncherHighAvailabilityTest.java | 257 ----- .../BrooklynLauncherRebindCatalogTest.java | 116 -- .../BrooklynLauncherRebindTestFixture.java | 256 ----- .../BrooklynLauncherRebindTestToFiles.java | 153 --- ...lynLauncherRebindToCloudObjectStoreTest.java | 174 --- .../brooklyn/launcher/BrooklynLauncherTest.java | 367 ------ .../launcher/BrooklynWebServerTest.java | 209 ---- .../launcher/SimpleYamlLauncherForTests.java | 31 - .../brooklyn/launcher/WebAppRunnerTest.java | 168 --- .../java/brooklyn/launcher/YamlLauncher.java | 35 - .../blueprints/AbstractBlueprintTest.java | 202 ---- .../blueprints/CouchbaseBlueprintTest.java | 69 -- .../blueprints/MongoDbBlueprintTest.java | 51 - .../entity/basic/VanillaSoftwareYamlTest.java | 98 ++ .../BrooklynEntityMirrorIntegrationTest.java | 180 +++ .../brooklynnode/BrooklynNodeRestTest.java | 149 +++ .../database/mssql/MssqlBlueprintLiveTest.java | 60 + .../BrooklynLauncherHighAvailabilityTest.java | 258 +++++ .../BrooklynLauncherRebindCatalogTest.java | 116 ++ .../BrooklynLauncherRebindTestFixture.java | 257 +++++ .../BrooklynLauncherRebindTestToFiles.java | 154 +++ ...lynLauncherRebindToCloudObjectStoreTest.java | 175 +++ .../brooklyn/launcher/BrooklynLauncherTest.java | 368 ++++++ .../launcher/BrooklynWebServerTest.java | 210 ++++ .../launcher/SimpleYamlLauncherForTests.java | 31 + .../brooklyn/launcher/WebAppRunnerTest.java | 171 +++ .../apache/brooklyn/launcher/YamlLauncher.java | 35 + .../blueprints/AbstractBlueprintTest.java | 202 ++++ .../blueprints/CouchbaseBlueprintTest.java | 69 ++ .../blueprints/MongoDbBlueprintTest.java | 51 + .../brooklyn/qa/load/SimulatedTheeTierApp.java | 2 +- .../SoftlayerObtainPrivateLiveTest.java | 2 +- .../org/apache/brooklyn/qa/load/LoadTest.java | 2 +- .../qa/longevity/webcluster/WebClusterApp.java | 2 +- 74 files changed, 4883 insertions(+), 4776 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc4ffb9d/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc4ffb9d/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java ---------------------------------------------------------------------- diff --cc examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java index 4328269,673b18e..94f824d --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java @@@ -30,8 -27,10 +30,8 @@@ import brooklyn.entity.basic.AbstractAp import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.nosql.cassandra.CassandraDatacenter; -import brooklyn.entity.nosql.cassandra.CassandraNode; import brooklyn.entity.proxying.EntitySpec; - import brooklyn.launcher.BrooklynLauncher; + import org.apache.brooklyn.launcher.BrooklynLauncher; import brooklyn.policy.EnricherSpec; import brooklyn.policy.PolicySpec; import brooklyn.policy.ha.ServiceFailureDetector; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc4ffb9d/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc4ffb9d/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java ---------------------------------------------------------------------- diff --cc examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java index fe5edc9,cda67ac..555f13c --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java @@@ -30,8 -27,10 +30,8 @@@ import brooklyn.entity.basic.AbstractAp import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.nosql.riak.RiakCluster; -import brooklyn.entity.nosql.riak.RiakNode; import brooklyn.entity.proxying.EntitySpec; - import brooklyn.launcher.BrooklynLauncher; + import org.apache.brooklyn.launcher.BrooklynLauncher; import brooklyn.policy.EnricherSpec; import brooklyn.policy.PolicySpec; import brooklyn.policy.ha.ServiceFailureDetector; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc4ffb9d/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java ---------------------------------------------------------------------- diff --cc examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java index fe9059f,7d3aa65..27caccf --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java @@@ -25,8 -23,9 +25,8 @@@ import org.apache.brooklyn.entity.nosql import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.nosql.cassandra.CassandraDatacenter; import brooklyn.entity.proxying.EntitySpec; - import brooklyn.launcher.BrooklynLauncher; + import org.apache.brooklyn.launcher.BrooklynLauncher; import brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc4ffb9d/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java ---------------------------------------------------------------------- diff --cc examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java index 6116d13,b528f42..89a1fa3 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java @@@ -32,8 -28,11 +32,8 @@@ import brooklyn.entity.basic.AbstractAp import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.nosql.cassandra.CassandraDatacenter; -import brooklyn.entity.nosql.cassandra.CassandraFabric; -import brooklyn.entity.nosql.cassandra.CassandraNode; import brooklyn.entity.proxying.EntitySpec; - import brooklyn.launcher.BrooklynLauncher; + import org.apache.brooklyn.launcher.BrooklynLauncher; import brooklyn.policy.EnricherSpec; import brooklyn.policy.PolicySpec; import brooklyn.policy.ha.ServiceFailureDetector;
