http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java index f7c3e04..b7cae85 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java @@ -26,10 +26,12 @@ import java.util.Set; import brooklyn.entity.basic.Attributes; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; + +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.ssh.SshTasks; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.ssh.SshTasks; + import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java index 4320c9b..693b4c4 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.entity.webapp; import java.util.Set; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import com.google.common.collect.ImmutableSet; @@ -29,7 +30,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.util.flags.SetFromFlag; public interface WebAppServiceConstants extends WebAppServiceMetrics { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java index 6a558e7..0935690 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.entity.webapp.jboss; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import brooklyn.config.ConfigKey; @@ -27,7 +28,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.util.flags.SetFromFlag; @Catalog(name="JBoss Application Server 6", description="AS6: an open source Java application server from JBoss", iconUrl="classpath:///jboss-logo.png") @ImplementedBy(JBoss6ServerImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java index 4872b68..dd5f2bd 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java @@ -22,6 +22,7 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import brooklyn.config.ConfigKey; @@ -31,7 +32,6 @@ import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; @Catalog(name="JBoss Application Server 7", description="AS7: an open source Java application server from JBoss", iconUrl="classpath:///jboss-logo.png") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java index bd5cfce..70baeee 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java @@ -22,6 +22,7 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import brooklyn.config.ConfigKey; @@ -30,7 +31,6 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java index 166d2ad..9e34c57 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.webapp.WebAppService; import brooklyn.config.ConfigKey; @@ -32,8 +33,6 @@ import brooklyn.entity.basic.SoftwareProcess; import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.flags.SetFromFlag; - import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java index e336a93..1735cb8 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.core.util.file.ArchiveUtils; import org.apache.brooklyn.entity.webapp.WebAppService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +31,11 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; -import brooklyn.util.file.ArchiveUtils; import brooklyn.util.net.Networking; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java index 766c7a0..aef6ffd 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java @@ -20,12 +20,12 @@ package org.apache.brooklyn.entity.webapp.tomcat; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java index d9327cd..95a8c31 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java @@ -22,6 +22,7 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import brooklyn.config.ConfigKey; @@ -31,8 +32,9 @@ import brooklyn.entity.java.UsesJmx; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; + import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.flags.SetFromFlag; + import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java index f5c3f41..dc8dd41 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java @@ -26,9 +26,8 @@ import java.util.LinkedHashSet; import java.util.Set; import org.testng.annotations.Test; - +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.location.geo.HostGeoInfo; -import brooklyn.util.ResourceUtils; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java index 4602840..d068b48 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java @@ -26,6 +26,7 @@ import static org.apache.brooklyn.entity.dns.geoscaling.GeoscalingWebClient.PROV import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; +import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingWebClient; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingWebClient.Domain; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingWebClient.SmartSubdomain; @@ -34,7 +35,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.http.HttpTool; import brooklyn.util.text.Strings; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java index facde8d..f3af752 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java @@ -38,6 +38,7 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.slf4j.Logger; @@ -60,7 +61,6 @@ import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/ProxySslConfigTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/ProxySslConfigTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/ProxySslConfigTest.java index 218debf..37a8061 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/ProxySslConfigTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/ProxySslConfigTest.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.entity.proxy; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.entity.proxy.ProxySslConfig; import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.TypeCoercions; @Test public class ProxySslConfigTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java index 57ea76d..9318fc9 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java @@ -32,6 +32,8 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.test.EntityTestUtils; @@ -56,10 +58,8 @@ import brooklyn.entity.rebind.RebindTestUtils; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocationReuseIntegrationTest.RecordingSshjTool; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.net.Networking; import brooklyn.util.repeat.Repeater; -import brooklyn.util.task.BasicExecutionManager; import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java index cf42c5e..b21cd38 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java @@ -68,6 +68,8 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.api.management.SubscriptionHandle; +import org.apache.brooklyn.core.util.crypto.FluentKeySigner; +import org.apache.brooklyn.core.util.crypto.SecureKeys; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.apache.brooklyn.entity.webapp.WebAppService; @@ -79,8 +81,6 @@ import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; -import brooklyn.util.crypto.FluentKeySigner; -import brooklyn.util.crypto.SecureKeys; import brooklyn.util.net.Urls; import brooklyn.util.stream.Streams; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/HttpsSslConfigTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/HttpsSslConfigTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/HttpsSslConfigTest.java index d21c0d9..830775c 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/HttpsSslConfigTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/HttpsSslConfigTest.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.entity.webapp; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.entity.webapp.HttpsSslConfig; import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.TypeCoercions; public class HttpsSslConfigTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java index 9d0e1eb..28f331d 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java @@ -40,6 +40,8 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; @@ -48,8 +50,6 @@ import org.apache.brooklyn.test.TestResourceUnavailableException; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java b/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java index c5967d0..b9d57ca 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.test.entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.entity.webapp.WebAppService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.SoftwareProcessDriverLifecycleEffectorTasks; import brooklyn.entity.java.VanillaJavaApp; -import brooklyn.util.config.ConfigBag; /** * Mock web application server entity for testing. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntityImpl.java b/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntityImpl.java index 7e909ab..04b8bd0 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntityImpl.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntityImpl.java @@ -21,10 +21,10 @@ package org.apache.brooklyn.test.entity; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import brooklyn.entity.java.VanillaJavaAppImpl; -import brooklyn.util.flags.SetFromFlag; public class TestJavaWebAppEntityImpl extends VanillaJavaAppImpl implements TestJavaWebAppEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 471d5e3..f679425 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 @@ -17,7 +17,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; -import brooklyn.util.ResourceUtils; +import org.apache.brooklyn.core.util.ResourceUtils; import brooklyn.util.text.Strings; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 1ad7868..6296339 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 @@ -28,13 +28,13 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.ResourceUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynShutdownHooks; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; -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/a4c0e5fd/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 9241a73..3931a82 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 @@ -51,12 +51,12 @@ import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog.BrooklynLoaderTracker; import org.apache.brooklyn.core.management.internal.EntityManagementUtils; import org.apache.brooklyn.core.management.internal.EntityManagementUtils.CreationResult; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import brooklyn.config.BrooklynServerConfig; import brooklyn.entity.basic.BasicApplicationImpl; -import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.net.Urls; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 33bb6a1..03e3920 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 @@ -50,6 +50,11 @@ import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.ManagementContextInjectable; import org.apache.brooklyn.core.management.classloading.JavaBrooklynClassLoadingContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.FlagUtils; +import org.apache.brooklyn.core.util.flags.FlagUtils.FlagConfigKeyAndValueRecord; +import org.apache.brooklyn.core.util.task.Tasks; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractEntity; @@ -57,15 +62,10 @@ import brooklyn.entity.basic.BrooklynTags; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.proxying.InternalEntityFactory; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableSet; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.FlagUtils; -import brooklyn.util.flags.FlagUtils.FlagConfigKeyAndValueRecord; import brooklyn.util.guava.Maybe; import brooklyn.util.javalang.Reflections; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Strings; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 527a44c..35c8b4c 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 @@ -33,9 +33,9 @@ import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator.InstantiatorFromKey; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; +import org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.util.collections.MutableList; -import brooklyn.util.config.ConfigBag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 2954ee7..87b1f01 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 @@ -25,11 +25,11 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; import brooklyn.util.javalang.Reflections; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 3babd31..f8d03c9 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 @@ -27,6 +27,7 @@ import io.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.core.util.task.DeferredSupplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorTasks; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.task.DeferredSupplier; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslUtils.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslUtils.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslUtils.java index e5194bf..4eaf37d 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslUtils.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslUtils.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.dsl; -import brooklyn.util.task.DeferredSupplier; +import org.apache.brooklyn.core.util.task.DeferredSupplier; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 71a72a5..5b1b1e8 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 @@ -34,18 +34,18 @@ 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.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.ClassCoercionException; +import org.apache.brooklyn.core.util.flags.FlagUtils; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.task.DeferredSupplier; import org.apache.commons.beanutils.BeanUtils; import brooklyn.entity.basic.EntityDynamicType; import brooklyn.event.basic.DependentConfiguration; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.ClassCoercionException; -import brooklyn.util.flags.FlagUtils; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.javalang.Reflections; -import brooklyn.util.task.DeferredSupplier; import brooklyn.util.text.StringEscapes.JavaStringEscapes; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 601a46a..791c79f 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 @@ -29,6 +29,8 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.camp.brooklyn.spi.dsl.BrooklynDslDeferredSupplier; import org.apache.brooklyn.core.management.internal.EntityManagerInternal; +import org.apache.brooklyn.core.util.task.TaskBuilder; +import org.apache.brooklyn.core.util.task.Tasks; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; @@ -38,8 +40,6 @@ import brooklyn.entity.basic.EntityPredicates; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; import brooklyn.util.guava.Maybe; -import brooklyn.util.task.TaskBuilder; -import brooklyn.util.task.Tasks; import brooklyn.util.text.StringEscapes.JavaStringEscapes; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 c0b77f4..8922059 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 @@ -32,6 +32,8 @@ import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -42,8 +44,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixture; -import brooklyn.util.ResourceUtils; -import brooklyn.util.config.ConfigBag; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 d96b132..0396009 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 @@ -32,6 +32,8 @@ import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +42,6 @@ import org.testng.annotations.BeforeMethod; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; -import brooklyn.util.ResourceUtils; -import brooklyn.util.config.ConfigBag; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 87d014b..110851a 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 @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +43,6 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.event.basic.Sensors; import brooklyn.util.collections.MutableSet; -import brooklyn.util.task.Tasks; import com.google.common.collect.Iterables; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 06f596a..a0278b2 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 @@ -40,6 +40,7 @@ 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.core.management.internal.EntityManagerInternal; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.slf4j.Logger; @@ -65,7 +66,6 @@ import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Functionals; import brooklyn.util.guava.Maybe; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; import com.google.common.base.Suppliers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 e558288..72b06e3 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 @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.ResourceUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -38,7 +39,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableSet; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 94b3f66..7314e66 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 @@ -38,6 +38,7 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; @@ -55,7 +56,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.test.Asserts; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 b4a647e..7e45019 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 @@ -32,6 +32,8 @@ import java.util.Map; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.task.DeferredSupplier; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,10 +43,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.stream.Streams; -import brooklyn.util.task.DeferredSupplier; @Test public class JavaWebAppsMatchingTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java index f20af51..7a8ca3c 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.entity.proxy.ProxySslConfig; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.Entities; -import brooklyn.util.task.Tasks; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 ba29051..6b19d3b 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 @@ -26,6 +26,9 @@ import org.apache.brooklyn.api.entity.trait.Configurable; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.management.ManagementContextInjectable; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.entity.proxy.ProxySslConfig; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -37,9 +40,6 @@ import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.flags.TypeCoercions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 3774e7e..961e2fd 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 @@ -28,6 +28,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +39,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Startable; -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/a4c0e5fd/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java index 55b9c27..c03a282 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java @@ -24,6 +24,7 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.testng.Assert; import com.google.common.base.Preconditions; @@ -32,7 +33,6 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.Sensors; -import brooklyn.util.config.ConfigBag; public class TestSensorAndEffectorInitializer implements EntityInitializer { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java index 65bb7e0..5eab943 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java @@ -22,6 +22,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.osgi.OsgiTestResources; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -33,7 +34,6 @@ import java.io.StringReader; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; -import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.os.Os; import brooklyn.util.stream.ReaderInputStream; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java index 66fee85..d08cfed 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java @@ -39,9 +39,9 @@ import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.osgi.OsgiVersionMoreEntityTest; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; -import brooklyn.util.ResourceUtils; import brooklyn.util.text.Strings; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java index 3aa9b74..4cece0a 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.osgi.OsgiStandaloneTest; import org.apache.brooklyn.core.management.osgi.OsgiTestResources; +import org.apache.brooklyn.core.util.ResourceUtils; import brooklyn.entity.basic.BasicEntity; @@ -42,7 +43,6 @@ import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java index 88780aa..56f691c 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java @@ -42,13 +42,13 @@ import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.cli.lister.ClassFinder; import org.apache.brooklyn.cli.lister.ItemDescriptors; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.text.TemplateProcessor; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableSet; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; import brooklyn.util.text.Strings; -import brooklyn.util.text.TemplateProcessor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 8d3ed07..95c10a1 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 @@ -78,6 +78,7 @@ import org.apache.brooklyn.cli.CloudExplorer.ComputeTerminateInstancesCommand; import org.apache.brooklyn.cli.ItemLister.ListAllCommand; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; import org.apache.brooklyn.core.management.ha.OsgiManager; +import org.apache.brooklyn.core.util.ResourceUtils; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.AbstractEntity; @@ -95,7 +96,6 @@ import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown; 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; import brooklyn.util.exceptions.FatalRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java index 63ad940..4d22b3f 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java @@ -31,6 +31,8 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.javalang.UrlClassLoader; import org.reflections.Reflections; import org.reflections.scanners.FieldAnnotationsScanner; import org.reflections.scanners.SubTypesScanner; @@ -44,8 +46,6 @@ import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.util.ResourceUtils; -import brooklyn.util.javalang.UrlClassLoader; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java b/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java index ff6a5d3..44207c1 100644 --- a/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java +++ b/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java @@ -51,6 +51,7 @@ import org.apache.brooklyn.cli.AbstractMain.HelpCommand; import org.apache.brooklyn.cli.Main.AppShutdownHandler; import org.apache.brooklyn.cli.Main.GeneratePasswordCommand; import org.apache.brooklyn.cli.Main.LaunchCommand; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +71,6 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.FatalConfigurationRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 13ee15a..82c881f 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 @@ -68,6 +68,13 @@ import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.internal.BrooklynInitialization; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.BrooklynNetworkUtils; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.crypto.FluentKeySigner; +import org.apache.brooklyn.core.util.crypto.SecureKeys; +import org.apache.brooklyn.core.util.flags.FlagUtils; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.launcher.config.CustomResourceLocator; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.PortRanges; @@ -83,15 +90,8 @@ 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; -import brooklyn.util.crypto.FluentKeySigner; -import brooklyn.util.crypto.SecureKeys; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.FlagUtils; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.io.FileUtil; import brooklyn.util.javalang.Threads; import brooklyn.util.logging.LoggingSetup; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java index 78ad7c6..eb1052d 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java @@ -23,12 +23,12 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; +import org.apache.brooklyn.core.util.ResourceUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.BrooklynVersion; import brooklyn.config.ConfigMap; -import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java index a8c9f98..1d14d72 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java @@ -28,11 +28,11 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.SimpleYamlLauncher; import brooklyn.test.Asserts; -import brooklyn.util.ResourceUtils; import brooklyn.util.os.Os; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 a8d301e..933071c 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 @@ -44,15 +44,15 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.SimpleYamlLauncher; import brooklyn.util.collections.Jsonya; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.net.Urls; import brooklyn.util.repeat.Repeater; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/launcher/src/test/java/org/apache/brooklyn/entity/database/mssql/MssqlBlueprintLiveTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/database/mssql/MssqlBlueprintLiveTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/database/mssql/MssqlBlueprintLiveTest.java index 9103792..6badab5 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/database/mssql/MssqlBlueprintLiveTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/database/mssql/MssqlBlueprintLiveTest.java @@ -22,10 +22,9 @@ import java.io.StringReader; import java.util.Map; import org.testng.annotations.Test; - +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import org.apache.brooklyn.launcher.blueprints.AbstractBlueprintTest; -import brooklyn.util.ResourceUtils; -import brooklyn.util.text.TemplateProcessor; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java index 49596d6..060aa8f 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java @@ -37,10 +37,10 @@ import com.google.common.io.Files; import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.entity.rebind.persister.PersistMode; -import brooklyn.util.ResourceUtils; import brooklyn.util.os.Os; public class BrooklynLauncherRebindCatalogTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java index 8ee48f4..f743aea 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java @@ -19,6 +19,8 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.launcher.BrooklynWebServer; import static org.testng.Assert.assertEquals; @@ -55,8 +57,6 @@ import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 4fcc63d..707d9a7 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 @@ -30,6 +30,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +50,6 @@ import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.BrooklynCampPlatformLauncher; import brooklyn.test.Asserts; -import brooklyn.util.ResourceUtils; import brooklyn.util.os.Os; public abstract class AbstractBlueprintTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java index 7570cc5..b5f0cf4 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java @@ -30,10 +30,12 @@ import brooklyn.entity.database.mysql.MySqlSshDriver; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; + +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.time.CountdownTimer; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java index 54acb3b..9dbfe0a 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java @@ -35,11 +35,11 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.stream.StreamGobbler; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 59c5b0b..8a02698 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 @@ -44,10 +44,10 @@ import brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.BrooklynMavenArtifacts; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig; -import brooklyn.util.BrooklynMavenArtifacts; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.maven.MavenRetriever; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 9313987..830214e 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 @@ -34,12 +34,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.ManagementContextInjectable; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider; import brooklyn.util.guava.Maybe; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; public abstract class AbstractBrooklynRestResource implements ManagementContextInjectable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 98d5648..d195af6 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 @@ -66,6 +66,7 @@ import org.apache.brooklyn.core.management.entitlement.Entitlements.EntityAndIte import org.apache.brooklyn.core.management.entitlement.Entitlements.StringAndArgument; import org.apache.brooklyn.core.management.internal.EntityManagementUtils; import org.apache.brooklyn.core.management.internal.EntityManagementUtils.CreationResult; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.rest.api.ApplicationApi; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.ApplicationSummary; @@ -79,7 +80,6 @@ import org.apache.brooklyn.rest.transform.TaskTransformer; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 80dc2a3..08ed505 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 @@ -51,6 +51,7 @@ import org.apache.brooklyn.core.catalog.internal.CatalogItemComparator; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.entitlement.Entitlements.StringAndArgument; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.rest.api.CatalogApi; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.domain.CatalogEntitySummary; @@ -61,7 +62,6 @@ import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.CatalogTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; -import brooklyn.util.ResourceUtils; 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/a4c0e5fd/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 5353f50..f5f43ea 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 @@ -34,14 +34,14 @@ import brooklyn.event.basic.BasicConfigKey; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.core.management.entitlement.Entitlements; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.task.ValueResolver; 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; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 a50a86e..eef52e9 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 @@ -50,6 +50,7 @@ import org.apache.brooklyn.core.management.entitlement.EntitlementPredicates; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.internal.EntityManagementUtils; import org.apache.brooklyn.core.management.internal.EntityManagementUtils.CreationResult; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.rest.api.EntityApi; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.domain.LocationSummary; @@ -61,7 +62,6 @@ import org.apache.brooklyn.rest.transform.LocationTransformer.LocationDetailLeve import org.apache.brooklyn.rest.transform.TaskTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 655c20c..a6ca58b 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 @@ -30,6 +30,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.core.management.entitlement.Entitlements; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.rest.api.PolicyConfigApi; import org.apache.brooklyn.rest.domain.PolicyConfigSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; @@ -37,8 +38,6 @@ import org.apache.brooklyn.rest.transform.PolicyTransformer; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; -import brooklyn.util.flags.TypeCoercions; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 e8b85ef..d8be210 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 @@ -34,13 +34,13 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.core.management.entitlement.Entitlements; +import org.apache.brooklyn.core.util.task.ValueResolver; 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;
