http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java b/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java index c94fec0..e364618 100644 --- a/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java +++ b/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java @@ -25,6 +25,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,8 +39,6 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.group.DynamicClusterImpl; import brooklyn.event.AttributeSensor; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java b/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java index 417dec1..d26f1a9 100644 --- a/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +56,6 @@ import brooklyn.location.basic.Machines; import brooklyn.location.basic.SimulatedLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.geo.HostGeoInfo; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java index 53961b4..12ffe6e 100644 --- a/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import java.net.InetAddress; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -39,7 +40,6 @@ import brooklyn.location.geo.HostGeoInfo; import brooklyn.location.geo.HostGeoLookup; import brooklyn.location.geo.MaxMind2HostGeoLookup; import brooklyn.location.geo.UtraceHostGeoLookup; -import brooklyn.management.ManagementContext; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 1fed57c..c75f096 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 @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.util.Collections; import java.util.List; +import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; @@ -44,7 +45,6 @@ import brooklyn.entity.webapp.JavaWebAppService; import brooklyn.entity.webapp.jboss.JBoss7Server; import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; -import brooklyn.management.EntityManager; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 0d15299..dcaaca5 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 @@ -29,6 +29,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; @@ -51,7 +52,6 @@ import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.entity.webapp.tomcat.Tomcat8Server; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.ManagementContext; import brooklyn.test.Asserts; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java index af3718e..8e2681c 100644 --- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java @@ -26,6 +26,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; @@ -50,8 +52,6 @@ import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocationReuseIntegrationTest.RecordingSshjTool; -import brooklyn.management.Task; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.util.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java index db4af61..2ebb1e5 100644 --- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.slf4j.Logger; @@ -52,7 +53,6 @@ import brooklyn.entity.webapp.jboss.JBoss7Server; import brooklyn.entity.webapp.tomcat.Tomcat8Server; import brooklyn.entity.webapp.tomcat.Tomcat8ServerImpl; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.EntityManager; import brooklyn.test.Asserts; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java index 12d157d..3646155 100644 --- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertNotNull; import java.net.URL; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.slf4j.Logger; @@ -41,7 +42,6 @@ import brooklyn.entity.webapp.jboss.JBoss7Server; import brooklyn.location.Location; import brooklyn.location.MachineLocation; import brooklyn.location.basic.Machines; -import brooklyn.management.ManagementContext; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java index d409dae..5ff4d0b 100644 --- a/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java @@ -61,11 +61,11 @@ import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.ManagementContext; -import brooklyn.management.SubscriptionContext; -import brooklyn.management.SubscriptionHandle; import brooklyn.test.Asserts; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.SubscriptionContext; +import org.apache.brooklyn.management.SubscriptionHandle; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/test/java/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java index 434d2b4..cd38dfe 100644 --- a/software/webapp/src/test/java/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java @@ -22,6 +22,7 @@ import static org.apache.brooklyn.test.HttpTestUtils.connectToUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -34,7 +35,6 @@ import brooklyn.entity.webapp.tomcat.TomcatServer; import brooklyn.entity.webapp.tomcat.TomcatServerImpl; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.ManagementContext; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java index 0a06c3c..328971c 100644 --- a/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java @@ -37,9 +37,9 @@ import brooklyn.entity.webapp.tomcat.TomcatServer; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.Task; import brooklyn.test.Asserts; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java index 14c3ca1..b7c0d5e 100644 --- a/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java @@ -27,7 +27,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.entity.webapp.WebAppService; import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; -import brooklyn.management.ManagementContext; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; @@ -36,6 +35,7 @@ import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java index d245bd6..abf98a2 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java @@ -15,7 +15,7 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.webapp.JavaWebAppService; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.ResourceUtils; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java index 312f57f..27e33f5 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java @@ -15,7 +15,7 @@ import brooklyn.entity.database.mysql.MySqlNode; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.webapp.JavaWebAppService; import brooklyn.entity.webapp.WebAppService; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java index 6f941aa..f0ae067 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java @@ -25,11 +25,11 @@ import io.brooklyn.camp.spi.PlatformRootSummary; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher; import org.apache.brooklyn.camp.brooklyn.spi.dsl.BrooklynDslInterpreter; import org.apache.brooklyn.camp.brooklyn.spi.platform.BrooklynImmutableCampPlatform; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext.PropertiesReloadListener; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; import brooklyn.config.BrooklynProperties; -import brooklyn.management.ManagementContext; -import brooklyn.management.ManagementContext.PropertiesReloadListener; /** {@link CampPlatform} implementation which includes Brooklyn entities * (via {@link BrooklynImmutableCampPlatform}) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java index d1c3cf2..1e22e4c 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.camp.brooklyn; +import org.apache.brooklyn.management.ManagementContext; + import io.brooklyn.camp.spi.PlatformRootSummary; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java index 9e54c49..c791200 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java @@ -24,6 +24,8 @@ import io.brooklyn.camp.spi.AssemblyTemplate; import java.io.Reader; import java.util.Set; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,8 +34,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynShutdownHooks; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java index 3254e20..3598ef5 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java @@ -42,6 +42,9 @@ import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; + import brooklyn.catalog.internal.BasicBrooklynCatalog.BrooklynLoaderTracker; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.BrooklynServerConfig; @@ -49,8 +52,6 @@ import brooklyn.entity.Application; import brooklyn.entity.Entity; import brooklyn.entity.basic.BasicApplicationImpl; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.internal.EntityManagementUtils; import brooklyn.management.internal.EntityManagementUtils.CreationResult; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java index c413e4d..b690468 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java @@ -40,6 +40,9 @@ import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; import org.apache.brooklyn.camp.brooklyn.spi.creation.service.BrooklynServiceTypeResolver; import org.apache.brooklyn.camp.brooklyn.spi.creation.service.ServiceTypeResolver; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; + import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.ConfigKey; import brooklyn.entity.Application; @@ -51,9 +54,7 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.management.ManagementContextInjectable; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java index 1ad4980..4c482e2 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java @@ -25,6 +25,7 @@ import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator.InstantiatorFromKey; import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; @@ -33,7 +34,6 @@ import org.apache.brooklyn.policy.PolicySpec; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.entity.proxying.EntityInitializer; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableList; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java index 27ccae7..9a0ed06 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java @@ -29,12 +29,12 @@ import java.util.Map; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.catalog.internal.BasicBrooklynCatalog; -import brooklyn.management.ManagementContext; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java index 7c4f734..7274c41 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java @@ -22,9 +22,10 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.location.Location; import brooklyn.location.LocationDefinition; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java index 8c2cb72..ad11b58 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java @@ -24,10 +24,10 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java index 9b27607..88bbd7b 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java @@ -24,6 +24,8 @@ import io.brooklyn.camp.spi.Assembly; import io.brooklyn.camp.spi.AssemblyTemplate; import io.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,8 +34,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorTasks; -import brooklyn.management.Task; -import brooklyn.management.TaskFactory; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.task.DeferredSupplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java index 37bc043..9a3354a 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java @@ -28,6 +28,9 @@ import org.apache.brooklyn.camp.brooklyn.spi.creation.EntitySpecConfiguration; import org.apache.brooklyn.camp.brooklyn.spi.dsl.BrooklynDslDeferredSupplier; import org.apache.brooklyn.camp.brooklyn.spi.dsl.DslUtils; import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.DslComponent.Scope; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.TaskFactory; import org.apache.commons.beanutils.BeanUtils; import brooklyn.entity.Entity; @@ -35,9 +38,6 @@ import brooklyn.entity.basic.EntityDynamicType; import brooklyn.entity.trait.Configurable; import brooklyn.event.Sensor; import brooklyn.event.basic.DependentConfiguration; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java index 4801a41..b782676 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java @@ -24,6 +24,7 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.camp.brooklyn.spi.dsl.BrooklynDslDeferredSupplier; +import org.apache.brooklyn.management.Task; import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; @@ -35,7 +36,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; -import brooklyn.management.Task; import brooklyn.management.internal.EntityManagerInternal; import brooklyn.util.guava.Maybe; import brooklyn.util.task.TaskBuilder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java index 6f4670d..8828c23 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java @@ -18,10 +18,11 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.lookup; +import org.apache.brooklyn.management.ManagementContext; + import io.brooklyn.camp.spi.AbstractResource; import io.brooklyn.camp.spi.PlatformRootSummary; import io.brooklyn.camp.spi.collection.AbstractResourceLookup; -import brooklyn.management.ManagementContext; public abstract class AbstractBrooklynResourceLookup<T extends AbstractResource> extends AbstractResourceLookup<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java index b7a276c..a586eff 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java @@ -24,12 +24,12 @@ import io.brooklyn.camp.spi.collection.ResolvableLink; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.catalog.internal.CatalogUtils; import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; public abstract class AbstractTemplateBrooklynLookup<T extends AbstractResource> extends AbstractBrooklynResourceLookup<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java index e3130e0..743c9bb 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java @@ -26,9 +26,10 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.entity.Application; import brooklyn.entity.Entity; -import brooklyn.management.ManagementContext; public class AssemblyBrooklynLookup extends AbstractBrooklynResourceLookup<Assembly> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java index 1e0d6a1..eb12ddb 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java @@ -27,11 +27,12 @@ import java.util.List; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynAssemblyTemplateInstantiator; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.catalog.CatalogPredicates; import brooklyn.entity.Application; import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; public class AssemblyTemplateBrooklynLookup extends AbstractTemplateBrooklynLookup<AssemblyTemplate> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java index f9bc390..b2b3384 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java @@ -18,10 +18,11 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.lookup; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.config.ConfigKey; import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.management.ManagementContext; import brooklyn.util.net.Urls; public class BrooklynUrlLookup { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java index 6b26849..aa959a6 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java @@ -27,8 +27,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.entity.Entity; -import brooklyn.management.ManagementContext; public class PlatformComponentBrooklynLookup extends AbstractBrooklynResourceLookup<PlatformComponent> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java index b990464..a0a17e4 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java @@ -26,10 +26,11 @@ import java.util.ArrayList; import java.util.List; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.catalog.CatalogPredicates; import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; public class PlatformComponentTemplateBrooklynLookup extends AbstractTemplateBrooklynLookup<PlatformComponentTemplate> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java index c04c134..b21c0c3 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java @@ -35,9 +35,9 @@ import org.apache.brooklyn.camp.brooklyn.spi.lookup.AssemblyBrooklynLookup; import org.apache.brooklyn.camp.brooklyn.spi.lookup.AssemblyTemplateBrooklynLookup; import org.apache.brooklyn.camp.brooklyn.spi.lookup.PlatformComponentBrooklynLookup; import org.apache.brooklyn.camp.brooklyn.spi.lookup.PlatformComponentTemplateBrooklynLookup; +import org.apache.brooklyn.management.ManagementContext; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; -import brooklyn.management.ManagementContext; /** Immutable CAMP platform which reflects things in the underlying Brooklyn system */ public class BrooklynImmutableCampPlatform extends CampPlatform implements HasBrooklynManagementContext { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java index 9b3c855..7cfb60d 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java @@ -27,6 +27,8 @@ import java.util.Set; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -39,8 +41,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixture; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.ResourceUtils; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java index e222b9f..dea42ce 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java @@ -27,6 +27,8 @@ import java.util.Set; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -36,8 +38,6 @@ import brooklyn.catalog.internal.CatalogUtils; import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java index 69c103e..9137b23 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java @@ -21,11 +21,11 @@ package org.apache.brooklyn.camp.brooklyn; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator.Factory; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator.InstantiatorFromKey; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.policy.Policy; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; import brooklyn.policy.ha.ServiceRestarter; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java index fb0aa36..6194255 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java @@ -22,6 +22,7 @@ import java.io.File; import java.util.Set; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -38,7 +39,6 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.event.Sensor; import brooklyn.event.basic.Sensors; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java index e35b217..5691dba 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java @@ -32,6 +32,7 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.BrooklynDslCommon; import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.DslComponent; import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.DslComponent.Scope; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -57,7 +58,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; -import brooklyn.management.Task; import brooklyn.management.internal.EntityManagerInternal; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java index a83dba2..6707169 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java @@ -25,6 +25,8 @@ import java.io.File; import java.io.Reader; import java.util.Set; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -35,8 +37,6 @@ import brooklyn.entity.Application; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java index d910324..b95b188 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java @@ -34,6 +34,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; @@ -51,8 +53,6 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.webapp.DynamicWebAppCluster; import brooklyn.entity.webapp.JavaWebAppService; import brooklyn.entity.webapp.WebAppService; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.test.Asserts; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java index 048b8f8..e390b57 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java @@ -31,6 +31,7 @@ import java.util.Map; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -39,7 +40,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java index 174b5bf..b31fdef 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java @@ -21,6 +21,8 @@ package org.apache.brooklyn.camp.brooklyn; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -33,9 +35,7 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.proxy.ProxySslConfig; import brooklyn.entity.trait.Configurable; -import brooklyn.management.ManagementContext; import brooklyn.management.ManagementContextInjectable; -import brooklyn.management.Task; import brooklyn.test.entity.TestEntity; import brooklyn.util.config.ConfigBag; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java index 275aa0a..6ad4690 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java @@ -26,6 +26,7 @@ import java.io.Reader; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import org.testng.annotations.Test; import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Startable; -import brooklyn.management.ManagementContext; import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java index 5e97099..c2cfd2e 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java @@ -19,6 +19,7 @@ package org.apache.brooklyn.camp.brooklyn; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.effector.Effectors; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; import brooklyn.util.text.StringPredicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java index 04e31ab..5ff945c 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java @@ -46,6 +46,7 @@ import com.google.common.collect.Iterables; import brooklyn.BrooklynVersion; import brooklyn.basic.BrooklynTypes; + import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.catalog.CatalogItem.CatalogItemType; @@ -61,6 +62,7 @@ import org.apache.brooklyn.cli.CloudExplorer.ComputeTerminateInstancesCommand; import org.apache.brooklyn.cli.ItemLister.ListAllCommand; import brooklyn.catalog.internal.CatalogInitialization; + import org.apache.brooklyn.cli.CloudExplorer.BlobstoreGetBlobCommand; import org.apache.brooklyn.cli.CloudExplorer.BlobstoreListContainerCommand; import org.apache.brooklyn.cli.CloudExplorer.BlobstoreListContainersCommand; @@ -71,6 +73,7 @@ import org.apache.brooklyn.cli.CloudExplorer.ComputeListImagesCommand; import org.apache.brooklyn.cli.CloudExplorer.ComputeListInstancesCommand; import org.apache.brooklyn.cli.CloudExplorer.ComputeTerminateInstancesCommand; import org.apache.brooklyn.cli.ItemLister.ListAllCommand; + import brooklyn.entity.Application; import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractApplication; @@ -83,15 +86,19 @@ import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.transformer.CompoundTransformer; import brooklyn.entity.trait.Startable; + import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.launcher.BrooklynServerDetails; import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; -import brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; + import brooklyn.management.ha.OsgiManager; + import org.apache.brooklyn.rest.security.PasswordHasher; import org.apache.brooklyn.rest.util.ShutdownHandler; + import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.FatalConfigurationRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java index 9538073..bf40969 100644 --- a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java +++ b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java @@ -26,8 +26,10 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynServiceAttributes; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; + import brooklyn.test.Asserts; /** Convenience and demo for launching programmatically. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java index ebdebb7..8e6e565 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java @@ -73,6 +73,12 @@ import brooklyn.entity.rebind.transformer.CompoundTransformer; import brooklyn.entity.trait.Startable; import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityManager; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import brooklyn.location.Location; @@ -80,13 +86,7 @@ import brooklyn.location.LocationSpec; import brooklyn.location.PortRange; import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import brooklyn.location.basic.PortRanges; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityManager; import brooklyn.management.ha.HighAvailabilityManagerImpl; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; -import brooklyn.management.ha.ManagementPlaneSyncRecord; -import brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynServerDetails.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynServerDetails.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynServerDetails.java index 1ffa8cf..9500155 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynServerDetails.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynServerDetails.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.launcher; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; public class BrooklynServerDetails { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java index 86750c3..5d66b13 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java @@ -64,12 +64,15 @@ import brooklyn.config.BrooklynServerPaths; import brooklyn.config.BrooklynServiceAttributes; import brooklyn.config.ConfigKey; import brooklyn.internal.BrooklynInitialization; + import org.apache.brooklyn.launcher.config.CustomResourceLocator; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.location.PortRange; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.PortRanges; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.ManagementContextInternal; + import org.apache.brooklyn.rest.BrooklynRestApi; import org.apache.brooklyn.rest.BrooklynWebConfig; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; @@ -81,6 +84,7 @@ import org.apache.brooklyn.rest.filter.RequestTaggingFilter; import org.apache.brooklyn.rest.util.ManagementContextProvider; import org.apache.brooklyn.rest.util.ShutdownHandler; import org.apache.brooklyn.rest.util.ShutdownHandlerProvider; + import brooklyn.util.BrooklynNetworkUtils; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; @@ -97,6 +101,7 @@ import brooklyn.util.os.Os; import brooklyn.util.stream.Streams; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; + import org.apache.brooklyn.util.web.ContextHandlerCollectionHotSwappable; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java index 72732cd..7345fd7 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java @@ -21,8 +21,10 @@ package org.apache.brooklyn.launcher.camp; import io.brooklyn.camp.CampServer; import io.brooklyn.camp.spi.PlatformRootSummary; import brooklyn.entity.basic.BrooklynShutdownHooks; + import org.apache.brooklyn.launcher.BrooklynLauncher; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.management.internal.LocalManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java index d4787ff..6eb4af9 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java @@ -36,10 +36,12 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.brooklynnode.BrooklynEntityMirror; import brooklyn.entity.proxying.EntitySpec; + import org.apache.brooklyn.launcher.BrooklynWebServer; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; + import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java index 8ffd465..6c717cf 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java @@ -39,10 +39,12 @@ import brooklyn.entity.brooklynnode.BrooklynNode; import brooklyn.entity.brooklynnode.SameBrooklynNodeImpl; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicConfigKey; + import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.SimpleYamlLauncher; +import org.apache.brooklyn.management.Task; + import brooklyn.location.Location; -import brooklyn.management.Task; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.Jsonya; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 66a9f67..a33d334 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 @@ -19,6 +19,10 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.launcher.BrooklynLauncher; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; + import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -37,9 +41,6 @@ import brooklyn.entity.Application; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.entity.rebind.persister.PersistMode; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 bd804b6..51ae3eb 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 @@ -19,6 +19,9 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.launcher.BrooklynLauncher; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; + import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -41,8 +44,6 @@ import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 ee07f67..8dde314 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 @@ -19,6 +19,9 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.launcher.BrooklynLauncher; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; + import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertTrue; @@ -33,8 +36,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistMode; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.test.entity.TestApplication; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 0910e29..a27bf71 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 @@ -19,6 +19,7 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.launcher.BrooklynLauncher; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import static org.testng.Assert.assertEquals; @@ -33,7 +34,6 @@ import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.jclouds.BlobStoreTest; import brooklyn.entity.rebind.persister.jclouds.JcloudsBlobStoreBasedObjectStore; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 63ba561..9aed0a2 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 @@ -19,6 +19,8 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.launcher.BrooklynLauncher; +import org.apache.brooklyn.management.ManagementContext; + import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; @@ -47,7 +49,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/launcher/src/test/java/org/apache/brooklyn/launcher/SimpleYamlLauncherForTests.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/SimpleYamlLauncherForTests.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/SimpleYamlLauncherForTests.java index b2dfc5b..5fd39c3 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/SimpleYamlLauncherForTests.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/SimpleYamlLauncherForTests.java @@ -19,7 +19,8 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.launcher.camp.SimpleYamlLauncher; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.test.entity.LocalManagementContextForTests; public class SimpleYamlLauncherForTests extends SimpleYamlLauncher { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 3f39f91..1f4791f 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 @@ -41,10 +41,12 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.entity.rebind.persister.FileBasedObjectStore; + import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.BrooklynCampPlatformLauncher; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 c93a428..0f6fefd 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 @@ -39,10 +39,12 @@ 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.launcher.BrooklynLauncher; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.location.Location; import brooklyn.location.jclouds.JcloudsLocationConfig; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.util.BrooklynMavenArtifacts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 ac2e6be..e142790 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 @@ -42,10 +42,12 @@ 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.launcher.BrooklynLauncher; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; + import brooklyn.location.Location; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.os.Os; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java index 2cbbc04..f5fe20f 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java @@ -32,8 +32,8 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.rest.apidoc.Apidoc; 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/f7f03580/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 ff947c3..a873261 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 @@ -38,8 +38,9 @@ import brooklyn.entity.Application; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.StartableApplication; import brooklyn.location.basic.BasicLocationRegistry; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTest; import org.apache.brooklyn.rest.domain.ApplicationSpec; @@ -47,6 +48,7 @@ import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.domain.SensorSummary; + import brooklyn.test.Asserts; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 9c23546..84e9839 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 @@ -36,14 +36,16 @@ import brooklyn.entity.Application; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.location.basic.BasicLocationRegistry; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTest; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.CatalogLocationSummary; import org.apache.brooklyn.rest.security.provider.TestSecurityProvider; import org.apache.brooklyn.test.HttpTestUtils; + import brooklyn.test.entity.TestEntity; @Test
