You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/08/18 17:04:07 UTC
[58/64] [abbrv] incubator-brooklyn git commit: BROOKLYN-162 - apply
org.apache package prefix to core config packages
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/config/BrooklynPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/config/BrooklynPropertiesTest.java b/core/src/test/java/brooklyn/config/BrooklynPropertiesTest.java
deleted file mode 100644
index 01f3eba..0000000
--- a/core/src/test/java/brooklyn/config/BrooklynPropertiesTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.config;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
-
-import java.util.NoSuchElementException;
-
-import org.apache.brooklyn.util.collections.MutableMap;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import brooklyn.event.basic.BasicConfigKey;
-
-import com.google.common.collect.ImmutableMap;
-
-@Test
-public class BrooklynPropertiesTest {
-
- @Test
- public void testGetFirst() {
- BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
-
- assertEquals(props.getFirst("akey"), "aval");
- assertEquals(props.getFirst("akey", "bkey"), "aval");
- assertEquals(props.getFirst("akey", "notThere"), "aval");
-
- assertEquals(props.getFirst("notThere"), null);
- assertEquals(props.getFirst("notThere", "notThere2"), null);
- }
-
- @Test
- public void testGetFirstUsingFailIfNone() {
- BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
- assertEquals(props.getFirst(MutableMap.of("failIfNone", true), "akey"), "aval");
-
- try {
- props.getFirst(MutableMap.of("failIfNone", true), "notThrere");
- fail();
- } catch (NoSuchElementException e) {
- // success
- }
- }
-
- @Test
- public void testGetFirstUsingFailIfNoneFalse() {
- BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
- assertEquals(props.getFirst(MutableMap.of("failIfNone", false), "notThrere"), null);
- }
-
- @Test
- public void testGetFirstUsingDefaultIfNone() {
- BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
- assertEquals(props.getFirst(MutableMap.of("defaultIfNone", "mydef"), "akey"), "aval");
- assertEquals(props.getFirst(MutableMap.of("defaultIfNone", "mydef"), "notThere"), "mydef");
- }
-
- /*
- * sample.properties:
- * P1=Property 1
- * P2=Property 2
- *
- * more-sample.properties:
- * P3=Property 3
- * P1=Property 1 v2
- *
- * tricky.properties:
- * P1=Property 1 v3
- * P1=Property 1 v4
- * a.b.c=d.e.f
- * a=b=c
- * aa=$a
- */
-
- @Test
- public void testAddFromUrlSimple() {
- BrooklynProperties p1 = BrooklynProperties.Factory.newEmpty().addFromUrl("brooklyn/config/sample.properties");
- assertForSample(p1);
- }
-
- @Test
- public void testAddFromUrlClasspath() {
- BrooklynProperties p1 = BrooklynProperties.Factory.newEmpty().addFromUrl("classpath://brooklyn/config/sample.properties");
- assertForSample(p1);
- }
-
- @Test
- public void testAddMultipleFromUrl() {
- BrooklynProperties p1 = BrooklynProperties.Factory.newEmpty().
- addFromUrl("brooklyn/config/sample.properties").
- addFromUrl("brooklyn/config/more-sample.properties");
- assertForMoreSample(p1);
- }
-
-// P1=Property 1 v3
-// P1=Property 1 v4
-// a.b.c=d.e.f
-// a=b=c
-// aa=$a
-
- @Test
- public void testTrickyAddMultipleFromUrl() {
- BrooklynProperties p1 = BrooklynProperties.Factory.newEmpty().
- addFromUrl("brooklyn/config/sample.properties").
- addFromUrl("brooklyn/config/tricky.properties");
- assertForSampleAndTricky(p1);
- }
-
- private void assertForSample(BrooklynProperties p) {
- Assert.assertEquals(p.getFirst("P1"), "Property 1");
- Assert.assertEquals(p.getFirst("P2"), "Property 2");
- Assert.assertEquals(p.getFirst("P0", "P3"), null);
- }
-
- private void assertForMoreSample(BrooklynProperties p) {
- Assert.assertEquals(p.getFirst("P1"), "Property 1 v2");
- Assert.assertEquals(p.getFirst("P2"), "Property 2");
- Assert.assertEquals(p.getFirst("P0", "P3"), "Property 3");
- }
-
- private void assertForSampleAndTricky(BrooklynProperties p) {
- Assert.assertEquals(p.getFirst("P1"), "Property 1 v4");
- Assert.assertEquals(p.getFirst("P2"), "Property 2");
- Assert.assertEquals(p.getFirst("P0", "P3"), null);
- Assert.assertEquals(p.getFirst("a.b.c"), "d.e.f");
- Assert.assertEquals(p.getFirst("a"), "b=c");
- Assert.assertEquals(p.getFirst("aa"), "$a");
- }
-
- @Test
- public void testGetSubMap() {
- BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of(
- "a.key", "aval", "a.key2", "aval2", "akey", "noval", "b.key", "bval"));
- BrooklynProperties p2 = props.submap(ConfigPredicates.matchingGlob("a.*"));
- assertEquals(p2.getAllConfig().keySet().size(), 2, "wrong size submap: "+p2);
- assertEquals(p2.getFirst("a.key"), "aval");
- assertEquals(p2.getFirst("b.key"), null);
- assertEquals(p2.getFirst("akey"), null);
-
- BrooklynProperties p3a = props.submap(ConfigPredicates.startingWith("a."));
- assertEquals(p3a, p2);
- BrooklynProperties p3b = props.submap(ConfigPredicates.matchingRegex("a\\..*"));
- assertEquals(p3b, p2);
-
- BrooklynProperties p4 = props.submap(ConfigPredicates.matchingRegex("a.*"));
- assertEquals(p4.getAllConfig().keySet().size(), 3, "wrong size submap: "+p4);
- assertEquals(p4.getFirst("a.key"), "aval");
- assertEquals(p4.getFirst("b.key"), null);
- assertEquals(p4.getFirst("akey"), "noval");
- }
-
- @Test
- public void testGetAndPutConfig() {
- BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of(
- "a.key", "aval", "a.key2", "aval2", "akey", "noval", "n.key", "234"));
-
- BasicConfigKey<String> aString = new BasicConfigKey<String>(String.class, "a.key");
- BasicConfigKey<Integer> nNum = new BasicConfigKey<Integer>(Integer.class, "n.key");
- BasicConfigKey<Integer> aBsent = new BasicConfigKey<Integer>(Integer.class, "ab.sent");
- BasicConfigKey<Integer> aMisstyped = new BasicConfigKey<Integer>(Integer.class, "am.isstyped");
- BasicConfigKey<Integer> aDfault = new BasicConfigKey<Integer>(Integer.class, "a.default", "-", 123);
-
- assertEquals(props.getConfig(aString), "aval");
- assertEquals(props.getConfig(nNum), (Integer)234);
-
- props.put(aString, "aval2");
- assertEquals(props.getConfig(aString), "aval2");
- assertEquals(props.get("a.key"), "aval2");
-
- props.put(nNum, "345");
- assertEquals(props.getConfig(nNum), (Integer)345);
- assertEquals(props.get("n.key"), "345");
-
- assertEquals(props.getConfig(aBsent), null);
- assertEquals(props.getConfig(aBsent, 123), (Integer)123);
- assertEquals(props.getConfig(aDfault), (Integer)123);
-
- props.put(aMisstyped, "x1");
- assertEquals(props.get("am.isstyped"), "x1");
- boolean workedWhenShouldntHave = false;
- try { props.getConfig(aMisstyped); workedWhenShouldntHave = true; } catch (Exception e) {}
- if (workedWhenShouldntHave) fail("should have failed getting "+aMisstyped+" because can't coerce");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/config/ConfigUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/config/ConfigUtilsTest.java b/core/src/test/java/brooklyn/config/ConfigUtilsTest.java
deleted file mode 100644
index 8365b37..0000000
--- a/core/src/test/java/brooklyn/config/ConfigUtilsTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.config;
-
-import java.util.Set;
-
-import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import brooklyn.entity.basic.ConfigKeys;
-
-public class ConfigUtilsTest {
-
- public static final ConfigKey<String> S1 = ConfigKeys.newStringConfigKey("s1");
- public final ConfigKey<String> S2 = ConfigKeys.newStringConfigKey("s2");
-
- @Test
- public void testGetStaticKeys() {
- Set<HasConfigKey<?>> keys = ConfigUtils.getStaticKeysOnClass(ConfigUtilsTest.class);
- if (keys.size()!=1) Assert.fail("Expected 1 key; got: "+keys);
- Assert.assertEquals(keys.iterator().next().getConfigKey(), S1);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java b/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java
index 626a035..cc9d901 100644
--- a/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java
+++ b/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java
@@ -18,6 +18,7 @@
*/
package brooklyn.entity;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.test.entity.TestApplication;
@@ -26,7 +27,6 @@ import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java b/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java
index 366e3aa..eabafc0 100644
--- a/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java
+++ b/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java
@@ -37,6 +37,7 @@ import org.apache.brooklyn.api.management.ExecutionManager;
import org.apache.brooklyn.api.management.Task;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.config.ConfigMap;
+import org.apache.brooklyn.core.config.ConfigPredicates;
import org.apache.brooklyn.core.util.task.BasicTask;
import org.apache.brooklyn.core.util.task.DeferredSupplier;
import org.apache.brooklyn.util.collections.MutableMap;
@@ -45,7 +46,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.ConfigPredicates;
import brooklyn.entity.BrooklynAppUnitTestSupport;
import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java
index 472b3d9..91c00a2 100644
--- a/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java
+++ b/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java
@@ -24,6 +24,7 @@ import static org.testng.Assert.fail;
import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.TestApplication;
import org.apache.brooklyn.test.entity.TestEntity;
@@ -31,7 +32,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.Attributes;
import brooklyn.entity.basic.BrooklynConfigKeys;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java
index afda43a..3f16db9 100644
--- a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java
+++ b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java
@@ -26,6 +26,7 @@ import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.
import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.TestApplication;
import org.apache.brooklyn.test.entity.TestEntity;
@@ -33,7 +34,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.BrooklynConfigKeys;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java
index 8fa0f53..af814f7 100644
--- a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java
+++ b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java
@@ -26,6 +26,7 @@ import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.
import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.TestApplication;
import org.apache.brooklyn.test.entity.TestEntity;
@@ -33,7 +34,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.BrooklynConfigKeys;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java
index 2643a5d..64e8305 100644
--- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java
@@ -42,14 +42,12 @@ import org.apache.brooklyn.camp.BasicCampPlatform;
import org.apache.brooklyn.camp.test.mock.web.MockWebPlatform;
import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog;
import org.apache.brooklyn.core.catalog.internal.CatalogDto;
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.core.config.BrooklynServerConfig;
import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.core.policy.basic.AbstractPolicy;
import org.apache.brooklyn.test.entity.TestEntity;
-
-import brooklyn.config.BrooklynProperties;
-import brooklyn.config.BrooklynServerConfig;
-
import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation;
import com.google.common.base.Joiner;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java
index 7654759..fb1fc08 100644
--- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java
@@ -30,13 +30,12 @@ import brooklyn.camp.lite.CampPlatformWithJustBrooklynMgmt;
import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.core.config.BrooklynServerConfig;
import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.TestEntity;
-import brooklyn.config.BrooklynProperties;
-import brooklyn.config.BrooklynServerConfig;
-
import com.google.common.collect.Iterables;
public class RebindCatalogWhenCatalogPersistenceDisabledTest extends RebindTestFixtureWithApp {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java
index c8b51ff..ecca416 100644
--- a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java
+++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java
@@ -38,6 +38,8 @@ import org.apache.brooklyn.api.management.ha.HighAvailabilityMode;
import org.apache.brooklyn.api.management.ha.ManagementNodeState;
import org.apache.brooklyn.api.mementos.BrooklynMemento;
import org.apache.brooklyn.api.mementos.BrooklynMementoRawData;
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.core.config.BrooklynServerConfig;
import org.apache.brooklyn.core.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
@@ -49,8 +51,6 @@ import org.apache.brooklyn.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import brooklyn.config.BrooklynProperties;
-import brooklyn.config.BrooklynServerConfig;
import brooklyn.entity.rebind.Dumpers.Pointer;
import brooklyn.entity.rebind.dto.MementosGenerators;
import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogScanTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogScanTest.java b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogScanTest.java
index 7d0e1b5..e89222c 100644
--- a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogScanTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogScanTest.java
@@ -33,13 +33,13 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec;
import org.apache.brooklyn.core.catalog.CatalogPredicates;
import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog;
import org.apache.brooklyn.core.catalog.internal.MyCatalogItems.MySillyAppTemplate;
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.core.config.BrooklynServerConfig;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.core.util.ResourceUtils;
import org.apache.brooklyn.util.net.Urls;
import org.apache.brooklyn.util.text.Strings;
-import brooklyn.config.BrooklynProperties;
-import brooklyn.config.BrooklynServerConfig;
import brooklyn.entity.basic.Entities;
import com.google.common.base.Predicates;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesBuilderTest.java b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesBuilderTest.java
new file mode 100644
index 0000000..8e6891b
--- /dev/null
+++ b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesBuilderTest.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.core.config;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.File;
+
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.util.os.Os;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+
+@Test
+public class BrooklynPropertiesBuilderTest {
+
+ private File globalPropertiesFile;
+ private File localPropertiesFile;
+
+ @BeforeMethod(alwaysRun=true)
+ public void setUp() throws Exception {
+ globalPropertiesFile = Os.newTempFile(getClass(), ".global.properties");
+ localPropertiesFile = Os.newTempFile(getClass(), "local.properties");
+ }
+
+ @AfterMethod(alwaysRun=true)
+ public void tearDown() throws Exception {
+ if (globalPropertiesFile != null) globalPropertiesFile.delete();
+ if (localPropertiesFile != null) localPropertiesFile.delete();
+ }
+
+ @Test
+ public void testSetGlobalBrooklynPropertiesFile() throws Exception {
+ String globalPropertiesContents = "brooklyn.mykey=myval";
+ Files.write(globalPropertiesContents, globalPropertiesFile, Charsets.UTF_8);
+
+ BrooklynProperties props = new BrooklynProperties.Factory.Builder()
+ .globalPropertiesFile(globalPropertiesFile.getAbsolutePath())
+ .build();
+
+ assertEquals(props.get("brooklyn.mykey"), "myval");
+ }
+
+ @Test
+ public void testSetLocalBrooklynPropertiesFile() throws Exception {
+ String globalPropertiesContents = "brooklyn.mykey=myvalglobal"+"\n"+
+ "brooklyn.mykey2=myvalglobal2"+"\n";
+ Files.write(globalPropertiesContents, globalPropertiesFile, Charsets.UTF_8);
+
+ String localPropertiesContents = "brooklyn.mykey=myvaloverriding"+"\n"+
+ "brooklyn.mykeyLocal=myvallocal2"+"\n";
+ Files.write(localPropertiesContents, localPropertiesFile, Charsets.UTF_8);
+
+ BrooklynProperties props = new BrooklynProperties.Factory.Builder()
+ .globalPropertiesFile(globalPropertiesFile.getAbsolutePath())
+ .localPropertiesFile(localPropertiesFile.getAbsolutePath())
+ .build();
+
+ assertEquals(props.get("brooklyn.mykey"), "myvaloverriding");
+ assertEquals(props.get("brooklyn.mykey2"), "myvalglobal2");
+ assertEquals(props.get("brooklyn.mykeyLocal"), "myvallocal2");
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesFromGroovyTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesFromGroovyTest.groovy b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesFromGroovyTest.groovy
new file mode 100644
index 0000000..1fbe7d8
--- /dev/null
+++ b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesFromGroovyTest.groovy
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.core.config;
+
+import static org.testng.Assert.assertEquals
+import static org.testng.Assert.fail
+
+import org.testng.annotations.Test
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.util.collections.MutableMap;
+
+import com.google.common.collect.ImmutableList
+import com.google.common.collect.ImmutableMap
+
+public class BrooklynPropertiesFromGroovyTest {
+
+ @Test
+ public void testGetFirstUsingFailIfNoneWithClosure() {
+ BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
+ Object keys;
+ try {
+ props.getFirst(MutableMap.of("failIfNone", { keys = it }), "notThere");
+ } catch (NoSuchElementException e) {
+ // expected
+ }
+ assertEquals(keys, "notThere");
+ }
+
+ @Test
+ public void testGetFirstMultiArgUsingFailIfNoneWithClosure() {
+ BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
+ Object keys;
+ try {
+ props.getFirst(MutableMap.of("failIfNone", { it1, it2 -> keys = [it1, it2] }), "notThere", "notThere2");
+ } catch (NoSuchElementException e) {
+ // expected
+ }
+ assertEquals(keys, ImmutableList.of("notThere", "notThere2"));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
new file mode 100644
index 0000000..ea53aa7
--- /dev/null
+++ b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
@@ -0,0 +1,204 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.core.config;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+import java.util.NoSuchElementException;
+
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.core.config.ConfigPredicates;
+import org.apache.brooklyn.util.collections.MutableMap;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import brooklyn.event.basic.BasicConfigKey;
+
+import com.google.common.collect.ImmutableMap;
+
+@Test
+public class BrooklynPropertiesTest {
+
+ @Test
+ public void testGetFirst() {
+ BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
+
+ assertEquals(props.getFirst("akey"), "aval");
+ assertEquals(props.getFirst("akey", "bkey"), "aval");
+ assertEquals(props.getFirst("akey", "notThere"), "aval");
+
+ assertEquals(props.getFirst("notThere"), null);
+ assertEquals(props.getFirst("notThere", "notThere2"), null);
+ }
+
+ @Test
+ public void testGetFirstUsingFailIfNone() {
+ BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
+ assertEquals(props.getFirst(MutableMap.of("failIfNone", true), "akey"), "aval");
+
+ try {
+ props.getFirst(MutableMap.of("failIfNone", true), "notThrere");
+ fail();
+ } catch (NoSuchElementException e) {
+ // success
+ }
+ }
+
+ @Test
+ public void testGetFirstUsingFailIfNoneFalse() {
+ BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
+ assertEquals(props.getFirst(MutableMap.of("failIfNone", false), "notThrere"), null);
+ }
+
+ @Test
+ public void testGetFirstUsingDefaultIfNone() {
+ BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of("akey", "aval", "bkey", "bval"));
+ assertEquals(props.getFirst(MutableMap.of("defaultIfNone", "mydef"), "akey"), "aval");
+ assertEquals(props.getFirst(MutableMap.of("defaultIfNone", "mydef"), "notThere"), "mydef");
+ }
+
+ /*
+ * sample.properties:
+ * P1=Property 1
+ * P2=Property 2
+ *
+ * more-sample.properties:
+ * P3=Property 3
+ * P1=Property 1 v2
+ *
+ * tricky.properties:
+ * P1=Property 1 v3
+ * P1=Property 1 v4
+ * a.b.c=d.e.f
+ * a=b=c
+ * aa=$a
+ */
+
+ @Test
+ public void testAddFromUrlSimple() {
+ BrooklynProperties p1 = BrooklynProperties.Factory.newEmpty().addFromUrl("brooklyn/config/sample.properties");
+ assertForSample(p1);
+ }
+
+ @Test
+ public void testAddFromUrlClasspath() {
+ BrooklynProperties p1 = BrooklynProperties.Factory.newEmpty().addFromUrl("classpath://brooklyn/config/sample.properties");
+ assertForSample(p1);
+ }
+
+ @Test
+ public void testAddMultipleFromUrl() {
+ BrooklynProperties p1 = BrooklynProperties.Factory.newEmpty().
+ addFromUrl("brooklyn/config/sample.properties").
+ addFromUrl("brooklyn/config/more-sample.properties");
+ assertForMoreSample(p1);
+ }
+
+// P1=Property 1 v3
+// P1=Property 1 v4
+// a.b.c=d.e.f
+// a=b=c
+// aa=$a
+
+ @Test
+ public void testTrickyAddMultipleFromUrl() {
+ BrooklynProperties p1 = BrooklynProperties.Factory.newEmpty().
+ addFromUrl("brooklyn/config/sample.properties").
+ addFromUrl("brooklyn/config/tricky.properties");
+ assertForSampleAndTricky(p1);
+ }
+
+ private void assertForSample(BrooklynProperties p) {
+ Assert.assertEquals(p.getFirst("P1"), "Property 1");
+ Assert.assertEquals(p.getFirst("P2"), "Property 2");
+ Assert.assertEquals(p.getFirst("P0", "P3"), null);
+ }
+
+ private void assertForMoreSample(BrooklynProperties p) {
+ Assert.assertEquals(p.getFirst("P1"), "Property 1 v2");
+ Assert.assertEquals(p.getFirst("P2"), "Property 2");
+ Assert.assertEquals(p.getFirst("P0", "P3"), "Property 3");
+ }
+
+ private void assertForSampleAndTricky(BrooklynProperties p) {
+ Assert.assertEquals(p.getFirst("P1"), "Property 1 v4");
+ Assert.assertEquals(p.getFirst("P2"), "Property 2");
+ Assert.assertEquals(p.getFirst("P0", "P3"), null);
+ Assert.assertEquals(p.getFirst("a.b.c"), "d.e.f");
+ Assert.assertEquals(p.getFirst("a"), "b=c");
+ Assert.assertEquals(p.getFirst("aa"), "$a");
+ }
+
+ @Test
+ public void testGetSubMap() {
+ BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of(
+ "a.key", "aval", "a.key2", "aval2", "akey", "noval", "b.key", "bval"));
+ BrooklynProperties p2 = props.submap(ConfigPredicates.matchingGlob("a.*"));
+ assertEquals(p2.getAllConfig().keySet().size(), 2, "wrong size submap: "+p2);
+ assertEquals(p2.getFirst("a.key"), "aval");
+ assertEquals(p2.getFirst("b.key"), null);
+ assertEquals(p2.getFirst("akey"), null);
+
+ BrooklynProperties p3a = props.submap(ConfigPredicates.startingWith("a."));
+ assertEquals(p3a, p2);
+ BrooklynProperties p3b = props.submap(ConfigPredicates.matchingRegex("a\\..*"));
+ assertEquals(p3b, p2);
+
+ BrooklynProperties p4 = props.submap(ConfigPredicates.matchingRegex("a.*"));
+ assertEquals(p4.getAllConfig().keySet().size(), 3, "wrong size submap: "+p4);
+ assertEquals(p4.getFirst("a.key"), "aval");
+ assertEquals(p4.getFirst("b.key"), null);
+ assertEquals(p4.getFirst("akey"), "noval");
+ }
+
+ @Test
+ public void testGetAndPutConfig() {
+ BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of(
+ "a.key", "aval", "a.key2", "aval2", "akey", "noval", "n.key", "234"));
+
+ BasicConfigKey<String> aString = new BasicConfigKey<String>(String.class, "a.key");
+ BasicConfigKey<Integer> nNum = new BasicConfigKey<Integer>(Integer.class, "n.key");
+ BasicConfigKey<Integer> aBsent = new BasicConfigKey<Integer>(Integer.class, "ab.sent");
+ BasicConfigKey<Integer> aMisstyped = new BasicConfigKey<Integer>(Integer.class, "am.isstyped");
+ BasicConfigKey<Integer> aDfault = new BasicConfigKey<Integer>(Integer.class, "a.default", "-", 123);
+
+ assertEquals(props.getConfig(aString), "aval");
+ assertEquals(props.getConfig(nNum), (Integer)234);
+
+ props.put(aString, "aval2");
+ assertEquals(props.getConfig(aString), "aval2");
+ assertEquals(props.get("a.key"), "aval2");
+
+ props.put(nNum, "345");
+ assertEquals(props.getConfig(nNum), (Integer)345);
+ assertEquals(props.get("n.key"), "345");
+
+ assertEquals(props.getConfig(aBsent), null);
+ assertEquals(props.getConfig(aBsent, 123), (Integer)123);
+ assertEquals(props.getConfig(aDfault), (Integer)123);
+
+ props.put(aMisstyped, "x1");
+ assertEquals(props.get("am.isstyped"), "x1");
+ boolean workedWhenShouldntHave = false;
+ try { props.getConfig(aMisstyped); workedWhenShouldntHave = true; } catch (Exception e) {}
+ if (workedWhenShouldntHave) fail("should have failed getting "+aMisstyped+" because can't coerce");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/config/ConfigUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/ConfigUtilsTest.java b/core/src/test/java/org/apache/brooklyn/core/config/ConfigUtilsTest.java
new file mode 100644
index 0000000..975ba3b
--- /dev/null
+++ b/core/src/test/java/org/apache/brooklyn/core/config/ConfigUtilsTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.core.config;
+
+import java.util.Set;
+
+import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
+import org.apache.brooklyn.core.config.ConfigUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import brooklyn.entity.basic.ConfigKeys;
+
+public class ConfigUtilsTest {
+
+ public static final ConfigKey<String> S1 = ConfigKeys.newStringConfigKey("s1");
+ public final ConfigKey<String> S2 = ConfigKeys.newStringConfigKey("s2");
+
+ @Test
+ public void testGetStaticKeys() {
+ Set<HasConfigKey<?>> keys = ConfigUtils.getStaticKeysOnClass(ConfigUtilsTest.class);
+ if (keys.size()!=1) Assert.fail("Expected 1 key; got: "+keys);
+ Assert.assertEquals(keys.iterator().next().getConfigKey(), S1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/internal/BrooklynFeatureEnablementTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/internal/BrooklynFeatureEnablementTest.java b/core/src/test/java/org/apache/brooklyn/core/internal/BrooklynFeatureEnablementTest.java
index 93ed8db..3fe4adb 100644
--- a/core/src/test/java/org/apache/brooklyn/core/internal/BrooklynFeatureEnablementTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/internal/BrooklynFeatureEnablementTest.java
@@ -22,12 +22,11 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
-
public class BrooklynFeatureEnablementTest {
@BeforeMethod(alwaysRun=true)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/management/entitlement/AcmeEntitlementManagerTestFixture.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/management/entitlement/AcmeEntitlementManagerTestFixture.java b/core/src/test/java/org/apache/brooklyn/core/management/entitlement/AcmeEntitlementManagerTestFixture.java
index d5bfae7..e263091 100644
--- a/core/src/test/java/org/apache/brooklyn/core/management/entitlement/AcmeEntitlementManagerTestFixture.java
+++ b/core/src/test/java/org/apache/brooklyn/core/management/entitlement/AcmeEntitlementManagerTestFixture.java
@@ -25,6 +25,7 @@ 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.ManagementContext;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.entitlement.Entitlements;
import org.apache.brooklyn.core.management.entitlement.NotEntitledException;
import org.apache.brooklyn.core.management.entitlement.WebEntitlementContext;
@@ -40,7 +41,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.BasicApplication;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntitlementsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntitlementsTest.java b/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntitlementsTest.java
index aac83f6..15ac73b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntitlementsTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntitlementsTest.java
@@ -25,6 +25,7 @@ import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.entitlement.EntitlementManager;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.entitlement.Entitlements;
import org.apache.brooklyn.core.management.entitlement.Entitlements.EntityAndItem;
import org.apache.brooklyn.core.management.entitlement.Entitlements.StringAndArgument;
@@ -33,7 +34,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.BasicApplication;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntityEntitlementTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntityEntitlementTest.java b/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntityEntitlementTest.java
index f1062f4..3095445 100644
--- a/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntityEntitlementTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/management/entitlement/EntityEntitlementTest.java
@@ -22,6 +22,7 @@ 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.ManagementContext;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.entitlement.Entitlements;
import org.apache.brooklyn.core.management.entitlement.NotEntitledException;
import org.apache.brooklyn.core.management.entitlement.Entitlements.EntityAndItem;
@@ -38,7 +39,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.BasicApplication;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java
index 4ae1224..99cd786 100644
--- a/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java
@@ -34,6 +34,7 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
import org.apache.brooklyn.api.management.ExecutionManager;
import org.apache.brooklyn.api.management.Task;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.BrooklynGarbageCollector;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
@@ -57,7 +58,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.BrooklynTaskTags;
import brooklyn.entity.basic.BrooklynTaskTags.WrappedEntity;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java b/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java
index 1be4846..b8f1876 100644
--- a/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java
@@ -27,6 +27,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ManagementContext.PropertiesReloadListener;
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.core.config.BrooklynProperties.Factory.Builder;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.util.os.Os;
@@ -34,9 +36,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
-import brooklyn.config.BrooklynProperties.Factory.Builder;
-
import com.google.common.base.Charsets;
import com.google.common.io.Files;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java
index b3de3d6..6746283 100644
--- a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java
@@ -21,6 +21,9 @@ package org.apache.brooklyn.core.management.osgi;
import java.io.File;
import java.io.IOException;
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.core.config.BrooklynServerConfig;
+import org.apache.brooklyn.core.config.BrooklynServerPaths;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.util.os.Os;
@@ -30,9 +33,6 @@ import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
-import brooklyn.config.BrooklynServerConfig;
-import brooklyn.config.BrooklynServerPaths;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java
index da6223a..e5dd7fb 100644
--- a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java
@@ -32,11 +32,11 @@ import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.BrooklynAppUnitTestSupport;
import brooklyn.entity.basic.Entities;
import org.apache.brooklyn.api.location.LocationSpec;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.location.basic.SshMachineLocation;
import com.google.common.base.Predicate;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java
index 2b2ce27..eac0021 100644
--- a/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java
@@ -33,6 +33,7 @@ import javax.annotation.Nullable;
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.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
@@ -48,7 +49,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java
index fff482c..eb9d907 100644
--- a/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java
@@ -26,13 +26,13 @@ import java.util.Map;
import java.util.NoSuchElementException;
import org.apache.brooklyn.api.location.MachineProvisioningLocation;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java
index 26c0261..3f10e6b 100644
--- a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java
@@ -28,6 +28,7 @@ import java.util.NoSuchElementException;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.NoMachinesAvailableException;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes;
@@ -36,7 +37,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java
index 52aa281..ffefb6e 100644
--- a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java
@@ -24,12 +24,12 @@ import static org.testng.Assert.assertTrue;
import java.util.Arrays;
import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
public class LocalhostProvisioningAndAccessTest {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java
index c887761..0d1d5bf 100644
--- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.location.basic;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.LocationDefinition;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.slf4j.Logger;
@@ -28,7 +29,6 @@ import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
public class LocationRegistryTest {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java
index f1829c7..3c8e996 100644
--- a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java
@@ -35,6 +35,7 @@ import org.apache.brooklyn.api.location.Location;
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.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
@@ -46,7 +47,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolverTest.java
index 2639db9..8504dae 100644
--- a/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolverTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolverTest.java
@@ -25,13 +25,13 @@ import java.net.InetAddress;
import java.util.Map;
import java.util.NoSuchElementException;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/core/src/test/java/org/apache/brooklyn/test/entity/LocalManagementContextForTests.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/test/entity/LocalManagementContextForTests.java b/core/src/test/java/org/apache/brooklyn/test/entity/LocalManagementContextForTests.java
index 5e5123d..c02c8b5 100644
--- a/core/src/test/java/org/apache/brooklyn/test/entity/LocalManagementContextForTests.java
+++ b/core/src/test/java/org/apache/brooklyn/test/entity/LocalManagementContextForTests.java
@@ -19,12 +19,11 @@
package org.apache.brooklyn.test.entity;
import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.core.config.BrooklynServerConfig;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
-import brooklyn.config.BrooklynProperties;
-import brooklyn.config.BrooklynServerConfig;
-
/** management context which allows disabling common time-consuming tasks.
* most instances have:
* <li> empty properties
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java
index 59b62f3..8cefe1a 100644
--- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java
+++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java
@@ -23,11 +23,11 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.AbstractApplication;
import brooklyn.entity.basic.Entities;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.entity.proxy.nginx.NginxController;
import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster;
import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java b/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java
index 804814f..b29de2b 100644
--- a/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java
+++ b/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java
@@ -26,13 +26,13 @@ import javax.annotation.Nullable;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.ha.HighAvailabilityMode;
+import org.apache.brooklyn.core.config.BrooklynServerConfig;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.options.ListContainerOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import brooklyn.config.BrooklynServerConfig;
import brooklyn.entity.rebind.persister.PersistMode;
import brooklyn.entity.rebind.persister.PersistenceObjectStore;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index dd6c1ba..11d8211 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -59,6 +59,7 @@ import org.apache.brooklyn.api.location.NoMachinesAvailableException;
import org.apache.brooklyn.api.management.AccessController;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
+import org.apache.brooklyn.core.config.ConfigUtils;
import org.apache.brooklyn.core.util.ResourceUtils;
import org.apache.brooklyn.core.util.config.ConfigBag;
import org.apache.brooklyn.core.util.crypto.SecureKeys;
@@ -137,7 +138,6 @@ import com.google.common.io.Files;
import com.google.common.net.HostAndPort;
import com.google.common.primitives.Ints;
-import brooklyn.config.ConfigUtils;
import brooklyn.entity.basic.Sanitizer;
import brooklyn.entity.rebind.persister.LocationWithObjectStore;
import brooklyn.entity.rebind.persister.PersistenceObjectStore;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java
index 1baf463..75340fc 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java
@@ -20,14 +20,12 @@ package org.apache.brooklyn.location.jclouds;
import java.util.Map;
+import org.apache.brooklyn.core.config.ConfigUtils;
import org.apache.brooklyn.core.util.config.ConfigBag;
import org.apache.brooklyn.location.basic.DeprecatedKeysMappingBuilder;
import org.apache.brooklyn.location.basic.LocationPropertiesFromBrooklynProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import brooklyn.config.ConfigUtils;
-
import org.apache.brooklyn.location.basic.LocationConfigKeys;
import org.apache.brooklyn.util.javalang.JavaClassNames;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreCleaner.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreCleaner.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreCleaner.java
index eb1654e..3d75cb8 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreCleaner.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreCleaner.java
@@ -27,8 +27,7 @@ import org.jclouds.blobstore.domain.PageSet;
import org.jclouds.blobstore.domain.StorageMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import brooklyn.config.BrooklynProperties;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.location.basic.LocationConfigKeys;
import org.apache.brooklyn.location.cloud.CloudLocationConfig;
import org.apache.brooklyn.location.jclouds.JcloudsLocation;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
index 7c5686d..c261ae6 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map.Entry;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.util.http.HttpTool;
import org.apache.brooklyn.core.util.http.HttpToolResponse;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
@@ -48,7 +49,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import org.apache.brooklyn.location.basic.LocationConfigKeys;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
index c6fd09c..88e9fc5 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
@@ -23,6 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.io.IOException;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.util.stream.Streams;
import org.apache.brooklyn.util.text.Identifiers;
@@ -36,7 +37,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import org.apache.brooklyn.location.basic.LocationConfigKeys;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
index c6df693..cfb7ba0 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
@@ -19,13 +19,13 @@
package brooklyn.entity.rebind.persister.jclouds;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.util.text.Identifiers;
import org.apache.brooklyn.util.time.Duration;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.rebind.RebindTestUtils;
import brooklyn.entity.rebind.persister.BrooklynMementoPersisterTestFixture;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
index 90f4f05..8f11fd5 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
@@ -18,6 +18,7 @@
*/
package brooklyn.entity.rebind.persister.jclouds;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.ha.HighAvailabilityManagerTestFixture;
import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
@@ -25,7 +26,6 @@ import org.apache.brooklyn.util.text.Identifiers;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.rebind.persister.PersistenceObjectStore;
@Test(groups={"Live", "Live-sanity"})
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java
index 06c137c..c081f69 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java
@@ -19,6 +19,7 @@
package brooklyn.entity.rebind.persister.jclouds;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.util.text.Identifiers;
import org.jclouds.blobstore.BlobStore;
@@ -29,7 +30,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import org.apache.brooklyn.location.jclouds.JcloudsLocation;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java
index db2884d..ff5674b 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java
@@ -21,6 +21,7 @@ package brooklyn.entity.rebind.persister.jclouds;
import java.io.IOException;
import org.apache.brooklyn.api.management.ha.HighAvailabilityMode;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.net.Urls;
@@ -32,7 +33,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import brooklyn.entity.rebind.persister.PersistMode;
import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessorWithLock;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsLiveTest.java
index e3bd6e4..c681833 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsLiveTest.java
@@ -32,9 +32,9 @@ import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.location.basic.SshMachineLocation;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java
index 3afc5b9..9830e03 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java
@@ -27,6 +27,7 @@ import javax.annotation.Nullable;
import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.core.util.config.ConfigBag;
import org.apache.brooklyn.util.collections.MutableMap;
@@ -42,7 +43,6 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.reflect.TypeToken;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ConfigKeys;
public class BailOutJcloudsLocation extends JcloudsLocation {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java
index 186fa33..1132712 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java
@@ -21,13 +21,13 @@ package org.apache.brooklyn.location.jclouds;
import static org.testng.Assert.assertEquals;
import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.test.entity.LocalManagementContextForTests;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import org.apache.brooklyn.location.basic.LocationConfigKeys;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
index 363181e..cc6bc7e 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.location.basic.LocationInternal;
import org.apache.brooklyn.location.cloud.CloudLocationConfig;
@@ -38,7 +39,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
import brooklyn.event.basic.MapConfigKey;
import brooklyn.event.basic.SetConfigKey;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java
index 8736434..c7bf262 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java
@@ -32,6 +32,7 @@ import org.apache.brooklyn.api.location.MachineLocation;
import org.apache.brooklyn.api.location.MachineLocationCustomizer;
import org.apache.brooklyn.api.location.NoMachinesAvailableException;
import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.core.management.internal.LocalManagementContext;
import org.apache.brooklyn.core.util.config.ConfigBag;
import org.apache.brooklyn.location.cloud.names.CustomMachineNamer;
@@ -55,7 +56,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.reflect.TypeToken;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java
index 57deb1c..fc07d9f 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java
@@ -27,6 +27,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.UUID;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.apache.brooklyn.util.text.Identifiers;
import org.jclouds.Constants;
import org.jclouds.ContextBuilder;
@@ -50,8 +51,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
-import brooklyn.config.BrooklynProperties;
-
import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.io.Files;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java
index c7f0335..aa12b96 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.brooklyn.api.location.NoMachinesAvailableException;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.config.BrooklynProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
@@ -33,7 +34,6 @@ import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.testng.collections.Lists;
-import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities;
import org.apache.brooklyn.location.basic.SshMachineLocation;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy
index 56bb8fe..c035a60 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy
@@ -26,7 +26,7 @@ import org.testng.annotations.AfterMethod
import org.testng.annotations.BeforeMethod
import org.testng.annotations.Test
-import brooklyn.config.BrooklynProperties
+import org.apache.brooklyn.core.config.BrooklynProperties
import org.apache.brooklyn.location.basic.SshMachineLocation
import org.apache.brooklyn.location.jclouds.JcloudsLocation
import org.apache.brooklyn.location.jclouds.JcloudsSshMachineLocation