http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiVersionMoreEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiVersionMoreEntityTest.java new file mode 100644 index 0000000..8a555ed --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiVersionMoreEntityTest.java @@ -0,0 +1,459 @@ +/* + * 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.management.osgi; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.List; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleException; +import org.osgi.framework.launch.Framework; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.catalog.CatalogItem; +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.api.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; + +import brooklyn.catalog.internal.CatalogEntityItemDto; +import brooklyn.catalog.internal.CatalogItemBuilder; +import brooklyn.catalog.internal.CatalogItemDtoAbstract; +import brooklyn.catalog.internal.CatalogTestUtils; +import brooklyn.catalog.internal.CatalogUtils; +import brooklyn.entity.basic.Entities; +import brooklyn.entity.effector.Effectors; +import brooklyn.entity.proxying.InternalEntityFactory; +import brooklyn.entity.proxying.InternalPolicyFactory; + +import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; + +import brooklyn.util.guava.Maybe; +import brooklyn.util.os.Os; +import brooklyn.util.osgi.Osgis; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; + + +/** + * Tests that OSGi entities load correctly and have the right catalog information set. + * Note further tests done elsewhere using CAMP YAML (referring to methods in this class). + */ +public class OsgiVersionMoreEntityTest { + + public static final String BROOKLYN_TEST_OSGI_ENTITIES_PATH = OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_PATH; + public static final String BROOKLYN_TEST_OSGI_ENTITIES_URL = "classpath:"+OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_PATH; + + public static final String BROOKLYN_TEST_MORE_ENTITIES_V1_PATH = OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_V1_PATH; + public static final String BROOKLYN_TEST_MORE_ENTITIES_V1_URL = "classpath:"+BROOKLYN_TEST_MORE_ENTITIES_V1_PATH; + public static final String BROOKLYN_TEST_MORE_ENTITIES_V2_PATH = OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_V2_PATH; + public static final String BROOKLYN_TEST_MORE_ENTITIES_V2_URL = "classpath:"+BROOKLYN_TEST_MORE_ENTITIES_V2_PATH; + public static final String BROOKLYN_TEST_MORE_ENTITIES_V2_EVIL_TWIN_PATH = OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_V2_EVIL_TWIN_PATH; + public static final String BROOKLYN_TEST_MORE_ENTITIES_V2_EVIL_TWIN_URL = "classpath:"+BROOKLYN_TEST_MORE_ENTITIES_V2_EVIL_TWIN_PATH; + + public static final String TEST_VERSION = "0.1.0"; + + public static final String EXPECTED_SAY_HI_BROOKLYN_RESPONSE_FROM_V1 = "Hi BROOKLYN from V1"; + public static final String EXPECTED_SAY_HI_BROOKLYN_RESPONSE_FROM_V2 = "HI BROOKLYN FROM V2"; + public static final String EXPECTED_SAY_HI_BROOKLYN_RESPONSE_FROM_V2_EVIL_TWIN = "HO BROOKLYN FROM V2 EVIL TWIN"; + + protected LocalManagementContext mgmt; + protected TestApplication app; + + @BeforeMethod(alwaysRun=true) + public void setUp() throws Exception { + mgmt = LocalManagementContextForTests.builder(true).disableOsgi(false).build(); + app = TestApplication.Factory.newManagedInstanceForTests(mgmt); + } + + @AfterMethod(alwaysRun=true) + public void tearDown() throws BundleException, IOException, InterruptedException { + Entities.destroyAll(mgmt); + } + + /** + * Test fix for + * java.lang.NoClassDefFoundError: brooklyn.event.AttributeSensor not found by io.brooklyn.brooklyn-test-osgi-entities [41] + */ + @Test + public void testEntityProxy() throws Exception { + File storageTempDir = Os.newTempDir("osgi-standalone"); + Framework framework = Osgis.newFrameworkStarted(storageTempDir.getAbsolutePath(), true, null); + + try { + ManagementContextInternal managementContext; + InternalEntityFactory factory; + + managementContext = new LocalManagementContextForTests(); + InternalPolicyFactory policyFactory = new InternalPolicyFactory(managementContext); + factory = new InternalEntityFactory(managementContext, managementContext.getEntityManager().getEntityTypeRegistry(), policyFactory); + + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_OSGI_ENTITIES_PATH); + Bundle bundle = Osgis.install(framework, BROOKLYN_TEST_OSGI_ENTITIES_PATH); + @SuppressWarnings("unchecked") + Class<? extends Entity> bundleCls = (Class<? extends Entity>) bundle.loadClass("brooklyn.osgi.tests.SimpleEntityImpl"); + @SuppressWarnings("unchecked") + Class<? extends Entity> bundleInterface = (Class<? extends Entity>) bundle.loadClass("brooklyn.osgi.tests.SimpleEntity"); + + @SuppressWarnings("unchecked") + EntitySpec<Entity> spec = (EntitySpec<Entity>) (((EntitySpec<Entity>)EntitySpec.create(bundleInterface))).impl(bundleCls); + Entity entity = bundleCls.newInstance(); + factory.createEntityProxy(spec, entity); + + if (managementContext != null) Entities.destroyAll(managementContext); + } finally { + OsgiStandaloneTest.tearDownOsgiFramework(framework, storageTempDir); + } + } + + protected CatalogItem<?, ?> addCatalogItemWithTypeAsName(String type, String version, String ...libraries) { + return addCatalogItemWithNameAndType(type, version, type, libraries); + } + protected CatalogItem<?, ?> addCatalogItemWithNameAndType(String symName, String version, String type, String ...libraries) { + return addCatalogItemWithNameAndType(mgmt, symName, version, type, libraries); + } + + @SuppressWarnings("deprecation") + static CatalogItem<?, ?> addCatalogItemWithNameAndType(ManagementContext mgmt, String symName, String version, String type, String ...libraries) { + CatalogEntityItemDto c1 = newCatalogItemWithNameAndType(symName, version, type, libraries); + mgmt.getCatalog().addItem(c1); + CatalogItem<?, ?> c2 = mgmt.getCatalog().getCatalogItem(symName, version); + Preconditions.checkNotNull(c2, "Item "+type+":"+version+" was not found after adding it"); + return c2; + } + + static CatalogEntityItemDto newCatalogItemWithTypeAsName(String type, String version, String ...libraries) { + return newCatalogItemWithNameAndType(type, version, type, libraries); + } + static CatalogEntityItemDto newCatalogItemWithNameAndType(String symName, String version, String type, String ...libraries) { + @SuppressWarnings("deprecation") + CatalogEntityItemDto c1 = CatalogItemBuilder.newEntity(symName, version) + .javaType(type) + .libraries(CatalogItemDtoAbstract.parseLibraries(Arrays.asList(libraries))) + .build(); + return c1; + } + + protected Entity addItemFromCatalog(CatalogItem<?, ?> c2) { + return addItemFromCatalog(mgmt, app, c2); + } + + public static Entity addItemFromCatalog(ManagementContext mgmt, TestApplication parent, CatalogItem<?, ?> c2) { + return parent.createAndManageChild( CatalogTestUtils.createEssentialEntitySpec(mgmt, c2) ); + } + + public static void assertV1MethodCall(Entity me) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { + Assert.assertEquals(doMethodCallBrooklyn(me), EXPECTED_SAY_HI_BROOKLYN_RESPONSE_FROM_V1); + } + public static void assertV2MethodCall(BrooklynObject me) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { + Assert.assertEquals(doMethodCallBrooklyn(me), EXPECTED_SAY_HI_BROOKLYN_RESPONSE_FROM_V2); + } + public static void assertV2EvilTwinMethodCall(Entity me) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { + Assert.assertEquals(doMethodCallBrooklyn(me), EXPECTED_SAY_HI_BROOKLYN_RESPONSE_FROM_V2_EVIL_TWIN); + } + + public static Object doMethodCallBrooklyn(BrooklynObject me) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { + return me.getClass().getMethod("sayHI", String.class).invoke(me, "Brooklyn"); + } + + public static void assertV1EffectorCall(Entity me) { + Assert.assertEquals(doEffectorCallBrooklyn(me), EXPECTED_SAY_HI_BROOKLYN_RESPONSE_FROM_V1); + } + public static void assertV2EffectorCall(Entity me) { + Assert.assertEquals(doEffectorCallBrooklyn(me), EXPECTED_SAY_HI_BROOKLYN_RESPONSE_FROM_V2); + } + public static void assertV2EvilTwinEffectorCall(Entity me) { + Assert.assertEquals(doEffectorCallBrooklyn(me), EXPECTED_SAY_HI_BROOKLYN_RESPONSE_FROM_V2_EVIL_TWIN); + } + + public static String doEffectorCallBrooklyn(Entity me) { + return me.invoke(Effectors.effector(String.class, "sayHI").buildAbstract(), ImmutableMap.of("name", "brooklyn")).getUnchecked(); + } + + public static CatalogItem<?, ?> addMoreEntityV1(ManagementContext mgmt, String versionToRegister) { + TestResourceUnavailableException.throwIfResourceUnavailable(OsgiVersionMoreEntityTest.class, BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); + return addCatalogItemWithNameAndType(mgmt, + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + versionToRegister, + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + BROOKLYN_TEST_MORE_ENTITIES_V1_URL); + } + public static CatalogItem<?, ?> addMoreEntityV2(ManagementContext mgmt, String versionToRegister) { + TestResourceUnavailableException.throwIfResourceUnavailable(OsgiVersionMoreEntityTest.class, BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); + return addCatalogItemWithNameAndType(mgmt, + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + versionToRegister, + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + BROOKLYN_TEST_MORE_ENTITIES_V2_URL, + BROOKLYN_TEST_OSGI_ENTITIES_URL); + } + + @Test + public void testMoreEntitiesV1() throws Exception { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); + + CatalogItem<?, ?> c2 = addMoreEntityV1(mgmt, TEST_VERSION); + + // test load and instantiate + Entity me = addItemFromCatalog(c2); + Assert.assertEquals(me.getCatalogItemId(), CatalogUtils.getVersionedId(OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, TEST_VERSION)); + + assertV1MethodCall(me); + assertV1EffectorCall(me); + + // test adding a child gets the right type; this time by entity parent hierarchy + BrooklynClassLoadingContext loader = CatalogUtils.newClassLoadingContext(mgmt, c2); + @SuppressWarnings({ "unchecked", "rawtypes" }) + Entity me2 = me.addChild(EntitySpec.create( (Class)loader.loadClass(c2.getJavaType()) )); + Assert.assertEquals(me2.getCatalogItemId(), CatalogUtils.getVersionedId(OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, TEST_VERSION)); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + protected PolicySpec<?> getPolicySpec(CatalogItem<?, ?> cp) { + BrooklynClassLoadingContext loader = CatalogUtils.newClassLoadingContext(mgmt, cp); + PolicySpec spec = PolicySpec.create( (Class)loader.loadClass(cp.getJavaType()) ); + spec.catalogItemId(cp.getId()); + return spec; + } + + @Test + public void testMoreEntitiesV1Policy() throws Exception { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_OSGI_ENTITIES_PATH); + + CatalogItem<?, ?> c2 = addCatalogItemWithTypeAsName( + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + TEST_VERSION, + BROOKLYN_TEST_MORE_ENTITIES_V1_URL); + + // test load and instantiate + Entity me = addItemFromCatalog(c2); + + CatalogItem<?, ?> cp = addCatalogItemWithTypeAsName( + OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_POLICY, + TEST_VERSION, + BROOKLYN_TEST_OSGI_ENTITIES_URL); + me.addPolicy(getPolicySpec(cp)); + + Assert.assertEquals(me.getPolicies().size(), 1, "Wrong number of policies: "+me.getPolicies()); + + String catalogItemId = Iterables.getOnlyElement( me.getPolicies() ).getCatalogItemId(); + Assert.assertNotNull(catalogItemId); + // must be the actual source bundle + Assert.assertFalse(catalogItemId.equals(me.getCatalogItemId()), "catalog item id is: "+catalogItemId); + Assert.assertTrue(catalogItemId.equals(CatalogUtils.getVersionedId(OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_SIMPLE_POLICY, TEST_VERSION)), "catalog item id is: "+catalogItemId); + } + + @Test + public void testMoreEntitiesV2FailsWithoutBasicTestOsgiEntitiesBundle() throws Exception { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V2_PATH); + + CatalogItem<?, ?> c2 = addCatalogItemWithTypeAsName( + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + TEST_VERSION, + BROOKLYN_TEST_MORE_ENTITIES_V2_URL); + + // test load and instantiate + try { + Entity me = addItemFromCatalog(c2); + Assert.fail("Should have failed, with unresolved dependency; instead got "+me); + } catch (Exception e) { + Assert.assertTrue(e.toString().toLowerCase().contains("unresolved constraint"), "Missing expected text in error: "+e); + Assert.assertTrue(e.toString().toLowerCase().contains("wiring.package"), "Missing expected text in error: "+e); + Assert.assertTrue(e.toString().toLowerCase().contains("brooklyn.osgi.tests"), "Missing expected text in error: "+e); + } + } + + // V2 works with dependency declared, and can load + // and has policy, with policy item catalog ID is reasonable + @Test + public void testMoreEntitiesV2() throws Exception { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V2_PATH); + + CatalogItem<?, ?> c2 = addCatalogItemWithTypeAsName( + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + TEST_VERSION, + BROOKLYN_TEST_MORE_ENTITIES_V2_URL, + BROOKLYN_TEST_OSGI_ENTITIES_URL); + + // test load and instantiate + Entity me = addItemFromCatalog(c2); + Assert.assertEquals(me.getCatalogItemId(), CatalogUtils.getVersionedId(OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, TEST_VERSION)); + + assertV2MethodCall(me); + assertV2EffectorCall(me); + Assert.assertEquals(me.getPolicies().size(), 1, "Wrong number of policies: "+me.getPolicies()); + + String catalogItemId = Iterables.getOnlyElement( me.getPolicies() ).getCatalogItemId(); + Assert.assertNotNull(catalogItemId); + // allow either me's bundle (more) or the actual source bundle + Assert.assertTrue(catalogItemId.equals(me.getCatalogItemId()) || catalogItemId.startsWith("brooklyn-test-osgi-entities")); + } + + @Test + public void testMoreEntitiesV1ThenV2GivesV2() throws Exception { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V2_PATH); + + addCatalogItemWithTypeAsName( + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + TEST_VERSION, + BROOKLYN_TEST_MORE_ENTITIES_V1_URL); + addCatalogItemWithTypeAsName( + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + TEST_VERSION, + BROOKLYN_TEST_MORE_ENTITIES_V2_URL, BROOKLYN_TEST_OSGI_ENTITIES_URL); + + // test load and instantiate + Entity me = addItemFromCatalog( mgmt.getCatalog().getCatalogItem(OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, TEST_VERSION) ); + + assertV2MethodCall(me); + assertV2EffectorCall(me); + Assert.assertEquals(me.getPolicies().size(), 1, "Wrong number of policies: "+me.getPolicies()); + } + + @Test + public void testMoreEntitiesV2ThenV1GivesV1() throws Exception { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V2_PATH); + + addCatalogItemWithTypeAsName( + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + TEST_VERSION, + BROOKLYN_TEST_MORE_ENTITIES_V2_URL, BROOKLYN_TEST_OSGI_ENTITIES_URL); + addCatalogItemWithTypeAsName( + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + TEST_VERSION, + BROOKLYN_TEST_MORE_ENTITIES_V1_URL); + + // test load and instantiate + Entity me = addItemFromCatalog( mgmt.getCatalog().getCatalogItem(OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, TEST_VERSION) ); + /* + * WARNING - Weird maven-bundle-plugin and OSGi behaviour. Some caveats: + * <p> + * (1) When "import-package" declares a version, that is the *minimum* version; + * it may be that semantic versioning is applied, so 1.3.1 = [1.3.1,4.0.0); + * or it may be just a minimum 1.3.1 = [1.3.1,) ... i can't find good docs + * [but see http://www.christianposta.com/blog/?p=241] + * <p> + * (2) Different versions of maven-bundle-plugin do wildly different things. + * * v1.4.0 attaches the version to import-package (so you get the minimum + * which can cause this test to fail); + * * v2.x does not seem to declare the exported package at all in import-package + * (violating the so-called best practice, see + * http://blog.osgi.org/2007/04/importance-of-exporting-nd-importing.html ) + * * v2.4.0 gives a huge list in import/export package, with semver ranges; + * but the other versions seem not to list much and they do NOT have versions + * <p> + * The tests are all working with 2.5.3 but if version dependencies become any + * more intertwined maven-bundle-plugin will almost certainly NOT do the wrong + * thing because packages do not have versions. (Ironically, 1.4.0 seems the + * best behaved, but for the minimum/semver package version behaviour, and + * even that wouldn't be so bad if you're doing semver, or if you figure out + * how to override with a _versionpolicy tag!) + */ + assertV1MethodCall(me); + assertV1EffectorCall(me); + Assert.assertEquals(me.getPolicies().size(), 0, "Wrong number of policies: "+me.getPolicies()); + } + + @Test + public void testUnfazedByMoreEntitiesV1AndV2AndV2EvilTwin() throws Exception { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V2_PATH); + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V2_EVIL_TWIN_PATH); + + addCatalogItemWithNameAndType("v1", + TEST_VERSION, + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + BROOKLYN_TEST_MORE_ENTITIES_V1_URL); + addCatalogItemWithNameAndType("v2", + TEST_VERSION, + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + BROOKLYN_TEST_MORE_ENTITIES_V2_URL, BROOKLYN_TEST_OSGI_ENTITIES_URL); + addCatalogItemWithNameAndType("v2-evil", + TEST_VERSION, + OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, + BROOKLYN_TEST_MORE_ENTITIES_V2_EVIL_TWIN_URL, BROOKLYN_TEST_OSGI_ENTITIES_URL); + + // test osgi finding + + List<Bundle> bundles = Osgis.bundleFinder(mgmt.getOsgiManager().get().getFramework()) + .symbolicName(OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_SYMBOLIC_NAME_FULL).findAll(); + Assert.assertEquals(bundles.size(), 3, "Wrong list of bundles: "+bundles); + + Maybe<Bundle> preferredVersion = Osgis.bundleFinder(mgmt.getOsgiManager().get().getFramework()) + .symbolicName(OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_SYMBOLIC_NAME_FULL).find(); + Assert.assertTrue(preferredVersion.isPresent()); + Assert.assertEquals(preferredVersion.get().getVersion().toString(), "0.2.0"); + + Maybe<Bundle> evilVersion = Osgis.bundleFinder(mgmt.getOsgiManager().get().getFramework()). + preferringFromUrl(BROOKLYN_TEST_MORE_ENTITIES_V2_EVIL_TWIN_URL).find(); + Assert.assertTrue(evilVersion.isPresent()); + Assert.assertEquals(evilVersion.get().getVersion().toString(), "0.2.0"); + + // test preferredUrl vs requiredUrl + + Maybe<Bundle> versionIgnoresInvalidPreferredUrl = Osgis.bundleFinder(mgmt.getOsgiManager().get().getFramework()) + .symbolicName(OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_SYMBOLIC_NAME_FULL) + .version(TEST_VERSION) + .preferringFromUrl(BROOKLYN_TEST_MORE_ENTITIES_V2_EVIL_TWIN_URL).find(); + Assert.assertTrue(versionIgnoresInvalidPreferredUrl.isPresent()); + Assert.assertEquals(versionIgnoresInvalidPreferredUrl.get().getVersion().toString(), TEST_VERSION); + + Maybe<Bundle> versionRespectsInvalidRequiredUrl = Osgis.bundleFinder(mgmt.getOsgiManager().get().getFramework()) + .symbolicName(OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_SYMBOLIC_NAME_FULL) + .version(TEST_VERSION) + .requiringFromUrl(BROOKLYN_TEST_MORE_ENTITIES_V2_EVIL_TWIN_URL).find(); + Assert.assertFalse(versionRespectsInvalidRequiredUrl.isPresent()); + + // test entity resolution + + Entity v2 = addItemFromCatalog( mgmt.getCatalog().getCatalogItem("v2", TEST_VERSION) ); + assertV2MethodCall(v2); + assertV2EffectorCall(v2); + Assert.assertEquals(v2.getPolicies().size(), 1, "Wrong number of policies: "+v2.getPolicies()); + + Entity v2_evil = addItemFromCatalog( mgmt.getCatalog().getCatalogItem("v2-evil", TEST_VERSION) ); + assertV2EvilTwinMethodCall(v2_evil); + assertV2EvilTwinEffectorCall(v2_evil); + Assert.assertEquals(v2_evil.getPolicies().size(), 1, "Wrong number of policies: "+v2_evil.getPolicies()); + + Entity v1 = addItemFromCatalog( mgmt.getCatalog().getCatalogItem("v1", TEST_VERSION) ); + assertV1MethodCall(v1); + assertV1EffectorCall(v1); + Assert.assertEquals(v1.getPolicies().size(), 0, "Wrong number of policies: "+v1.getPolicies()); + } + + // TODO versioning (WIP until #92), install both V1 and V2 with version number, and test that both work + +}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java index 541585f..dfda31e 100644 --- a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java @@ -19,6 +19,7 @@ package org.apache.brooklyn.location.access; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -26,7 +27,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; public class PortForwardManagerLocationResolverTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java index 3cb5ab9..f30665c 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +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; @@ -36,8 +37,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; -import brooklyn.management.internal.LocalManagementContext; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 09eb142..c282fa2 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.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +45,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java index 73ca57a..9ddc3bf 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +50,6 @@ import com.google.common.collect.Lists; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 2ef938d..fff482c 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,6 +26,7 @@ import java.util.Map; import java.util.NoSuchElementException; import org.apache.brooklyn.api.location.MachineProvisioningLocation; +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; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 704f5ac..f04e6cd 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.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -36,7 +37,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.text.StringEscapes.JavaStringEscapes; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java index 2bd0d28..cd1df7a 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java @@ -39,9 +39,9 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.geo.HostGeoInfo; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 e1dff5e..52aa281 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,13 +24,13 @@ import static org.testng.Assert.assertTrue; import java.util.Arrays; import org.apache.brooklyn.api.location.Location; +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; -import brooklyn.management.internal.LocalManagementContext; public class LocalhostProvisioningAndAccessTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/test/java/org/apache/brooklyn/location/basic/LocationPredicatesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationPredicatesTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationPredicatesTest.java index 219acd2..cfbc5ee 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationPredicatesTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationPredicatesTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; @@ -30,7 +31,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; public class LocationPredicatesTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 b1e01ca..c887761 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.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +30,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; public class LocationRegistryTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 8953397..8ccf2e4 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.management.internal.LocalManagementContext; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; @@ -44,7 +45,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java index 26423f5..314c81b 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java @@ -32,9 +32,9 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableSet; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 a9da0dd..2639db9 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,6 +25,7 @@ import java.net.InetAddress; import java.util.Map; import java.util.NoSuchElementException; +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; @@ -32,7 +33,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java index 7d42e88..7c1e951 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.location.basic; import static org.testng.Assert.assertNotNull; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,8 +28,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.management.internal.LocalManagementContext; - public class SingleMachineProvisioningLocationTest { private static final Logger log = LoggerFactory.getLogger(SingleMachineProvisioningLocation.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java index 1fef80b..6ba27e7 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java @@ -34,8 +34,8 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 775f1a3..808a054 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 @@ -18,11 +18,12 @@ */ package org.apache.brooklyn.test.entity; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; + import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.ConfigKey; -import brooklyn.management.internal.LocalManagementContext; -import brooklyn.management.internal.ManagementContextInternal; /** management context which allows disabling common time-consuming tasks. * most instances have: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 c720b41..0bf3330 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.management.internal.LocalManagementContext; 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; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.text.Identifiers; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java index 78c4545..1085b8b 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java @@ -18,11 +18,11 @@ */ package brooklyn.entity.rebind.persister.jclouds; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.qa.performance.EntityPersistencePerformanceTest; public class EntityToBlobStorePersistencePerformanceTest extends EntityPersistencePerformanceTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 92b7a44..3ac15df 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,14 +18,14 @@ */ package brooklyn.entity.rebind.persister.jclouds; +import org.apache.brooklyn.core.management.ha.HighAvailabilityManagerTestFixture; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import brooklyn.management.ha.HighAvailabilityManagerTestFixture; -import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.text.Identifiers; @Test(groups={"Live", "Live-sanity"}) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java index 647e514..0e0aa6c 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStoreTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.rebind.persister.jclouds; import java.util.List; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; import brooklyn.entity.rebind.persister.PersistenceObjectStore; import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessor; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableList; import brooklyn.util.text.Identifiers; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 b5f4dab..92d5f18 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 @@ -33,8 +33,10 @@ import org.testng.annotations.BeforeMethod; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; + +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.internal.LocalManagementContext; + import brooklyn.util.exceptions.CompoundRuntimeException; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 7892c8e..c323b7f 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 @@ -26,6 +26,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Template; @@ -39,7 +40,6 @@ import com.google.common.reflect.TypeToken; import brooklyn.config.BrooklynProperties; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.CompoundRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePoolLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePoolLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePoolLiveTest.java index 3fda145..e4286bc 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePoolLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePoolLiveTest.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.location.jclouds; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.jclouds.pool.MachineSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,11 +26,9 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.jclouds.pool.MachinePoolPredicates; import org.apache.brooklyn.location.jclouds.pool.ReusableMachineTemplate; -import brooklyn.management.internal.LocalManagementContext; public class BrooklynMachinePoolLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java index 2f708f3..4112f61 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java @@ -28,9 +28,9 @@ import java.util.Set; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; -import brooklyn.management.internal.LocalManagementContext; + import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java index 31831a8..1accbad 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java @@ -23,12 +23,12 @@ import static org.testng.Assert.assertTrue; import java.util.Set; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java index 3f7c837..0b5d1c6 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.fail; import java.util.NoSuchElementException; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; @@ -29,7 +30,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; public class JcloudsByonLocationResolverTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 3c3d4a5..186fa33 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,6 +21,7 @@ package org.apache.brooklyn.location.jclouds; import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.location.Location; +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; @@ -31,8 +32,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.LocationConfigKeys; -import brooklyn.management.internal.LocalManagementContext; - import com.google.common.collect.ImmutableSet; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 8cd20b9..02537fe 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.management.internal.LocalManagementContext; import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -38,7 +39,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.SetConfigKey; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 100f98a..83ffb78 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 @@ -31,6 +31,7 @@ import org.apache.brooklyn.api.location.LocationSpec; 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.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.cloud.names.CustomMachineNamer; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.jclouds.scriptbuilder.domain.OsFamily; @@ -58,7 +59,6 @@ import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.geo.HostGeoInfo; import org.apache.brooklyn.location.jclouds.JcloudsLocation.UserCreation; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java index e3b749d..6043a09 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java @@ -26,6 +26,7 @@ import java.io.File; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.OsDetails; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -34,7 +35,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.config.ConfigBag; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/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 3c23328..9e1e1e9 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 @@ -30,7 +30,7 @@ import brooklyn.config.BrooklynProperties import org.apache.brooklyn.location.basic.SshMachineLocation import org.apache.brooklyn.location.jclouds.JcloudsLocation import org.apache.brooklyn.location.jclouds.JcloudsSshMachineLocation -import brooklyn.management.internal.LocalManagementContext +import org.apache.brooklyn.core.management.internal.LocalManagementContext import brooklyn.util.collections.MutableMap import com.google.common.collect.ImmutableList http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java index 84c90ab..cf372d0 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.jclouds.AbstractJcloudsLiveTest; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.jclouds.domain.LocationScope; @@ -35,8 +36,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.jclouds.JcloudsSshMachineLocation; -import brooklyn.management.internal.LocalManagementContext; - import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java b/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java index f3de4dd..93ece4a 100644 --- a/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java +++ b/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java @@ -24,10 +24,10 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.internal.LocalSubscriptionManager; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.management.internal.LocalSubscriptionManager; -import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.task.BasicExecutionManager; import com.google.common.util.concurrent.ThreadFactoryBuilder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy b/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy index 406fc27..e0419f7 100644 --- a/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy +++ b/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy @@ -31,7 +31,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal import org.apache.brooklyn.api.event.Sensor import brooklyn.event.basic.BasicAttributeSensor import org.apache.brooklyn.api.management.SubscriptionContext -import brooklyn.management.internal.LocalManagementContext +import org.apache.brooklyn.core.management.internal.LocalManagementContext class DeltaEnrichersTests { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java index ecc4adc..b3d9c10 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import com.google.common.base.CaseFormat; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java index a8f15f5..46f0d6a 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -35,7 +36,6 @@ import com.google.common.collect.ImmutableMap; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.text.StringShortener; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java index 485b287..f528f7c 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java @@ -33,6 +33,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -44,7 +45,6 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.BrooklynNetworkUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java index 41ec5c5..dd2b9b0 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java @@ -24,6 +24,7 @@ import java.io.File; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -38,8 +39,9 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaOptsTest.TestingJavaOptsVanillaJavaAppImpl; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.event.basic.Sensors; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.internal.LocalManagementContext; + import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java index e6c3ab6..55b1df7 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java @@ -26,6 +26,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; @@ -43,7 +44,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.dynamic.DynamicLocation; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; public class ServerPoolLocationResolverTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java index f24ae5f..d47a5bb 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java @@ -27,6 +27,7 @@ import java.util.Collection; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +37,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Attributes; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.management.internal.LocalManagementContext; import com.google.common.base.Optional; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java index c0bf566..654597b 100644 --- a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java @@ -21,7 +21,6 @@ package brooklyn.entity.software; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import com.google.common.base.CaseFormat; @@ -30,6 +29,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java index 4d032df..6fbbb98 100644 --- a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java @@ -30,6 +30,10 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.management.internal.UsageListener.ApplicationMetadata; +import org.apache.brooklyn.core.management.usage.ApplicationUsage; +import org.apache.brooklyn.core.management.usage.ApplicationUsage.ApplicationEvent; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -41,9 +45,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.proxying.EntityProxy; -import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.management.internal.UsageListener.ApplicationMetadata; -import brooklyn.management.usage.ApplicationUsage.ApplicationEvent; import brooklyn.test.Asserts; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java index 61032c4..82ff588 100644 --- a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java @@ -31,6 +31,9 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.management.internal.UsageListener.LocationMetadata; +import org.apache.brooklyn.core.management.usage.LocationUsage; +import org.apache.brooklyn.core.management.usage.LocationUsage.LocationEvent; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -41,8 +44,6 @@ import brooklyn.entity.basic.SoftwareProcessEntityTest; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.internal.UsageListener.LocationMetadata; -import brooklyn.management.usage.LocationUsage.LocationEvent; import brooklyn.test.Asserts; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java b/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java index c270ac5..4ac1631 100644 --- a/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java +++ b/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java @@ -21,15 +21,16 @@ package brooklyn.management.usage; import java.util.List; import java.util.Map; -import brooklyn.management.usage.ApplicationUsage.ApplicationEvent; -import brooklyn.management.usage.LocationUsage.LocationEvent; +import org.apache.brooklyn.core.management.usage.ApplicationUsage.ApplicationEvent; +import org.apache.brooklyn.core.management.usage.LocationUsage.LocationEvent; + import brooklyn.util.collections.MutableList; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @Deprecated -public class RecordingLegacyUsageListener implements brooklyn.management.internal.UsageManager.UsageListener { +public class RecordingLegacyUsageListener implements org.apache.brooklyn.core.management.internal.UsageManager.UsageListener { private final List<List<?>> events = Lists.newCopyOnWriteArrayList(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java b/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java index bf26c5c..e5868a8 100644 --- a/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java +++ b/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java @@ -20,14 +20,15 @@ package brooklyn.management.usage; import java.util.List; -import brooklyn.management.usage.ApplicationUsage.ApplicationEvent; -import brooklyn.management.usage.LocationUsage.LocationEvent; +import org.apache.brooklyn.core.management.usage.ApplicationUsage.ApplicationEvent; +import org.apache.brooklyn.core.management.usage.LocationUsage.LocationEvent; + import brooklyn.util.collections.MutableList; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -public class RecordingUsageListener implements brooklyn.management.internal.UsageListener { +public class RecordingUsageListener implements org.apache.brooklyn.core.management.internal.UsageListener { private final List<List<?>> events = Lists.newCopyOnWriteArrayList(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java index 863f587..a143558 100644 --- a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java @@ -34,9 +34,9 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.management.internal.UsageManager; -import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.management.internal.UsageManager; import brooklyn.test.Asserts; import com.google.common.collect.ImmutableList; @@ -107,7 +107,7 @@ public class UsageListenerTest { }}); } - public static class RecordingStaticLegacyUsageListener extends RecordingLegacyUsageListener implements brooklyn.management.internal.UsageManager.UsageListener { + public static class RecordingStaticLegacyUsageListener extends RecordingLegacyUsageListener implements org.apache.brooklyn.core.management.internal.UsageManager.UsageListener { private static final List<RecordingStaticLegacyUsageListener> STATIC_INSTANCES = Lists.newCopyOnWriteArrayList(); public static RecordingStaticLegacyUsageListener getInstance() { @@ -125,7 +125,7 @@ public class UsageListenerTest { } } - public static class RecordingStaticUsageListener extends RecordingUsageListener implements brooklyn.management.internal.UsageListener { + public static class RecordingStaticUsageListener extends RecordingUsageListener implements org.apache.brooklyn.core.management.internal.UsageListener { private static final List<RecordingStaticUsageListener> STATIC_INSTANCES = Lists.newCopyOnWriteArrayList(); public static RecordingStaticUsageListener getInstance() {
