You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:46:32 UTC
[14/50] brooklyn-library git commit: Deletes
ApplicationBuilder.Builder
Deletes ApplicationBuilder.Builder
- Removes the Builder
- Adds ApplicationBuilder.newManagedApp(...) for use
by tests.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/576b649c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/576b649c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/576b649c
Branch: refs/heads/0.5.0
Commit: 576b649cdea5dc5d26edbe6759da1aea47d0d753
Parents: 8990ab7
Author: Aled Sage <al...@gmail.com>
Authored: Thu Mar 28 16:12:39 2013 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Apr 1 12:41:41 2013 +0100
----------------------------------------------------------------------
.../brooklyn/entity/database/mysql/MySqlIntegrationTest.groovy | 2 +-
.../entity/database/postgresql/PostgreSqlIntegrationTest.groovy | 2 +-
.../brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java | 2 +-
.../entity/messaging/activemq/ActiveMQIntegrationTest.groovy | 2 +-
.../java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.groovy | 2 +-
.../brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.groovy | 2 +-
.../brooklyn/entity/nosql/cassandra/AbstractCassandraNodeTest.java | 2 +-
.../brooklyn/entity/nosql/cassandra/CassandraClusterLiveTest.java | 2 +-
.../brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java | 2 +-
.../java/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java | 2 +-
.../src/test/java/brooklyn/entity/nosql/mongodb/MongoDbTest.java | 2 +-
.../test/java/brooklyn/entity/osgi/karaf/KarafContainerTest.groovy | 2 +-
.../test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.groovy | 2 +-
.../entity/dns/geoscaling/GeoscalingIntegrationTest.groovy | 2 +-
.../webapp/src/test/java/brooklyn/entity/proxy/UrlMappingTest.java | 2 +-
.../brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java | 2 +-
.../entity/proxy/nginx/NginxHttpsSslIntegrationTest.groovy | 2 +-
.../java/brooklyn/entity/proxy/nginx/NginxIntegrationTest.groovy | 2 +-
.../brooklyn/entity/proxy/nginx/NginxLightIntegrationTest.java | 2 +-
.../brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java | 2 +-
.../entity/proxy/nginx/NginxUrlMappingIntegrationTest.groovy | 2 +-
.../brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.groovy | 2 +-
.../brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java | 2 +-
.../java/brooklyn/entity/webapp/DynamicWebAppClusterTest.groovy | 2 +-
.../test/java/brooklyn/entity/webapp/DynamicWebAppFabricTest.java | 2 +-
.../webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java | 2 +-
.../brooklyn/entity/webapp/jboss/Jboss7ServerIntegrationTest.java | 2 +-
.../entity/webapp/jboss/Jboss7ServerRebindIntegrationTest.java | 2 +-
.../brooklyn/entity/webapp/tomcat/TomcatServerIntegrationTest.java | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.groovy b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.groovy
index e3d8f2d..30829c9 100644
--- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.groovy
+++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.groovy
@@ -28,7 +28,7 @@ public class MySqlIntegrationTest {
@BeforeMethod(alwaysRun = true)
public void before() {
- tapp = ApplicationBuilder.builder(TestApplication.class).manage();
+ tapp = ApplicationBuilder.newManagedApp(TestApplication.class);
}
@AfterMethod(alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.groovy b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.groovy
index 2f5ed6b..2fc9949 100644
--- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.groovy
+++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.groovy
@@ -25,7 +25,7 @@ public class PostgreSqlIntegrationTest {
@BeforeMethod(alwaysRun = true)
public void before() {
- tapp = ApplicationBuilder.builder(TestApplication.class).manage();
+ tapp = ApplicationBuilder.newManagedApp(TestApplication.class);
}
@AfterMethod(alwaysRun = true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java
index 71d90bc..8e8e305 100644
--- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java
+++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java
@@ -31,7 +31,7 @@ public class RubyRepIntegrationTest {
@BeforeMethod(alwaysRun = true)
public void setUp() {
- tapp = ApplicationBuilder.builder(TestApplication.class).manage();
+ tapp = ApplicationBuilder.newManagedApp(TestApplication.class);
}
@AfterMethod(alwaysRun = true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.groovy b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.groovy
index d41b9c0..f50de0c 100644
--- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.groovy
+++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.groovy
@@ -43,7 +43,7 @@ public class ActiveMQIntegrationTest {
@BeforeMethod(groups = "Integration")
public void setup() {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
testLocation = new LocalhostMachineProvisioningLocation()
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.groovy b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.groovy
index a4ea657..55e6673 100644
--- a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.groovy
+++ b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.groovy
@@ -45,7 +45,7 @@ public class QpidIntegrationTest {
public void setup() {
String workingDir = System.getProperty("user.dir");
println workingDir
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
testLocation = new LocalhostMachineProvisioningLocation()
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.groovy b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.groovy
index b41a82a..94aeb0f 100644
--- a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.groovy
+++ b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.groovy
@@ -54,7 +54,7 @@ public class RabbitIntegrationTest {
@BeforeMethod(groups = "Integration")
public void setup() {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
testLocation = new LocalhostMachineProvisioningLocation()
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/AbstractCassandraNodeTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/AbstractCassandraNodeTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/AbstractCassandraNodeTest.java
index 1e6b12f..0d9adc9 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/AbstractCassandraNodeTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/AbstractCassandraNodeTest.java
@@ -32,7 +32,7 @@ public class AbstractCassandraNodeTest {
@BeforeMethod(alwaysRun = true)
public void setup() throws Exception {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
testLocation = new LocalhostMachineProvisioningLocation();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraClusterLiveTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraClusterLiveTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraClusterLiveTest.java
index c0f9f85..22fbc51 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraClusterLiveTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraClusterLiveTest.java
@@ -46,7 +46,7 @@ class CassandraClusterLiveTest {
@BeforeMethod(alwaysRun = true)
public void setup() {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
testLocation = app.getManagementContext().getLocationRegistry().resolve(provider);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java
index 7c14ba1..4509881 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java
@@ -44,7 +44,7 @@ public class AbstractCouchDBNodeTest {
@BeforeMethod(alwaysRun = true)
public void setup() throws Exception {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
testLocation = new LocalhostMachineProvisioningLocation();
// testLocation = app.managementContext.locationRegistry.resolve("named:test");
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java
index ce6d694..eee4caa 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java
@@ -58,7 +58,7 @@ class CouchDBClusterLiveTest {
@BeforeMethod(alwaysRun = true)
public void setup() {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
testLocation = app.getManagementContext().getLocationRegistry().resolve(provider);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/MongoDbTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/MongoDbTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/MongoDbTest.java
index 4d2a4c0..3ab7aaf 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/MongoDbTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/MongoDbTest.java
@@ -35,7 +35,7 @@ public class MongoDbTest {
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
localhostProvisioningLocation = new LocalhostMachineProvisioningLocation();
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
}
@AfterMethod(alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/osgi/src/test/java/brooklyn/entity/osgi/karaf/KarafContainerTest.groovy
----------------------------------------------------------------------
diff --git a/software/osgi/src/test/java/brooklyn/entity/osgi/karaf/KarafContainerTest.groovy b/software/osgi/src/test/java/brooklyn/entity/osgi/karaf/KarafContainerTest.groovy
index a30e699..e06440c 100644
--- a/software/osgi/src/test/java/brooklyn/entity/osgi/karaf/KarafContainerTest.groovy
+++ b/software/osgi/src/test/java/brooklyn/entity/osgi/karaf/KarafContainerTest.groovy
@@ -29,7 +29,7 @@ public class KarafContainerTest {
@BeforeMethod(alwaysRun=true)
public void setup() {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
}
@AfterMethod(alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.groovy b/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.groovy
index f71322e..bba6b3b 100644
--- a/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.groovy
+++ b/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.groovy
@@ -63,7 +63,7 @@ public class AbstractGeoDnsServiceTest {
@BeforeMethod(alwaysRun=true)
public void setup() {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
fabric = app.createAndManageChild(EntitySpecs.spec(DynamicFabric.class)
.configure("factory", { properties -> new TestEntityImpl(properties) }));
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.groovy b/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.groovy
index 750db2e..bae975f 100644
--- a/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.groovy
+++ b/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.groovy
@@ -36,7 +36,7 @@ class GeoscalingIntegrationTest {
@Test(groups=["Integration"])
public void testRoutesToExpectedLocation() {
- TestApplication app = ApplicationBuilder.builder(TestApplication.class).manage();
+ TestApplication app = ApplicationBuilder.newManagedApp(TestApplication.class);
TestEntity target = app.createAndManageChild(EntitySpecs.spec(TestEntity.class));
target.setAttribute(Attributes.HOSTNAME,addr.getHostName())
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/proxy/UrlMappingTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/UrlMappingTest.java b/software/webapp/src/test/java/brooklyn/entity/proxy/UrlMappingTest.java
index ef856fd..85ed58d 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/UrlMappingTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/UrlMappingTest.java
@@ -49,7 +49,7 @@ public class UrlMappingTest {
mementoDir = Files.createTempDir();
managementContext = RebindTestUtils.newPersistingManagementContext(mementoDir, classLoader);
- app = ApplicationBuilder.builder(TestApplication.class).manage(managementContext);
+ app = ApplicationBuilder.newManagedApp(TestApplication.class, managementContext);
EntityFactory<StubAppServer> serverFactory = new BasicConfigurableEntityFactory<StubAppServer>(StubAppServer.class);
cluster = app.createAndManageChild(EntitySpecs.spec(DynamicCluster.class)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java
index 17c0aa8..bad05f2 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java
@@ -62,7 +62,7 @@ public class NginxClusterIntegrationTest {
war = checkNotNull(getClass().getClassLoader().getResource("hello-world.war"), "hello-world.war not on classpath");
localhostProvisioningLoc = new LocalhostMachineProvisioningLocation(MutableMap.of("address", "localhost"));
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
urlMappings = app.createAndManageChild(EntitySpecs.spec(BasicGroup.class)
.configure("childrenAsMembers", true));
entityManager = app.getManagementContext().getEntityManager();
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.groovy b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.groovy
index cd6d5a2..0265f52 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.groovy
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.groovy
@@ -42,7 +42,7 @@ public class NginxHttpsSslIntegrationTest {
@BeforeMethod(alwaysRun=true)
public void setup() {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
}
@AfterMethod(alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxIntegrationTest.groovy b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxIntegrationTest.groovy
index 4ea4fe0..282b7dc 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxIntegrationTest.groovy
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxIntegrationTest.groovy
@@ -39,7 +39,7 @@ public class NginxIntegrationTest {
@BeforeMethod(alwaysRun=true)
public void setup() {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
}
@AfterMethod(alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxLightIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxLightIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxLightIntegrationTest.java
index 2916205..5b87e12 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxLightIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxLightIntegrationTest.java
@@ -39,7 +39,7 @@ public class NginxLightIntegrationTest {
@BeforeMethod
public void setup() {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
}
@AfterMethod(alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java
index ad11bdf..05d6577 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java
@@ -65,7 +65,7 @@ public class NginxRebindIntegrationTest {
mementoDir = Files.createTempDir();
origManagementContext = RebindTestUtils.newPersistingManagementContext(mementoDir, classLoader);
- origApp = ApplicationBuilder.builder(TestApplication.class).manage(origManagementContext);
+ origApp = ApplicationBuilder.newManagedApp(TestApplication.class, origManagementContext);
localhostProvisioningLocation = new LocalhostMachineProvisioningLocation();
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.groovy b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.groovy
index ca910f7..3bc2804 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.groovy
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.groovy
@@ -58,7 +58,7 @@ public class NginxUrlMappingIntegrationTest {
war = getClass().getClassLoader().getResource("hello-world.war")
assertNotNull(war, "Unable to locate hello-world.war resource");
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
urlMappingsGroup = app.createAndManageChild(EntitySpecs.spec(BasicGroup.class)
.configure("childrenAsMembers", true));
entityManager = app.getManagementContext().getEntityManager();
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.groovy b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.groovy
index ab87cbd..da48c8f 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.groovy
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.groovy
@@ -44,7 +44,7 @@ public class NginxWebClusterEc2LiveTest {
ImmutableMap.of("brooklyn.location.jclouds.aws-ec2.image-id", "us-east-1/ami-2342a94a"));
loc = managementContext.getLocationRegistry().resolve("aws-ec2:us-east-1")
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
Entities.startManagement(app, managementContext)
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java
index ca36302..1af049d 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java
@@ -48,7 +48,7 @@ public class ControlledDynamicWebAppClusterTest {
String warPath = "hello-world.war";
warUrl = getClass().getClassLoader().getResource(warPath);
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
loc = new LocalhostMachineProvisioningLocation();
locs = ImmutableList.of(loc);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppClusterTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppClusterTest.groovy b/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppClusterTest.groovy
index 374ad74..2bcb46e 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppClusterTest.groovy
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppClusterTest.groovy
@@ -38,7 +38,7 @@ public class DynamicWebAppClusterTest {
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
}
@AfterMethod(alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppFabricTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppFabricTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppFabricTest.java
index 1f7cc8d..93eb96d 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppFabricTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/DynamicWebAppFabricTest.java
@@ -39,7 +39,7 @@ public class DynamicWebAppFabricTest {
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
loc1 = new SimulatedLocation();
loc2 = new SimulatedLocation();
locs = ImmutableList.of(loc1, loc2);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java
index 84f82c5..4b13d26 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java
@@ -63,7 +63,7 @@ public class DynamicWebAppClusterRebindIntegrationTest {
origManagementContext = RebindTestUtils.newPersistingManagementContext(mementoDir, classLoader);
localhostProvisioningLocation = new LocalhostMachineProvisioningLocation();
- origApp = ApplicationBuilder.builder(TestApplication.class).manage(origManagementContext);
+ origApp = ApplicationBuilder.newManagedApp(TestApplication.class, origManagementContext);
}
@AfterMethod(groups = "Integration", alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerIntegrationTest.java
index 465d887..6634198 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerIntegrationTest.java
@@ -49,7 +49,7 @@ public class Jboss7ServerIntegrationTest {
warUrl = getClass().getClassLoader().getResource(warPath);
localhostProvisioningLocation = new LocalhostMachineProvisioningLocation();
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
keystoreFile = createTemporaryKeyStore("myname", "mypass");
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerRebindIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerRebindIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerRebindIntegrationTest.java
index 786a41b..64834ea 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerRebindIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/Jboss7ServerRebindIntegrationTest.java
@@ -62,7 +62,7 @@ public class Jboss7ServerRebindIntegrationTest {
origManagementContext = RebindTestUtils.newPersistingManagementContext(mementoDir, classLoader);
localhostProvisioningLocation = new LocalhostMachineProvisioningLocation();
- origApp = ApplicationBuilder.builder(TestApplication.class).manage(origManagementContext);
+ origApp = ApplicationBuilder.newManagedApp(TestApplication.class, origManagementContext);
}
@AfterMethod(groups = "Integration", alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/576b649c/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerIntegrationTest.java
index 48793fe..9a06f1c 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerIntegrationTest.java
@@ -55,7 +55,7 @@ public class TomcatServerIntegrationTest {
public void detectFailureIfTomcatCantBindToPort() throws Exception {
ServerSocket listener = new ServerSocket(DEFAULT_HTTP_PORT);
try {
- app = ApplicationBuilder.builder(TestApplication.class).manage();
+ app = ApplicationBuilder.newManagedApp(TestApplication.class);
tc = app.createAndManageChild(EntitySpecs.spec(TomcatServer.class).configure("httpPort",DEFAULT_HTTP_PORT));
try {