http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java index c9901db..fafb51b 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java @@ -18,6 +18,8 @@ */ package org.apache.brooklyn.launcher; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.ha.HighAvailabilityMode; @@ -39,8 +41,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; -import brooklyn.entity.Application; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.management.internal.ManagementContextInternal;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java index e9d4de5..5afcc53 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java @@ -18,6 +18,8 @@ */ package org.apache.brooklyn.launcher; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.ha.HighAvailabilityMode; @@ -38,10 +40,8 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; -import brooklyn.entity.Application; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java index 1da7dda..15ea3c5 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.launcher; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.ha.HighAvailabilityMode; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerPaths; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistMode; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java index fac6df5..84798ab 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.launcher; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMementoRawData; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerPaths; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.jclouds.BlobStoreTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java index be53ae1..92d68bb 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java @@ -18,6 +18,8 @@ */ package org.apache.brooklyn.launcher; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.management.ManagementContext; @@ -47,9 +49,7 @@ import org.testng.annotations.Test; import brooklyn.catalog.internal.CatalogInitialization; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; -import brooklyn.entity.Application; import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java index 1f4791f..e30c091 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java @@ -25,6 +25,8 @@ import java.io.Reader; import java.io.StringReader; import java.util.Collection; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; @@ -32,8 +34,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java index 349aea7..b513bad 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java @@ -24,13 +24,13 @@ import java.net.URI; import java.util.Collection; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.entity.proxy.nginx.NginxControllerImpl; import org.apache.brooklyn.entity.proxy.nginx.NginxSshDriver; import org.apache.brooklyn.entity.proxy.nginx.UrlMapping; import org.apache.brooklyn.policy.PolicySpec; import brooklyn.config.ConfigKey; -import brooklyn.entity.Group; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.feed.ConfigToAttributes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java index daee92b..b017ae1 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java @@ -35,9 +35,9 @@ import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.database.mysql.MySqlNode; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.java.JavaEntityMethods; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; @@ -46,6 +46,7 @@ import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; + import brooklyn.location.basic.PortRanges; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 aad5769..4b59a41 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 @@ -40,8 +40,8 @@ import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.brooklynnode.BrooklynEntityMirror; import brooklyn.entity.brooklynnode.BrooklynNode; import brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; -import brooklyn.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.management.ManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java index e142790..eccce8d 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java @@ -39,10 +39,10 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.trait.Startable; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.ha.HighAvailabilityMode; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java index 17e7a32..0cc2b8f 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java @@ -22,13 +22,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.AttributeSensor; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java index f093fe9..25e6b45 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java @@ -25,10 +25,10 @@ import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java index a873261..713d230 100644 --- a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java +++ b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java @@ -34,12 +34,12 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.entity.Application; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.StartableApplication; import brooklyn.location.basic.BasicLocationRegistry; import brooklyn.management.internal.LocalManagementContext; +import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java index 2d74267..e370c20 100644 --- a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java +++ b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java @@ -33,12 +33,12 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.entity.Application; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.location.basic.BasicLocationRegistry; import brooklyn.management.internal.LocalManagementContext; +import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java index 837ee63..580a859 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java @@ -29,10 +29,10 @@ import org.codehaus.jackson.map.ObjectMapper; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServiceAttributes; import brooklyn.config.render.RendererHints; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; import brooklyn.management.ManagementContextInjectable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java index 1dad480..4a47ef2 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java @@ -47,9 +47,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; @@ -65,6 +62,9 @@ import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.management.internal.EntityManagementUtils; import brooklyn.management.internal.EntityManagementUtils.CreationResult; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.api.ApplicationApi; import org.apache.brooklyn.rest.domain.ApplicationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java index c107890..03350b3 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java @@ -35,6 +35,9 @@ import javax.ws.rs.core.Response.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.catalog.CatalogItem.CatalogItemType; @@ -43,9 +46,6 @@ import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogDto; import brooklyn.catalog.internal.CatalogItemComparator; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.management.entitlement.Entitlements; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java index 0196198..a175674 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java @@ -33,12 +33,12 @@ import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; -import brooklyn.entity.Effector; -import brooklyn.entity.basic.EntityLocal; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.management.internal.EffectorUtils; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.api.EffectorApi; import org.apache.brooklyn.rest.domain.EffectorSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java index b7636f6..98917cd 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java @@ -27,17 +27,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.basic.BasicConfigKey; import brooklyn.management.entitlement.Entitlements; + +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.rest.api.EntityConfigApi; import org.apache.brooklyn.rest.domain.EntityConfigSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.EntityTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.flags.TypeCoercions; import brooklyn.util.task.ValueResolver; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java index 1157df1..63e2461 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java @@ -38,17 +38,17 @@ import javax.ws.rs.core.UriInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTags; import brooklyn.entity.basic.BrooklynTags.NamedStringTag; import brooklyn.entity.basic.BrooklynTaskTags; -import brooklyn.entity.basic.EntityLocal; import brooklyn.location.Location; import brooklyn.management.entitlement.EntitlementPredicates; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.internal.EntityManagementUtils; import brooklyn.management.internal.EntityManagementUtils.CreationResult; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.api.EntityApi; import org.apache.brooklyn.rest.domain.EntitySummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java index 72e9c38..c0fa8eb 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java @@ -25,10 +25,10 @@ import javax.ws.rs.core.Response; import brooklyn.basic.BrooklynObjectInternal; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; import brooklyn.management.entitlement.Entitlements; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.rest.api.PolicyConfigApi; import org.apache.brooklyn.rest.domain.PolicyConfigSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java index fd45bd2..8ebc13a 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java @@ -26,10 +26,10 @@ import javax.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; import brooklyn.policy.basic.Policies; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.rest.api.PolicyApi; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java index d27eb38..0bb8c7e 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java @@ -28,16 +28,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.management.entitlement.Entitlements; + +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.rest.api.SensorApi; import org.apache.brooklyn.rest.domain.SensorSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.SensorTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.task.ValueResolver; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java index 9787a49..66e1997 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java @@ -42,11 +42,9 @@ import com.google.common.collect.FluentIterable; import brooklyn.BrooklynVersion; import brooklyn.config.ConfigKey; -import brooklyn.entity.Application; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; @@ -55,6 +53,8 @@ import brooklyn.entity.rebind.persister.PersistenceObjectStore; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.internal.ManagementContextInternal; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.management.entitlement.EntitlementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java index 92841ad..e82fc82 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java @@ -34,11 +34,12 @@ import java.util.Map; import javax.annotation.Nullable; -import brooklyn.entity.Application; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; + +import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.Status; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java index b15715c..f6325d5 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java @@ -26,15 +26,15 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynTypes; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityType; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.catalog.CatalogItem.CatalogItemType; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.EntityType; import brooklyn.entity.basic.EntityDynamicType; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.Sensor; import brooklyn.location.Location; import brooklyn.location.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java index 6c6e0ee..f78df8b 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java @@ -23,13 +23,14 @@ import java.util.Set; import javax.annotation.Nullable; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.ParameterType; -import brooklyn.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.ParameterType; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.rest.domain.EffectorSummary; import org.apache.brooklyn.rest.domain.EffectorSummary.ParameterSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java index 659559a..00706cf 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java @@ -25,15 +25,18 @@ import java.net.URI; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.catalog.CatalogConfig; + import brooklyn.config.ConfigKey; import brooklyn.config.render.RendererHints; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; + import org.apache.brooklyn.rest.domain.EntityConfigSummary; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.collections.MutableMap; import brooklyn.util.net.URLParamEncoder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java index a37d98d..a7cd50b 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java @@ -22,10 +22,10 @@ import java.net.URI; import java.util.Map; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; import brooklyn.policy.basic.Policies; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.PolicyConfigSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java index 6fdd744..ea908e5 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java @@ -24,10 +24,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.render.RendererHints; -import brooklyn.entity.Entity; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; + +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.rest.domain.SensorSummary; + import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.URLParamEncoder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java index 6db2e40..53a684c 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java @@ -30,10 +30,10 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.HasTaskChildren; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.domain.LinkWithMetadata; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java index aa94352..e4a23f2 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java @@ -40,21 +40,21 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynTypes; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.LocationRegistry; @@ -266,7 +266,7 @@ public class BrooklynRestResourceUtils { instance = appBuilder.manage(mgmt); } else if (Application.class.isAssignableFrom(clazz)) { - brooklyn.entity.proxying.EntitySpec<?> coreSpec = toCoreEntitySpec(clazz, name, configO, catalogItemId); + org.apache.brooklyn.api.entity.proxying.EntitySpec<?> coreSpec = toCoreEntitySpec(clazz, name, configO, catalogItemId); configureRenderingMetadata(spec, coreSpec); instance = (Application) mgmt.getEntityManager().createEntity(coreSpec); for (EntitySpec entitySpec : entities) { @@ -281,7 +281,7 @@ public class BrooklynRestResourceUtils { if (entities.size() > 0) log.warn("Cannot supply additional entities when using a non-application entity; ignoring in spec {}", spec); - brooklyn.entity.proxying.EntitySpec<?> coreSpec = toCoreEntitySpec(BasicApplication.class, name, configO, catalogItemId); + org.apache.brooklyn.api.entity.proxying.EntitySpec<?> coreSpec = toCoreEntitySpec(BasicApplication.class, name, configO, catalogItemId); configureRenderingMetadata(spec, coreSpec); instance = (Application) mgmt.getEntityManager().createEntity(coreSpec); @@ -337,7 +337,7 @@ public class BrooklynRestResourceUtils { } @SuppressWarnings({ "unchecked", "deprecation" }) - private brooklyn.entity.proxying.EntitySpec<? extends Entity> toCoreEntitySpec(org.apache.brooklyn.rest.domain.EntitySpec spec) { + private org.apache.brooklyn.api.entity.proxying.EntitySpec<? extends Entity> toCoreEntitySpec(org.apache.brooklyn.rest.domain.EntitySpec spec) { String type = spec.getType(); String name = spec.getName(); Map<String, String> config = (spec.getConfig() == null) ? Maps.<String,String>newLinkedHashMap() : Maps.newLinkedHashMap(spec.getConfig()); @@ -360,11 +360,11 @@ public class BrooklynRestResourceUtils { } } final Class<? extends Entity> clazz = tempclazz; - brooklyn.entity.proxying.EntitySpec<? extends Entity> result; + org.apache.brooklyn.api.entity.proxying.EntitySpec<? extends Entity> result; if (clazz.isInterface()) { - result = brooklyn.entity.proxying.EntitySpec.create(clazz); + result = org.apache.brooklyn.api.entity.proxying.EntitySpec.create(clazz); } else { - result = brooklyn.entity.proxying.EntitySpec.create(Entity.class).impl(clazz).additionalInterfaces(Reflections.getAllInterfaces(clazz)); + result = org.apache.brooklyn.api.entity.proxying.EntitySpec.create(Entity.class).impl(clazz).additionalInterfaces(Reflections.getAllInterfaces(clazz)); } result.catalogItemId(catalogItemId); if (!Strings.isEmpty(name)) result.displayName(name); @@ -377,11 +377,11 @@ public class BrooklynRestResourceUtils { appBuilder.configure(getRenderingConfigurationFor(spec.getType())); } - protected void configureRenderingMetadata(ApplicationSpec input, brooklyn.entity.proxying.EntitySpec<?> entity) { + protected void configureRenderingMetadata(ApplicationSpec input, org.apache.brooklyn.api.entity.proxying.EntitySpec<?> entity) { entity.configure(getRenderingConfigurationFor(input.getType())); } - protected void configureRenderingMetadata(EntitySpec input, brooklyn.entity.proxying.EntitySpec<?> entity) { + protected void configureRenderingMetadata(EntitySpec input, org.apache.brooklyn.api.entity.proxying.EntitySpec<?> entity) { entity.configure(getRenderingConfigurationFor(input.getType())); } @@ -395,18 +395,18 @@ public class BrooklynRestResourceUtils { } @SuppressWarnings({ "rawtypes", "unchecked" }) - private <T extends Entity> brooklyn.entity.proxying.EntitySpec<?> toCoreEntitySpec(Class<T> clazz, String name, Map<String,String> configO, String catalogItemId) { + private <T extends Entity> org.apache.brooklyn.api.entity.proxying.EntitySpec<?> toCoreEntitySpec(Class<T> clazz, String name, Map<String,String> configO, String catalogItemId) { Map<String, String> config = (configO == null) ? Maps.<String,String>newLinkedHashMap() : Maps.newLinkedHashMap(configO); - brooklyn.entity.proxying.EntitySpec<? extends Entity> result; + org.apache.brooklyn.api.entity.proxying.EntitySpec<? extends Entity> result; if (clazz.isInterface()) { - result = brooklyn.entity.proxying.EntitySpec.create(clazz); + result = org.apache.brooklyn.api.entity.proxying.EntitySpec.create(clazz); } else { // If this is a concrete class, particularly for an Application class, we want the proxy // to expose all interfaces it implements. Class interfaceclazz = (Application.class.isAssignableFrom(clazz)) ? Application.class : Entity.class; Set<Class<?>> additionalInterfaceClazzes = Reflections.getInterfacesIncludingClassAncestors(clazz); - result = brooklyn.entity.proxying.EntitySpec.create(interfaceclazz).impl(clazz).additionalInterfaces(additionalInterfaceClazzes); + result = org.apache.brooklyn.api.entity.proxying.EntitySpec.create(interfaceclazz).impl(clazz).additionalInterfaces(additionalInterfaceClazzes); } result.catalogItemId(catalogItemId); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java index c8492fb..d9937a5 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java @@ -21,9 +21,9 @@ package org.apache.brooklyn.rest.util; import java.util.LinkedHashMap; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.ManagementContext; -import brooklyn.entity.Entity; import brooklyn.location.Location; import brooklyn.location.basic.LocationConfigKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java index a6a143c..9afd886 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Map; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.ManagementContext; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonGenerator; @@ -33,7 +34,6 @@ import org.codehaus.jackson.map.JsonSerializer; import org.codehaus.jackson.map.SerializerProvider; import org.codehaus.jackson.map.module.SimpleModule; -import brooklyn.entity.Entity; import brooklyn.location.Location; public class BidiSerialization { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java index 6047bea..535c676 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java @@ -32,12 +32,12 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.BasicApplication; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.brooklynnode.BrooklynNode; import brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.feed.http.JsonFunctions; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.test.HttpTestUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java index 22347a8..7113cd5 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java @@ -25,6 +25,8 @@ import java.net.URI; import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; import org.apache.http.HttpStatus; import org.apache.http.client.HttpClient; @@ -32,10 +34,8 @@ import org.eclipse.jetty.server.Server; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestUtils; import org.apache.brooklyn.management.EntityManager; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java index d4e9610..0528803 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java @@ -27,12 +27,12 @@ import java.io.IOException; import java.net.URI; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplicationImpl; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java index 54a7cd5..4c6b563 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java @@ -32,11 +32,11 @@ import org.testng.annotations.Test; import brooklyn.config.render.RendererHints; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.Sensors; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.transform.SensorTransformer; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java index 9d05dea..20c092b 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java @@ -52,19 +52,20 @@ import com.sun.jersey.api.client.UniformInterfaceException; import com.sun.jersey.api.client.WebResource; import com.sun.jersey.core.util.MultivaluedMapImpl; -import brooklyn.entity.Application; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFunctions; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.Lifecycle; import brooklyn.location.basic.AbstractLocation; import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.basic.LocationInternal; import brooklyn.location.geo.HostGeoInfo; + +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.ApplicationSummary; @@ -82,6 +83,7 @@ import org.apache.brooklyn.rest.testing.mocks.NameMatcherGroup; import org.apache.brooklyn.rest.testing.mocks.RestMockApp; import org.apache.brooklyn.rest.testing.mocks.RestMockAppBuilder; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; + import brooklyn.test.Asserts; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java index ea1bafd..e9c1f44 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java @@ -33,15 +33,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.basic.Sensors; + +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; + import brooklyn.util.collections.MutableList; import brooklyn.util.text.StringEscapes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 9449776..680828b 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 @@ -35,10 +35,11 @@ import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; + +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.domain.TaskSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java index 70ca4f4..0c2e47d 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java @@ -28,12 +28,12 @@ import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityPredicates; -import brooklyn.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 cacc22d..201d609 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 @@ -43,9 +43,9 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.EmptySoftwareProcessDriver; import brooklyn.entity.basic.EmptySoftwareProcessImpl; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.management.internal.ManagementContextInternal; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; import org.apache.brooklyn.rest.domain.VersionSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 c007dcd..251b3e5 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 @@ -46,9 +46,9 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.drivers.BasicEntityDriverManager; import brooklyn.entity.drivers.ReflectiveEntityDriverFactory; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.resources.ServerResourceTest.StopLatchEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java index 1b53085..57149e4 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java @@ -241,7 +241,7 @@ public class UsageResourceTest extends BrooklynRestResourceTest { public void testListAndGetMachineUsage() throws Exception { Location location = getManagementContext().getLocationManager().createLocation(LocationSpec.create(DynamicLocalhostMachineProvisioningLocation.class)); TestApplication app = ApplicationBuilder.newManagedApp(TestApplication.class, getManagementContext()); - SoftwareProcessEntityTest.MyService entity = app.createAndManageChild(brooklyn.entity.proxying.EntitySpec.create(SoftwareProcessEntityTest.MyService.class)); + SoftwareProcessEntityTest.MyService entity = app.createAndManageChild(org.apache.brooklyn.api.entity.proxying.EntitySpec.create(SoftwareProcessEntityTest.MyService.class)); Calendar preStart = new GregorianCalendar(); app.start(ImmutableList.of(location)); @@ -267,7 +267,7 @@ public class UsageResourceTest extends BrooklynRestResourceTest { public void testListMachinesUsageForApp() throws Exception { Location location = getManagementContext().getLocationManager().createLocation(LocationSpec.create(DynamicLocalhostMachineProvisioningLocation.class)); TestApplication app = ApplicationBuilder.newManagedApp(TestApplication.class, getManagementContext()); - SoftwareProcessEntityTest.MyService entity = app.createAndManageChild(brooklyn.entity.proxying.EntitySpec.create(SoftwareProcessEntityTest.MyService.class)); + SoftwareProcessEntityTest.MyService entity = app.createAndManageChild(org.apache.brooklyn.api.entity.proxying.EntitySpec.create(SoftwareProcessEntityTest.MyService.class)); String appId = app.getId(); Calendar preStart = new GregorianCalendar(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java index e221033..01301b8 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java @@ -35,11 +35,13 @@ import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; -import brooklyn.entity.Application; import brooklyn.entity.basic.Entities; + +import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.Status; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.repeat.Repeater; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java index c174891..d324507 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java @@ -18,7 +18,8 @@ */ package org.apache.brooklyn.rest.testing.mocks; -import brooklyn.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.basic.EntityLocal; + import brooklyn.policy.basic.AbstractPolicy; public class CapitalizePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/EverythingGroup.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/EverythingGroup.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/EverythingGroup.java index 3020f9e..5df929c 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/EverythingGroup.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/EverythingGroup.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.rest.testing.mocks; -import brooklyn.entity.Group; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; @ImplementedBy(EverythingGroupImpl.class) public interface EverythingGroup extends Group { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java index 06552a6..e15d779 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java @@ -18,10 +18,11 @@ */ package org.apache.brooklyn.rest.testing.mocks; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Group; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(NameMatcherGroupImpl.class) public interface NameMatcherGroup extends Group { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java index b9d7d87..55d2680 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java @@ -18,10 +18,11 @@ */ package org.apache.brooklyn.rest.testing.mocks; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.util.javalang.Reflections; public class RestMockAppBuilder extends ApplicationBuilder { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java index 7fd13da..9841724 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java @@ -20,15 +20,15 @@ package org.apache.brooklyn.rest.testing.mocks; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.AttributeSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java index 783dee7..30bd532 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java @@ -27,17 +27,17 @@ import java.util.Map; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.catalog.Catalog; import brooklyn.catalog.internal.CatalogItemBuilder; import brooklyn.catalog.internal.CatalogTemplateItemDto; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.proxying.EntityProxy; import brooklyn.management.internal.LocalManagementContext; import brooklyn.policy.basic.AbstractPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java index 9840d84..25f0c28 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java @@ -31,11 +31,12 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.AbstractLocation; import brooklyn.location.basic.LocationInternal; import brooklyn.location.geo.HostGeoInfo; + +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java index dff8bda..81395a6 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java @@ -37,11 +37,11 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java index 5a16d55..73bc98e 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java @@ -28,12 +28,12 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.SubscriptionHandle; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy b/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy index 81d8c0c..2c3faa7 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy @@ -29,7 +29,7 @@ import org.codehaus.groovy.runtime.InvokerInvocationException import org.slf4j.Logger import org.slf4j.LoggerFactory -import brooklyn.entity.Entity +import org.apache.brooklyn.api.entity.Entity import brooklyn.event.AttributeSensor import brooklyn.test.Asserts; import brooklyn.util.text.StringFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java index 79d8550..772f248 100644 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java +++ b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java @@ -19,8 +19,9 @@ package brooklyn.osgi.tests; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(SimpleApplicationImpl.class) public interface SimpleApplication extends StartableApplication { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java index 496f386..8b62d9b 100644 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java +++ b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java @@ -19,8 +19,8 @@ package brooklyn.osgi.tests; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; @ImplementedBy(SimpleEntityImpl.class) public interface SimpleEntity extends Entity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java index f26f1f1..5a75515 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java @@ -19,10 +19,11 @@ package brooklyn.osgi.tests.more; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(MoreEntityImpl.class) public interface MoreEntity extends Entity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java index 283e5da..07fb799 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java @@ -19,12 +19,13 @@ package brooklyn.osgi.tests.more; -import brooklyn.entity.Application; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.ImplementedBy; public class MoreTemplate extends AbstractApplication { } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java index 553cbc5..0ad2ab6 100644 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java +++ b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java @@ -19,10 +19,10 @@ package brooklyn.osgi.tests.more; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; @ImplementedBy(MoreEntityImpl.class) public interface MoreEntity extends Entity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java index 837d6a4..1095d64 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntity.java @@ -20,10 +20,10 @@ package brooklyn.osgi.tests.more; import org.apache.brooklyn.catalog.Catalog; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; @Catalog(name="More Entity v2") @ImplementedBy(MoreEntityImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java index c2244aa..3d2b60b 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreTemplate.java @@ -20,12 +20,12 @@ package brooklyn.osgi.tests.more; import org.apache.brooklyn.catalog.Catalog; -import brooklyn.entity.Application; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; @Catalog(name="More Template", description="Cataliog item OSGi test template") public class MoreTemplate extends AbstractApplication {
