http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java index 9c48ddf..1fed7c6 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java @@ -63,6 +63,9 @@ import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import org.apache.brooklyn.api.management.ha.MementoCopyMode; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.file.ArchiveBuilder; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.rest.api.ServerApi; import org.apache.brooklyn.rest.domain.BrooklynFeatureSummary; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; @@ -72,11 +75,8 @@ import org.apache.brooklyn.rest.transform.HighAvailabilityTransformer; import org.apache.brooklyn.rest.util.ShutdownHandler; import org.apache.brooklyn.rest.util.WebResourceUtils; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.file.ArchiveBuilder; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; import brooklyn.util.os.Os; import brooklyn.util.text.Identifiers;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java index f78df8b..32a8887 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java @@ -27,14 +27,14 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.ParameterType; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.ValueResolver; import org.apache.brooklyn.rest.domain.EffectorSummary; import org.apache.brooklyn.rest.domain.EffectorSummary.ParameterSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.ValueResolver; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java index 72d17db..f1b6959 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java @@ -32,11 +32,11 @@ import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.rest.domain.LocationSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Maybe; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java index 6b337a0..ead9ba5 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java @@ -36,13 +36,13 @@ import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.HasTaskChildren; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.TaskInternal; import org.apache.brooklyn.rest.domain.LinkWithMetadata; import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.task.TaskInternal; import brooklyn.util.text.Strings; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java index d09d05b..d29b6e8 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java @@ -53,6 +53,7 @@ import org.apache.brooklyn.api.policy.Policy; 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.flags.TypeCoercions; import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; @@ -70,7 +71,6 @@ import org.apache.brooklyn.rest.domain.EntitySpec; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.javalang.Reflections; import brooklyn.util.net.Urls; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java index 491c1a7..8d78462 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java @@ -31,13 +31,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.error.YAMLException; import org.apache.brooklyn.core.management.entitlement.Entitlements; +import org.apache.brooklyn.core.util.flags.ClassCoercionException; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.domain.ApiError.Builder; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.UserFacingException; -import brooklyn.util.flags.ClassCoercionException; import brooklyn.util.text.Strings; @Provider http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java index 6d8e15e..4320321 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java @@ -35,11 +35,11 @@ import org.eclipse.jetty.server.Server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; - +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; + import brooklyn.util.collections.MutableMap; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.time.Time; import com.fasterxml.jackson.databind.ObjectMapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java index f5ac071..3f529ca 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java @@ -32,6 +32,8 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.http.HttpStatus; import org.apache.http.client.HttpClient; import org.eclipse.jetty.server.Server; @@ -45,8 +47,6 @@ import brooklyn.entity.rebind.RebindTestUtils; import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; import brooklyn.test.Asserts; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.os.Os; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java index b073c2c..e9440e8 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java @@ -27,11 +27,11 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.apache.brooklyn.api.catalog.BrooklynCatalog; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import brooklyn.test.TestHttpRequestHandler; import brooklyn.test.TestHttpServer; -import brooklyn.util.ResourceUtils; import com.sun.jersey.api.client.UniformInterfaceException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java index 6af06cb..354f4ed 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java @@ -35,14 +35,14 @@ import brooklyn.entity.basic.EntityPredicates; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import org.apache.brooklyn.test.HttpTestUtils; import brooklyn.util.collections.MutableList; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.net.Urls; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java index c228b95..0dcfd44 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.rest.resources; -import static brooklyn.util.http.HttpTool.httpClientBuilder; +import static org.apache.brooklyn.core.util.http.HttpTool.httpClientBuilder; import static org.testng.Assert.assertEquals; import java.net.URI; @@ -37,14 +37,13 @@ import brooklyn.config.BrooklynProperties; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.rest.security.provider.TestSecurityProvider; import org.apache.brooklyn.test.HttpTestUtils; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; - import com.google.common.collect.ImmutableMap; public class ServerResourceIntegrationTest extends BrooklynRestApiLauncherTestFixture { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java index 04baadf..1bb5677 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,8 +35,8 @@ import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.flags.SetFromFlag; public class RestMockSimpleEntity extends SoftwareProcessImpl { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java index 92d488f..d6e2b77 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java @@ -20,13 +20,13 @@ package org.apache.brooklyn.rest.testing.mocks; import java.util.Map; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicConfigKey; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.util.flags.SetFromFlag; public class RestMockSimplePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java index 642fc10..7968089 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java @@ -43,6 +43,7 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -51,7 +52,6 @@ import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.http.HttpTool; import brooklyn.util.stream.Streams; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java b/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java index c0f78ac..771ba6d 100644 --- a/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java +++ b/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java @@ -34,15 +34,14 @@ import java.util.Properties; import javax.management.remote.JMXConnectorServer; +import org.apache.brooklyn.core.util.crypto.FluentKeySigner; +import org.apache.brooklyn.core.util.crypto.SecureKeys; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.crypto.FluentKeySigner; -import brooklyn.util.crypto.SecureKeys; - public class JmxmpAgentSslTest { KeyPair caRootKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java b/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java index d8fc178..3896631 100644 --- a/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java +++ b/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java @@ -40,7 +40,8 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; -import brooklyn.util.crypto.SecureKeys; +import org.apache.brooklyn.core.util.crypto.SecureKeys; + import brooklyn.util.crypto.SslTrustUtils; @SuppressWarnings({"rawtypes","unchecked"}) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java index bf64795..9817017 100644 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java +++ b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java @@ -20,8 +20,9 @@ package brooklyn.osgi.tests; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; + +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.basic.AbstractLocation; -import brooklyn.util.flags.SetFromFlag; public class SimpleLocation extends AbstractLocation { @SetFromFlag("config1") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java index 10a0094..f70b60b 100644 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java +++ b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java @@ -19,10 +19,11 @@ package brooklyn.osgi.tests; +import org.apache.brooklyn.core.util.flags.SetFromFlag; + import brooklyn.entity.basic.ConfigKeys; import brooklyn.config.ConfigKey; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.util.flags.SetFromFlag; public class SimplePolicy extends AbstractPolicy { @SetFromFlag("config1") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java index 80d6b97..ece1b1e 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java @@ -18,9 +18,10 @@ */ package brooklyn.osgi.tests.more; +import org.apache.brooklyn.core.util.config.ConfigBag; + import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.effector.EffectorBody; -import brooklyn.util.config.ConfigBag; public class MoreEntityImpl extends AbstractEntity implements MoreEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java index 238d743..3dd4059 100644 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java @@ -21,7 +21,7 @@ package brooklyn.osgi.tests.more; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.effector.EffectorBody; import org.apache.brooklyn.api.policy.PolicySpec; -import brooklyn.util.config.ConfigBag; +import org.apache.brooklyn.core.util.config.ConfigBag; public class MoreEntityImpl extends AbstractEntity implements MoreEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java index 327fd23..e560b54 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java @@ -21,7 +21,7 @@ package brooklyn.osgi.tests.more; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.effector.EffectorBody; import org.apache.brooklyn.api.policy.PolicySpec; -import brooklyn.util.config.ConfigBag; +import org.apache.brooklyn.core.util.config.ConfigBag; public class MoreEntityImpl extends AbstractEntity implements MoreEntity {
