Repository: incubator-brooklyn Updated Branches: refs/heads/master 1811c4b08 -> 162b1d46a
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/launcher/src/test/resources/vanilla-software-with-child-blueprint.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/vanilla-software-with-child-blueprint.yaml b/usage/launcher/src/test/resources/vanilla-software-with-child-blueprint.yaml index 877cef0..8a3aa23 100644 --- a/usage/launcher/src/test/resources/vanilla-software-with-child-blueprint.yaml +++ b/usage/launcher/src/test/resources/vanilla-software-with-child-blueprint.yaml @@ -22,7 +22,7 @@ name: vanilla-date-test location: localhost services: -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Date1 brooklyn.config: launch.command: | @@ -33,7 +33,7 @@ services: sleep 3 children.startable.mode: foreground_late brooklyn.children: - - type: brooklyn.entity.basic.VanillaSoftwareProcess + - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Date2 brooklyn.config: launch.command: | http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java index 2cdcce8..dfa0272 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java @@ -122,7 +122,7 @@ public class EntityResourceTest extends BrooklynRestResourceTest { public void testAddChild() throws Exception { try { // to test in GUI: - // services: [ { type: brooklyn.entity.basic.BasicEntity }] + // services: [ { type: org.apache.brooklyn.entity.stock.BasicEntity }] ClientResponse response = client().resource(entityEndpoint + "/children?timeout=10s") .entity("services: [ { type: "+TestEntity.class.getName()+" }]", "application/yaml") .post(ClientResponse.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java index 7260205..f84cb80 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java @@ -125,7 +125,7 @@ public class ServerResourceTest extends BrooklynRestResourceTest { } } - // Alternatively could reuse a blocking location, see brooklyn.entity.basic.SoftwareProcessEntityTest.ReleaseLatchLocation + // Alternatively could reuse a blocking location, see org.apache.brooklyn.entity.software.base.SoftwareProcessEntityTest.ReleaseLatchLocation @ImplementedBy(StopLatchEntityImpl.class) public interface StopLatchEntity extends EmptySoftwareProcess { public void unblock(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java index 82f4025..4ed60ed 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java @@ -105,7 +105,7 @@ public class ServerShutdownTest extends BrooklynRestResourceTest { @Test public void testStopAppThenShutdownAndStopAppsWaitsForFirstStop() throws InterruptedException { ReflectiveEntityDriverFactory f = ((BasicEntityDriverManager)getManagementContext().getEntityDriverManager()).getReflectiveDriverFactory(); - f.addClassFullNameMapping("brooklyn.entity.basic.EmptySoftwareProcessDriver", "org.apache.brooklyn.rest.resources.ServerResourceTest$EmptySoftwareProcessTestDriver"); + f.addClassFullNameMapping("org.apache.brooklyn.entity.software.base.EmptySoftwareProcessDriver", "org.apache.brooklyn.rest.resources.ServerResourceTest$EmptySoftwareProcessTestDriver"); // Second stop on SoftwareProcess could return early, while the first stop is still in progress // This causes the app to shutdown prematurely, leaking machines.
