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/15 15:33:26 UTC
[24/33] incubator-brooklyn git commit: [BROOKLYN-162] Refactor
package in ./core/management
[BROOKLYN-162] Refactor package in ./core/management
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6602f694
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6602f694
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6602f694
Branch: refs/heads/master
Commit: 6602f694a2ac625e895de264d83a0407bc512fbe
Parents: 083953f
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Fri Aug 14 23:35:04 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Fri Aug 14 23:35:04 2015 -0400
----------------------------------------------------------------------
.../src/main/java/brooklyn/BrooklynVersion.java | 2 +-
.../brooklyn/basic/AbstractBrooklynObject.java | 2 +-
.../brooklyn/basic/BasicConfigurableObject.java | 2 +-
.../brooklyn/catalog/CatalogPredicates.java | 2 +-
.../catalog/internal/BasicBrooklynCatalog.java | 2 +-
.../catalog/internal/CatalogClasspathDo.java | 2 +-
.../brooklyn/catalog/internal/CatalogDo.java | 2 +-
.../catalog/internal/CatalogInitialization.java | 4 +-
.../brooklyn/catalog/internal/CatalogUtils.java | 10 +-
.../brooklyn/config/BrooklynServerPaths.java | 2 +-
.../entity/basic/AbstractApplication.java | 2 +-
.../brooklyn/entity/basic/AbstractEffector.java | 2 +-
.../brooklyn/entity/basic/AbstractEntity.java | 8 +-
.../entity/basic/AbstractGroupImpl.java | 2 +-
.../entity/basic/BrooklynShutdownHooks.java | 2 +-
.../brooklyn/entity/basic/DynamicGroupImpl.java | 4 +-
.../java/brooklyn/entity/basic/Entities.java | 10 +-
.../brooklyn/entity/basic/EntityInternal.java | 2 +-
.../basic/EntityTransientCopyInternal.java | 2 +-
.../brooklyn/entity/basic/MethodEffector.java | 2 +-
.../entity/effector/AddChildrenEffector.java | 4 +-
.../brooklyn/entity/effector/EffectorTasks.java | 4 +-
.../entity/proxying/EntityProxyImpl.java | 6 +-
.../entity/proxying/InternalEntityFactory.java | 2 +-
.../entity/proxying/InternalFactory.java | 3 +-
.../proxying/InternalLocationFactory.java | 4 +-
.../entity/proxying/InternalPolicyFactory.java | 2 +-
.../rebind/InitialFullRebindIteration.java | 8 +-
.../brooklyn/entity/rebind/RebindIteration.java | 12 +-
.../entity/rebind/RebindManagerImpl.java | 4 +-
.../BrooklynMementoPersisterToObjectStore.java | 2 +-
.../persister/BrooklynPersistenceUtils.java | 6 +-
.../rebind/persister/XmlMementoSerializer.java | 6 +-
...platedStringAttributeSensorAndConfigKey.java | 2 +-
.../internal/storage/DataGridFactory.java | 4 +-
.../impl/inmemory/InMemoryDataGridFactory.java | 3 +-
.../management/ManagementContextInjectable.java | 33 -
.../AbstractBrooklynClassLoadingContext.java | 82 --
.../BrooklynClassLoadingContextSequential.java | 136 ---
...ssLoaderFromBrooklynClassLoadingContext.java | 66 --
.../JavaBrooklynClassLoadingContext.java | 123 --
.../OsgiBrooklynClassLoadingContext.java | 147 ---
.../BasicEntitlementClassDefinition.java | 56 -
.../entitlement/EntitlementManagerAdapter.java | 134 ---
.../entitlement/EntitlementPredicates.java | 40 -
.../management/entitlement/Entitlements.java | 418 -------
.../entitlement/NotEntitledException.java | 44 -
.../entitlement/PerUserEntitlementManager.java | 100 --
.../PerUserEntitlementManagerWithDefault.java | 31 -
.../entitlement/WebEntitlementContext.java | 57 -
.../management/ha/BasicMasterChooser.java | 204 ----
.../ha/HighAvailabilityManagerImpl.java | 1105 ------------------
.../ha/ManagementPlaneSyncRecordDeltaImpl.java | 122 --
...ntPlaneSyncRecordPersisterToObjectStore.java | 355 ------
.../brooklyn/management/ha/MasterChooser.java | 40 -
.../brooklyn/management/ha/OsgiManager.java | 312 -----
.../internal/AbstractManagementContext.java | 485 --------
.../internal/AbstractSubscriptionManager.java | 141 ---
.../management/internal/AccessManager.java | 41 -
.../internal/AsyncCollectionChangeAdapter.java | 83 --
.../internal/BasicSubscriptionContext.java | 180 ---
.../internal/BrooklynGarbageCollector.java | 626 ----------
.../internal/BrooklynObjectManagementMode.java | 31 -
.../internal/BrooklynObjectManagerInternal.java | 36 -
.../internal/CollectionChangeListener.java | 24 -
.../management/internal/EffectorUtils.java | 356 ------
.../internal/EntityChangeListener.java | 79 --
.../internal/EntityManagementSupport.java | 478 --------
.../internal/EntityManagementUtils.java | 326 ------
.../internal/EntityManagerInternal.java | 32 -
...PropertyChangeToCollectionChangeAdapter.java | 65 --
.../management/internal/LocalAccessManager.java | 111 --
.../management/internal/LocalEntityManager.java | 818 -------------
.../internal/LocalLocationManager.java | 463 --------
.../internal/LocalManagementContext.java | 421 -------
.../internal/LocalSubscriptionManager.java | 292 -----
.../management/internal/LocalUsageManager.java | 430 -------
.../internal/LocationManagerInternal.java | 28 -
.../internal/ManagementContextInternal.java | 122 --
.../internal/ManagementTransitionInfo.java | 48 -
.../internal/ManagementTransitionMode.java | 127 --
.../internal/NonDeploymentAccessManager.java | 98 --
.../internal/NonDeploymentEntityManager.java | 196 ----
.../internal/NonDeploymentLocationManager.java | 146 ---
.../NonDeploymentManagementContext.java | 639 ----------
.../internal/NonDeploymentUsageManager.java | 132 ---
.../internal/QueueingSubscriptionManager.java | 148 ---
.../management/internal/Subscription.java | 66 --
.../internal/SubscriptionTracker.java | 137 ---
.../management/internal/UsageListener.java | 104 --
.../management/internal/UsageManager.java | 166 ---
.../management/usage/ApplicationUsage.java | 126 --
.../management/usage/LocationUsage.java | 135 ---
.../policy/basic/AbstractEntityAdjunct.java | 2 +-
.../main/java/brooklyn/util/ResourceUtils.java | 4 +-
.../util/task/BasicExecutionContext.java | 2 +-
.../java/brooklyn/util/task/CompoundTask.java | 2 +-
.../util/task/DynamicSequentialTask.java | 2 +-
.../brooklyn/util/text/TemplateProcessor.java | 2 +-
.../management/ManagementContextInjectable.java | 33 +
.../AbstractBrooklynClassLoadingContext.java | 82 ++
.../BrooklynClassLoadingContextSequential.java | 136 +++
...ssLoaderFromBrooklynClassLoadingContext.java | 66 ++
.../JavaBrooklynClassLoadingContext.java | 123 ++
.../OsgiBrooklynClassLoadingContext.java | 147 +++
.../BasicEntitlementClassDefinition.java | 56 +
.../entitlement/EntitlementManagerAdapter.java | 133 +++
.../entitlement/EntitlementPredicates.java | 40 +
.../management/entitlement/Entitlements.java | 418 +++++++
.../entitlement/NotEntitledException.java | 44 +
.../entitlement/PerUserEntitlementManager.java | 100 ++
.../PerUserEntitlementManagerWithDefault.java | 31 +
.../entitlement/WebEntitlementContext.java | 57 +
.../core/management/ha/BasicMasterChooser.java | 204 ++++
.../ha/HighAvailabilityManagerImpl.java | 1105 ++++++++++++++++++
.../ha/ManagementPlaneSyncRecordDeltaImpl.java | 122 ++
...ntPlaneSyncRecordPersisterToObjectStore.java | 355 ++++++
.../core/management/ha/MasterChooser.java | 40 +
.../core/management/ha/OsgiManager.java | 312 +++++
.../internal/AbstractManagementContext.java | 485 ++++++++
.../internal/AbstractSubscriptionManager.java | 141 +++
.../core/management/internal/AccessManager.java | 41 +
.../internal/AsyncCollectionChangeAdapter.java | 83 ++
.../internal/BasicSubscriptionContext.java | 180 +++
.../internal/BrooklynGarbageCollector.java | 626 ++++++++++
.../internal/BrooklynObjectManagementMode.java | 31 +
.../internal/BrooklynObjectManagerInternal.java | 36 +
.../internal/CollectionChangeListener.java | 24 +
.../core/management/internal/EffectorUtils.java | 356 ++++++
.../internal/EntityChangeListener.java | 79 ++
.../internal/EntityManagementSupport.java | 478 ++++++++
.../internal/EntityManagementUtils.java | 326 ++++++
.../internal/EntityManagerInternal.java | 32 +
...PropertyChangeToCollectionChangeAdapter.java | 65 ++
.../management/internal/LocalAccessManager.java | 111 ++
.../management/internal/LocalEntityManager.java | 818 +++++++++++++
.../internal/LocalLocationManager.java | 463 ++++++++
.../internal/LocalManagementContext.java | 421 +++++++
.../internal/LocalSubscriptionManager.java | 292 +++++
.../management/internal/LocalUsageManager.java | 430 +++++++
.../internal/LocationManagerInternal.java | 28 +
.../internal/ManagementContextInternal.java | 122 ++
.../internal/ManagementTransitionInfo.java | 48 +
.../internal/ManagementTransitionMode.java | 127 ++
.../internal/NonDeploymentAccessManager.java | 98 ++
.../internal/NonDeploymentEntityManager.java | 196 ++++
.../internal/NonDeploymentLocationManager.java | 146 +++
.../NonDeploymentManagementContext.java | 639 ++++++++++
.../internal/NonDeploymentUsageManager.java | 132 +++
.../internal/QueueingSubscriptionManager.java | 148 +++
.../core/management/internal/Subscription.java | 66 ++
.../internal/SubscriptionTracker.java | 137 +++
.../core/management/internal/UsageListener.java | 103 ++
.../core/management/internal/UsageManager.java | 166 +++
.../core/management/usage/ApplicationUsage.java | 126 ++
.../core/management/usage/LocationUsage.java | 135 +++
.../location/basic/AbstractLocation.java | 4 +-
.../location/basic/BasicLocationRegistry.java | 2 +-
.../location/basic/ByonLocationResolver.java | 2 +-
.../test/java/brooklyn/BrooklynVersionTest.java | 5 +-
.../brooklyn/camp/lite/CampYamlLiteTest.java | 4 +-
.../catalog/internal/CatalogDtoTest.java | 2 +-
.../catalog/internal/CatalogScanTest.java | 2 +-
.../catalog/internal/CatalogVersioningTest.java | 2 +-
.../entity/BrooklynAppLiveTestSupport.java | 2 +-
.../entity/BrooklynAppUnitTestSupport.java | 2 +-
.../brooklyn/entity/EffectorMetadataTest.java | 2 +-
.../entity/EffectorSayHiGroovyTest.groovy | 2 +-
.../java/brooklyn/entity/EffectorSayHiTest.java | 2 +-
.../downloads/BasicDownloadsRegistryTest.java | 3 +-
.../DownloadProducerFromLocalRepoTest.java | 3 +-
.../DownloadProducerFromPropertiesTest.java | 3 +-
.../entity/effector/EffectorBasicTest.java | 4 +-
.../ApplicationBuilderOverridingTest.java | 2 +-
.../entity/proxying/EntityProxyTest.java | 2 +-
.../proxying/InternalEntityFactoryTest.java | 2 +-
.../rebind/ActivePartialRebindVersionTest.java | 4 +-
.../entity/rebind/RebindCatalogEntityTest.java | 2 +-
.../entity/rebind/RebindCatalogItemTest.java | 4 +-
...talogWhenCatalogPersistenceDisabledTest.java | 2 +-
.../entity/rebind/RebindEntityTest.java | 2 +-
.../entity/rebind/RebindFailuresTest.java | 2 +-
.../brooklyn/entity/rebind/RebindFeedTest.java | 2 +-
.../entity/rebind/RebindFeedWithHaTest.java | 2 +-
.../entity/rebind/RebindTestFixture.java | 4 +-
.../brooklyn/entity/rebind/RebindTestUtils.java | 6 +-
.../persister/XmlMementoSerializerTest.java | 5 +-
.../transformer/CompoundTransformerTest.java | 2 +-
.../event/feed/ConfigToAttributesTest.java | 4 +-
.../entitlement/AcmeEntitlementManager.java | 50 -
.../entitlement/AcmeEntitlementManagerTest.java | 59 -
.../AcmeEntitlementManagerTestFixture.java | 155 ---
.../entitlement/EntitlementsTest.java | 207 ----
.../entitlement/EntityEntitlementTest.java | 183 ---
...PerUserEntitlementManagerPropertiesTest.java | 52 -
.../HighAvailabilityManagerFileBasedTest.java | 47 -
...ilabilityManagerInMemoryIntegrationTest.java | 96 --
.../ha/HighAvailabilityManagerInMemoryTest.java | 144 ---
.../HighAvailabilityManagerSplitBrainTest.java | 472 --------
.../ha/HighAvailabilityManagerTestFixture.java | 284 -----
.../brooklyn/management/ha/HotStandbyTest.java | 665 -----------
.../ha/ImmutableManagementPlaneSyncRecord.java | 57 -
...agementPlaneSyncRecordPersisterInMemory.java | 99 --
.../management/ha/MasterChooserTest.java | 146 ---
.../ha/MutableManagementPlaneSyncRecord.java | 62 -
.../management/ha/TestEntityFailingRebind.java | 55 -
.../brooklyn/management/ha/WarmStandbyTest.java | 153 ---
.../management/internal/AccessManagerTest.java | 145 ---
.../internal/EntityExecutionManagerTest.java | 479 --------
.../LocalManagementContextInstancesTest.java | 86 --
.../internal/LocalManagementContextTest.java | 126 --
.../internal/LocalSubscriptionManagerTest.java | 181 ---
.../brooklyn/management/osgi/OsgiPathTest.java | 105 --
.../management/osgi/OsgiStandaloneTest.java | 259 ----
.../management/osgi/OsgiTestResources.java | 74 --
.../osgi/OsgiVersionMoreEntityTest.java | 459 --------
.../EntityCleanupLongevityTestFixture.java | 8 +-
.../brooklyn/util/task/ssh/SshTasksTest.java | 2 +-
.../util/task/system/SystemTasksTest.java | 2 +-
.../util/text/TemplateProcessorTest.java | 2 +-
.../entitlement/AcmeEntitlementManager.java | 52 +
.../entitlement/AcmeEntitlementManagerTest.java | 60 +
.../AcmeEntitlementManagerTestFixture.java | 158 +++
.../entitlement/EntitlementsTest.java | 208 ++++
.../entitlement/EntityEntitlementTest.java | 185 +++
...PerUserEntitlementManagerPropertiesTest.java | 52 +
.../HighAvailabilityManagerFileBasedTest.java | 47 +
...ilabilityManagerInMemoryIntegrationTest.java | 96 ++
.../ha/HighAvailabilityManagerInMemoryTest.java | 145 +++
.../HighAvailabilityManagerSplitBrainTest.java | 474 ++++++++
.../ha/HighAvailabilityManagerTestFixture.java | 287 +++++
.../core/management/ha/HotStandbyTest.java | 667 +++++++++++
.../ha/ImmutableManagementPlaneSyncRecord.java | 57 +
...agementPlaneSyncRecordPersisterInMemory.java | 100 ++
.../core/management/ha/MasterChooserTest.java | 146 +++
.../ha/MutableManagementPlaneSyncRecord.java | 62 +
.../management/ha/TestEntityFailingRebind.java | 55 +
.../core/management/ha/WarmStandbyTest.java | 155 +++
.../management/internal/AccessManagerTest.java | 146 +++
.../internal/EntityExecutionManagerTest.java | 478 ++++++++
.../LocalManagementContextInstancesTest.java | 87 ++
.../internal/LocalManagementContextTest.java | 127 ++
.../internal/LocalSubscriptionManagerTest.java | 181 +++
.../core/management/osgi/OsgiPathTest.java | 105 ++
.../management/osgi/OsgiStandaloneTest.java | 259 ++++
.../core/management/osgi/OsgiTestResources.java | 74 ++
.../osgi/OsgiVersionMoreEntityTest.java | 459 ++++++++
.../PortForwardManagerLocationResolverTest.java | 2 +-
...regatingMachineProvisioningLocationTest.java | 3 +-
.../basic/ByonLocationResolverTest.java | 2 +-
...ixedListMachineProvisioningLocationTest.java | 2 +-
.../basic/HostLocationResolverTest.java | 2 +-
.../basic/LocalhostLocationResolverTest.java | 2 +-
...ocalhostMachineProvisioningLocationTest.java | 2 +-
.../LocalhostProvisioningAndAccessTest.java | 2 +-
.../location/basic/LocationPredicatesTest.java | 2 +-
.../location/basic/LocationRegistryTest.java | 2 +-
.../basic/MultiLocationResolverTest.java | 2 +-
.../location/basic/MultiLocationTest.java | 2 +-
.../SingleMachineLocationResolverTest.java | 2 +-
.../SingleMachineProvisioningLocationTest.java | 3 +-
.../SshMachineLocationReuseIntegrationTest.java | 2 +-
.../entity/LocalManagementContextForTests.java | 5 +-
...nMementoPersisterJcloudsObjectStoreTest.java | 2 +-
...tyToBlobStorePersistencePerformanceTest.java | 2 +-
...ailabilityManagerJcloudsObjectStoreTest.java | 4 +-
.../JcloudsBlobStoreBasedObjectStoreTest.java | 2 +-
.../jclouds/AbstractJcloudsLiveTest.java | 4 +-
.../jclouds/BailOutJcloudsLocation.java | 2 +-
.../jclouds/BrooklynMachinePoolLiveTest.java | 3 +-
.../JcloudsByonLocationResolverAwsLiveTest.java | 4 +-
...dsByonLocationResolverSoftlayerLiveTest.java | 2 +-
.../JcloudsByonLocationResolverTest.java | 2 +-
.../jclouds/JcloudsLocationMetadataTest.java | 3 +-
.../jclouds/JcloudsLocationResolverTest.java | 2 +-
.../location/jclouds/JcloudsLocationTest.java | 2 +-
.../jclouds/RebindJcloudsLocationLiveTest.java | 2 +-
.../provider/CarrenzaLocationLiveTest.groovy | 2 +-
.../zone/AwsAvailabilityZoneExtensionTest.java | 3 +-
.../entity/brooklyn/BrooklynMetricsImpl.java | 4 +-
.../enricher/DeltaEnrichersTests.groovy | 2 +-
.../entity/AbstractGoogleComputeLiveTest.java | 2 +-
.../entity/AbstractSoftlayerLiveTest.java | 2 +-
...SoftwareProcessSshDriverIntegrationTest.java | 2 +-
.../entity/java/VanillaJavaAppRebindTest.java | 4 +-
.../pool/ServerPoolLocationResolverTest.java | 2 +-
.../entity/pool/ServerPoolRebindTest.java | 2 +-
.../entity/software/AbstractDockerLiveTest.java | 2 +-
.../usage/ApplicationUsageTrackingTest.java | 7 +-
.../usage/LocationUsageTrackingTest.java | 5 +-
.../usage/RecordingLegacyUsageListener.java | 7 +-
.../usage/RecordingUsageListener.java | 7 +-
.../management/usage/UsageListenerTest.java | 8 +-
.../basic/WinRmMachineLocationLiveTest.java | 3 +-
.../mariadb/MariaDbIntegrationTest.java | 4 +-
.../postgresql/PostgreSqlIntegrationTest.java | 3 +-
.../rubyrep/RubyRepIntegrationTest.java | 3 +-
.../storm/StormAbstractCloudLiveTest.java | 2 +-
.../nosql/couchbase/CouchbaseOfflineTest.java | 3 +-
.../entity/dns/AbstractGeoDnsServiceTest.java | 2 +-
.../brooklyn/entity/proxy/UrlMappingTest.java | 2 +-
.../nginx/NginxRebindWithHaIntegrationTest.java | 2 +-
...namicWebAppClusterRebindIntegrationTest.java | 4 +-
...namicWebAppClusterRebindIntegrationTest.java | 3 +-
.../impl/hazelcast/HazelcastDataGrid.java | 2 +-
.../hazelcast/HazelcastDataGridFactory.java | 3 +-
.../impl/hazelcast/HazelcastStorageTest.java | 4 +-
.../app/SampleLocalhostIntegrationTest.java | 2 +-
.../brooklyn/sample/app/SampleUnitTest.java | 2 +-
.../BrooklynCampPlatformLauncherAbstract.java | 2 +-
.../BrooklynAssemblyTemplateInstantiator.java | 4 +-
.../BrooklynComponentTemplateResolver.java | 6 +-
.../spi/creation/BrooklynEntityMatcher.java | 2 +-
.../brooklyn/spi/dsl/methods/DslComponent.java | 2 +-
.../camp/brooklyn/ApplicationsYamlTest.java | 2 +-
.../camp/brooklyn/AbstractYamlRebindTest.java | 2 +-
.../camp/brooklyn/AbstractYamlTest.java | 2 +-
.../BrooklynYamlTypeInstantiatorTest.java | 2 +-
.../camp/brooklyn/DslAndRebindYamlTest.java | 2 +-
.../camp/brooklyn/EntitiesYamlTest.java | 2 +-
...aWebAppWithDslYamlRebindIntegrationTest.java | 2 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 2 +-
.../camp/brooklyn/ReferencedYamlTest.java | 2 +-
.../catalog/AbstractCatalogXmlTest.java | 4 +-
.../CatalogOsgiVersionMoreEntityTest.java | 2 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 4 +-
.../catalog/CatalogYamlLocationTest.java | 4 +-
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 2 +-
.../catalog/CatalogYamlTemplateTest.java | 6 +-
.../org/apache/brooklyn/cli/CloudExplorer.java | 2 +-
.../main/java/org/apache/brooklyn/cli/Main.java | 4 +-
.../brooklyn/launcher/BrooklynLauncher.java | 10 +-
.../brooklyn/launcher/BrooklynWebServer.java | 4 +-
.../camp/BrooklynCampPlatformLauncher.java | 4 +-
.../launcher/config/BrooklynGlobalConfig.java | 4 +-
.../BrooklynLauncherHighAvailabilityTest.java | 2 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 4 +-
.../launcher/BrooklynWebServerTest.java | 4 +-
.../brooklyn/launcher/WebAppRunnerTest.java | 5 +-
.../blueprints/AbstractBlueprintTest.java | 2 +-
.../org/apache/brooklyn/qa/load/LoadTest.java | 2 +-
.../ApplicationResourceIntegrationTest.java | 4 +-
.../rest/client/BrooklynApiRestClientTest.java | 4 +-
.../BrooklynPropertiesSecurityFilter.java | 4 +-
.../resources/AbstractBrooklynRestResource.java | 2 +-
.../brooklyn/rest/resources/AccessResource.java | 4 +-
.../rest/resources/ApplicationResource.java | 12 +-
.../rest/resources/CatalogResource.java | 4 +-
.../rest/resources/EffectorResource.java | 7 +-
.../rest/resources/EntityConfigResource.java | 2 +-
.../brooklyn/rest/resources/EntityResource.java | 8 +-
.../rest/resources/PolicyConfigResource.java | 2 +-
.../brooklyn/rest/resources/SensorResource.java | 2 +-
.../brooklyn/rest/resources/ServerResource.java | 4 +-
.../brooklyn/rest/resources/UsageResource.java | 10 +-
.../rest/transform/AccessTransformer.java | 2 +-
.../rest/util/BrooklynRestResourceUtils.java | 4 +-
.../rest/util/DefaultExceptionMapper.java | 4 +-
.../util/json/BrooklynJacksonJsonProvider.java | 2 +-
.../brooklyn/rest/BrooklynRestApiLauncher.java | 4 +-
.../BrooklynRestApiLauncherTestFixture.java | 2 +-
.../apache/brooklyn/rest/HaHotCheckTest.java | 6 +-
.../rest/resources/CatalogResourceTest.java | 2 +-
.../ServerResourceIntegrationTest.java | 4 +-
.../rest/resources/ServerResourceTest.java | 2 +-
.../rest/resources/UsageResourceTest.java | 6 +-
.../rest/testing/BrooklynRestApiTest.java | 6 +-
.../util/BrooklynRestResourceUtilsTest.java | 2 +-
.../brooklyn/test/BrooklynLeakListener.java | 2 +-
369 files changed, 16794 insertions(+), 16765 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/BrooklynVersion.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/BrooklynVersion.java b/core/src/main/java/brooklyn/BrooklynVersion.java
index f147303..dbc7869 100644
--- a/core/src/main/java/brooklyn/BrooklynVersion.java
+++ b/core/src/main/java/brooklyn/BrooklynVersion.java
@@ -44,8 +44,8 @@ import com.google.common.collect.Maps;
import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.management.classloading.OsgiBrooklynClassLoadingContext;
-import brooklyn.management.classloading.OsgiBrooklynClassLoadingContext;
import brooklyn.util.ResourceUtils;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.osgi.Osgis;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java b/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
index be49f7b..c990ed9 100644
--- a/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
+++ b/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
@@ -24,13 +24,13 @@ import java.util.Set;
import org.apache.brooklyn.api.basic.internal.ApiObjectsFactory;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.basic.AbstractEntity;
import brooklyn.entity.proxying.InternalFactory;
import brooklyn.entity.rebind.RebindManagerImpl;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.flags.SetFromFlag;
import brooklyn.util.text.Identifiers;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java b/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java
index 06cdd40..d02f1bd 100644
--- a/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java
+++ b/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java
@@ -22,12 +22,12 @@ import org.apache.brooklyn.api.entity.trait.Configurable;
import org.apache.brooklyn.api.entity.trait.Identifiable;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.Task;
+import org.apache.brooklyn.core.management.ManagementContextInjectable;
import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext;
import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
import brooklyn.config.ConfigMap;
-import brooklyn.management.ManagementContextInjectable;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.flags.SetFromFlag;
import brooklyn.util.text.Identifiers;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/catalog/CatalogPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/CatalogPredicates.java b/core/src/main/java/brooklyn/catalog/CatalogPredicates.java
index a873726..07dcbe0 100644
--- a/core/src/main/java/brooklyn/catalog/CatalogPredicates.java
+++ b/core/src/main/java/brooklyn/catalog/CatalogPredicates.java
@@ -30,9 +30,9 @@ import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
+import org.apache.brooklyn.core.management.entitlement.Entitlements;
import brooklyn.catalog.internal.CatalogUtils;
-import brooklyn.management.entitlement.Entitlements;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
index f129f4c..88474e7 100644
--- a/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
@@ -52,6 +52,7 @@ import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext;
import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import brooklyn.catalog.CatalogPredicates;
import brooklyn.catalog.internal.CatalogClasspathDo.CatalogScanningModes;
@@ -59,7 +60,6 @@ import brooklyn.config.BrooklynServerConfig;
import org.apache.brooklyn.location.basic.BasicLocationRegistry;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.collections.MutableList;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.collections.MutableSet;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/catalog/internal/CatalogClasspathDo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogClasspathDo.java b/core/src/main/java/brooklyn/catalog/internal/CatalogClasspathDo.java
index 3acd165..b81b439 100644
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogClasspathDo.java
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogClasspathDo.java
@@ -38,9 +38,9 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.policy.Policy;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import brooklyn.entity.basic.ApplicationBuilder;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.ResourceUtils;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.javalang.AggregateClassLoader;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java b/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java
index b6c62a7..25fabff 100644
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java
@@ -25,11 +25,11 @@ import java.util.List;
import java.util.Map;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.catalog.internal.CatalogClasspathDo.CatalogScanningModes;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.collections.MutableList;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.javalang.AggregateClassLoader;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/catalog/internal/CatalogInitialization.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogInitialization.java b/core/src/main/java/brooklyn/catalog/internal/CatalogInitialization.java
index 42d8688..07eac9b 100644
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogInitialization.java
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogInitialization.java
@@ -27,10 +27,10 @@ import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.ha.ManagementNodeState;
+import org.apache.brooklyn.core.management.ManagementContextInjectable;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import brooklyn.config.BrooklynServerConfig;
-import brooklyn.management.ManagementContextInjectable;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.ResourceUtils;
import brooklyn.util.collections.MutableList;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/catalog/internal/CatalogUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogUtils.java b/core/src/main/java/brooklyn/catalog/internal/CatalogUtils.java
index e8cd0d3..302e17c 100644
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogUtils.java
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogUtils.java
@@ -34,16 +34,16 @@ import org.apache.brooklyn.api.catalog.CatalogItem.CatalogBundle;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext;
+import org.apache.brooklyn.core.management.classloading.BrooklynClassLoadingContextSequential;
+import org.apache.brooklyn.core.management.classloading.JavaBrooklynClassLoadingContext;
+import org.apache.brooklyn.core.management.classloading.OsgiBrooklynClassLoadingContext;
+import org.apache.brooklyn.core.management.ha.OsgiManager;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import brooklyn.catalog.internal.BasicBrooklynCatalog.BrooklynLoaderTracker;
import brooklyn.config.BrooklynLogging;
import brooklyn.entity.basic.EntityInternal;
import brooklyn.entity.rebind.RebindManagerImpl.RebindTracker;
-import brooklyn.management.classloading.BrooklynClassLoadingContextSequential;
-import brooklyn.management.classloading.JavaBrooklynClassLoadingContext;
-import brooklyn.management.classloading.OsgiBrooklynClassLoadingContext;
-import brooklyn.management.ha.OsgiManager;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.guava.Maybe;
import brooklyn.util.text.Strings;
import brooklyn.util.time.Time;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/config/BrooklynServerPaths.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/BrooklynServerPaths.java b/core/src/main/java/brooklyn/config/BrooklynServerPaths.java
index f082496..a865d5b 100644
--- a/core/src/main/java/brooklyn/config/BrooklynServerPaths.java
+++ b/core/src/main/java/brooklyn/config/BrooklynServerPaths.java
@@ -24,11 +24,11 @@ import java.util.Map;
import javax.annotation.Nullable;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.guava.Maybe;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java b/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java
index 65ef309..79c2ef1 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java
@@ -24,13 +24,13 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic;
import brooklyn.entity.trait.StartableMethods;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.exceptions.RuntimeInterruptedException;
import brooklyn.util.text.Strings;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java b/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java
index 26ced4a..bf29732 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java
@@ -26,13 +26,13 @@ import org.apache.brooklyn.api.entity.Effector;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.ParameterType;
import org.apache.brooklyn.api.management.Task;
+import org.apache.brooklyn.core.management.internal.EffectorUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.effector.EffectorBase;
import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory;
import brooklyn.entity.effector.EffectorWithBody;
-import brooklyn.management.internal.EffectorUtils;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.task.DynamicSequentialTask;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
index 89a691e..dc005d8 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
@@ -53,6 +53,10 @@ import org.apache.brooklyn.api.policy.EnricherSpec;
import org.apache.brooklyn.api.policy.EntityAdjunct;
import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
+import org.apache.brooklyn.core.management.internal.EffectorUtils;
+import org.apache.brooklyn.core.management.internal.EntityManagementSupport;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.management.internal.SubscriptionTracker;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,10 +84,6 @@ import brooklyn.internal.storage.impl.BasicReference;
import org.apache.brooklyn.location.basic.Locations;
-import brooklyn.management.internal.EffectorUtils;
-import brooklyn.management.internal.EntityManagementSupport;
-import brooklyn.management.internal.ManagementContextInternal;
-import brooklyn.management.internal.SubscriptionTracker;
import brooklyn.policy.basic.AbstractEntityAdjunct;
import brooklyn.policy.basic.AbstractEntityAdjunct.AdjunctTagSupport;
import brooklyn.policy.basic.AbstractPolicy;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/AbstractGroupImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractGroupImpl.java b/core/src/main/java/brooklyn/entity/basic/AbstractGroupImpl.java
index 07287dc..79abdb0 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractGroupImpl.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractGroupImpl.java
@@ -28,11 +28,11 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.internal.BrooklynFeatureEnablement;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.collections.SetFromLiveMap;
import com.google.common.base.Optional;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java b/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java
index b614e0f..6032fff 100644
--- a/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java
+++ b/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java
@@ -26,11 +26,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.Task;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.trait.Startable;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.collections.MutableList;
import brooklyn.util.collections.MutableSet;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
index 2fe8d46..7ffe8a0 100644
--- a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
+++ b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
@@ -28,13 +28,13 @@ import org.apache.brooklyn.api.event.Sensor;
import org.apache.brooklyn.api.event.SensorEvent;
import org.apache.brooklyn.api.event.SensorEventListener;
import org.apache.brooklyn.api.management.Task;
+import org.apache.brooklyn.core.management.internal.CollectionChangeListener;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.BrooklynLogging;
import brooklyn.config.BrooklynLogging.LoggingLevel;
-import brooklyn.management.internal.CollectionChangeListener;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.GroovyJavaMethods;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.task.Tasks;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/Entities.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/Entities.java b/core/src/main/java/brooklyn/entity/basic/Entities.java
index 1f09903..c768726 100644
--- a/core/src/main/java/brooklyn/entity/basic/Entities.java
+++ b/core/src/main/java/brooklyn/entity/basic/Entities.java
@@ -59,6 +59,11 @@ import org.apache.brooklyn.api.management.TaskAdaptable;
import org.apache.brooklyn.api.management.TaskFactory;
import org.apache.brooklyn.api.policy.Enricher;
import org.apache.brooklyn.api.policy.Policy;
+import org.apache.brooklyn.core.management.internal.EffectorUtils;
+import org.apache.brooklyn.core.management.internal.EntityManagerInternal;
+import org.apache.brooklyn.core.management.internal.LocalManagementContext;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.management.internal.NonDeploymentManagementContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,11 +80,6 @@ import brooklyn.event.basic.DependentConfiguration;
import org.apache.brooklyn.location.basic.LocationInternal;
import org.apache.brooklyn.location.basic.Locations;
-import brooklyn.management.internal.EffectorUtils;
-import brooklyn.management.internal.EntityManagerInternal;
-import brooklyn.management.internal.LocalManagementContext;
-import brooklyn.management.internal.ManagementContextInternal;
-import brooklyn.management.internal.NonDeploymentManagementContext;
import brooklyn.util.ResourceUtils;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.config.ConfigBag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
index a735750..085079f 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
@@ -32,10 +32,10 @@ import org.apache.brooklyn.api.management.ExecutionContext;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.SubscriptionContext;
import org.apache.brooklyn.api.mementos.EntityMemento;
+import org.apache.brooklyn.core.management.internal.EntityManagementSupport;
import brooklyn.basic.BrooklynObjectInternal;
import brooklyn.config.ConfigKey;
-import brooklyn.management.internal.EntityManagementSupport;
import brooklyn.util.config.ConfigBag;
import com.google.common.annotations.Beta;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
index a25d17e..63b49b5 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
@@ -37,12 +37,12 @@ import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.mementos.EntityMemento;
import org.apache.brooklyn.api.policy.Enricher;
import org.apache.brooklyn.api.policy.Policy;
+import org.apache.brooklyn.core.management.internal.EntityManagementSupport;
import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
import brooklyn.entity.basic.EntityInternal.FeedSupport;
import brooklyn.entity.proxying.EntityProxyImpl;
-import brooklyn.management.internal.EntityManagementSupport;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.guava.Maybe;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/basic/MethodEffector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/MethodEffector.java b/core/src/main/java/brooklyn/entity/basic/MethodEffector.java
index 4d07344..121f70f 100644
--- a/core/src/main/java/brooklyn/entity/basic/MethodEffector.java
+++ b/core/src/main/java/brooklyn/entity/basic/MethodEffector.java
@@ -27,12 +27,12 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Effector;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.ParameterType;
+import org.apache.brooklyn.core.management.internal.EffectorUtils;
import org.codehaus.groovy.runtime.MethodClosure;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.annotation.EffectorParam;
-import brooklyn.management.internal.EffectorUtils;
import brooklyn.util.GroovyJavaMethods;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.flags.TypeCoercions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java b/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java
index b7ce04f..eef3cf9 100644
--- a/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java
+++ b/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java
@@ -23,14 +23,14 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Effector;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.core.management.internal.EntityManagementUtils;
+import org.apache.brooklyn.core.management.internal.EntityManagementUtils.CreationResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.effector.Effectors.EffectorBuilder;
-import brooklyn.management.internal.EntityManagementUtils;
-import brooklyn.management.internal.EntityManagementUtils.CreationResult;
import brooklyn.util.config.ConfigBag;
import com.google.common.annotations.Beta;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java b/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java
index e7657ea..6094686 100644
--- a/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java
+++ b/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java
@@ -27,16 +27,18 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.ParameterType;
import org.apache.brooklyn.api.management.Task;
import org.apache.brooklyn.api.management.TaskAdaptable;
+import org.apache.brooklyn.core.management.internal.EffectorUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.BrooklynTaskTags;
import brooklyn.entity.basic.ConfigKeys;
+
import org.apache.brooklyn.location.basic.Machines;
import org.apache.brooklyn.location.basic.SshMachineLocation;
import org.apache.brooklyn.location.basic.WinRmMachineLocation;
-import brooklyn.management.internal.EffectorUtils;
+
import brooklyn.util.config.ConfigBag;
import brooklyn.util.javalang.Reflections;
import brooklyn.util.task.DynamicSequentialTask;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java b/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java
index 1eccb92..647ad76 100644
--- a/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java
+++ b/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java
@@ -33,6 +33,9 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.TaskAdaptable;
+import org.apache.brooklyn.core.management.internal.EffectorUtils;
+import org.apache.brooklyn.core.management.internal.EntityManagerInternal;
+import org.apache.brooklyn.core.management.internal.ManagementTransitionMode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,9 +45,6 @@ import brooklyn.entity.basic.EntityTransientCopyInternal;
import brooklyn.entity.basic.EntityTransientCopyInternal.SpecialEntityTransientCopyInternal;
import brooklyn.entity.effector.EffectorWithBody;
import brooklyn.entity.rebind.RebindManagerImpl.RebindTracker;
-import brooklyn.management.internal.EffectorUtils;
-import brooklyn.management.internal.EntityManagerInternal;
-import brooklyn.management.internal.ManagementTransitionMode;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.task.DynamicTasks;
import brooklyn.util.task.TaskTags;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java
index 42c532f..c2a4bfd 100644
--- a/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java
+++ b/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java
@@ -36,6 +36,7 @@ import org.apache.brooklyn.api.policy.Enricher;
import org.apache.brooklyn.api.policy.EnricherSpec;
import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +46,6 @@ import brooklyn.entity.basic.AbstractEntity;
import brooklyn.entity.basic.BrooklynTaskTags;
import brooklyn.entity.basic.Entities;
import brooklyn.entity.basic.EntityInternal;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.policy.basic.AbstractPolicy;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.collections.MutableSet;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java
index 3b77526..8517664 100644
--- a/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java
+++ b/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java
@@ -23,7 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.lang.reflect.InvocationTargetException;
import java.util.Map;
-import brooklyn.management.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
+
import brooklyn.util.collections.MutableMap;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.javalang.Reflections;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
index 58c7dfc..10338b8 100644
--- a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
+++ b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
@@ -25,14 +25,14 @@ import java.util.Map.Entry;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.management.internal.LocalLocationManager;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import brooklyn.config.ConfigKey;
import org.apache.brooklyn.location.basic.AbstractLocation;
import org.apache.brooklyn.location.basic.LocationInternal;
-import brooklyn.management.internal.LocalLocationManager;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.flags.FlagUtils;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java
index 52fd7ba..aeb371c 100644
--- a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java
+++ b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java
@@ -26,11 +26,11 @@ import org.apache.brooklyn.api.policy.Enricher;
import org.apache.brooklyn.api.policy.EnricherSpec;
import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import brooklyn.config.ConfigKey;
import brooklyn.enricher.basic.AbstractEnricher;
import brooklyn.entity.basic.AbstractEntity;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.policy.basic.AbstractPolicy;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.config.ConfigBag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java
index f9e42b3..8c5eed2 100644
--- a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java
+++ b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java
@@ -26,16 +26,16 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler;
import org.apache.brooklyn.api.management.ha.ManagementNodeState;
import org.apache.brooklyn.api.mementos.BrooklynMementoPersister;
+import org.apache.brooklyn.core.management.internal.BrooklynObjectManagementMode;
+import org.apache.brooklyn.core.management.internal.EntityManagerInternal;
+import org.apache.brooklyn.core.management.internal.LocationManagerInternal;
+import org.apache.brooklyn.core.management.internal.ManagementTransitionMode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.BrooklynLogging;
import brooklyn.entity.basic.EntityInternal;
import brooklyn.entity.rebind.persister.PersistenceActivityMetrics;
-import brooklyn.management.internal.BrooklynObjectManagementMode;
-import brooklyn.management.internal.EntityManagerInternal;
-import brooklyn.management.internal.LocationManagerInternal;
-import brooklyn.management.internal.ManagementTransitionMode;
import brooklyn.util.text.Strings;
import com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
index 9051242..30803e2 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
@@ -64,6 +64,12 @@ import org.apache.brooklyn.api.mementos.TreeNode;
import org.apache.brooklyn.api.mementos.BrooklynMementoManifest.EntityMementoManifest;
import org.apache.brooklyn.api.policy.Enricher;
import org.apache.brooklyn.api.policy.Policy;
+import org.apache.brooklyn.core.management.internal.BrooklynObjectManagementMode;
+import org.apache.brooklyn.core.management.internal.BrooklynObjectManagerInternal;
+import org.apache.brooklyn.core.management.internal.EntityManagerInternal;
+import org.apache.brooklyn.core.management.internal.LocationManagerInternal;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.management.internal.ManagementTransitionMode;
import brooklyn.catalog.internal.CatalogInitialization;
import brooklyn.catalog.internal.CatalogUtils;
@@ -85,12 +91,6 @@ import brooklyn.internal.BrooklynFeatureEnablement;
import org.apache.brooklyn.location.basic.AbstractLocation;
import org.apache.brooklyn.location.basic.LocationInternal;
-import brooklyn.management.internal.BrooklynObjectManagementMode;
-import brooklyn.management.internal.BrooklynObjectManagerInternal;
-import brooklyn.management.internal.EntityManagerInternal;
-import brooklyn.management.internal.LocationManagerInternal;
-import brooklyn.management.internal.ManagementContextInternal;
-import brooklyn.management.internal.ManagementTransitionMode;
import brooklyn.policy.basic.AbstractPolicy;
import brooklyn.util.collections.MutableList;
import brooklyn.util.collections.MutableMap;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
index 25a396b..8221472 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
@@ -43,6 +43,8 @@ import org.apache.brooklyn.api.management.ha.MementoCopyMode;
import org.apache.brooklyn.api.mementos.BrooklynMementoPersister;
import org.apache.brooklyn.api.mementos.BrooklynMementoRawData;
import org.apache.brooklyn.api.mementos.TreeNode;
+import org.apache.brooklyn.core.management.ha.HighAvailabilityManagerImpl;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,8 +59,6 @@ import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils.CreateBackupMod
import brooklyn.entity.rebind.persister.PersistenceActivityMetrics;
import brooklyn.entity.rebind.transformer.CompoundTransformer;
import brooklyn.internal.BrooklynFeatureEnablement;
-import brooklyn.management.ha.HighAvailabilityManagerImpl;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.collections.MutableList;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.collections.QuorumCheck;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java
index 9495988..be51b44 100644
--- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java
+++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java
@@ -48,6 +48,7 @@ import org.apache.brooklyn.api.mementos.BrooklynMementoPersister;
import org.apache.brooklyn.api.mementos.BrooklynMementoRawData;
import org.apache.brooklyn.api.mementos.CatalogItemMemento;
import org.apache.brooklyn.api.mementos.Memento;
+import org.apache.brooklyn.core.management.classloading.ClassLoaderFromBrooklynClassLoadingContext;
import brooklyn.catalog.internal.CatalogUtils;
import brooklyn.config.ConfigKey;
@@ -59,7 +60,6 @@ import brooklyn.entity.rebind.dto.BrooklynMementoImpl;
import brooklyn.entity.rebind.dto.BrooklynMementoManifestImpl;
import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessor;
import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessorWithLock;
-import brooklyn.management.classloading.ClassLoaderFromBrooklynClassLoadingContext;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.exceptions.CompoundRuntimeException;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java
index a171d18..68074e9 100644
--- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java
+++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java
@@ -42,6 +42,9 @@ import org.apache.brooklyn.api.mementos.BrooklynMementoRawData;
import org.apache.brooklyn.api.mementos.Memento;
import org.apache.brooklyn.api.policy.Enricher;
import org.apache.brooklyn.api.policy.Policy;
+import org.apache.brooklyn.core.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore;
+import org.apache.brooklyn.core.management.internal.LocalLocationManager;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import brooklyn.config.BrooklynServerConfig;
import brooklyn.config.BrooklynServerPaths;
@@ -53,9 +56,6 @@ import brooklyn.entity.rebind.transformer.CompoundTransformerLoader;
import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation;
-import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore;
-import brooklyn.management.internal.LocalLocationManager;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.ResourceUtils;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.text.Strings;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java
index 82c9c7a..fe5a677 100644
--- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java
+++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java
@@ -42,6 +42,9 @@ import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingConte
import org.apache.brooklyn.api.mementos.BrooklynMementoPersister.LookupContext;
import org.apache.brooklyn.api.policy.Enricher;
import org.apache.brooklyn.api.policy.Policy;
+import org.apache.brooklyn.core.management.classloading.BrooklynClassLoadingContextSequential;
+import org.apache.brooklyn.core.management.classloading.ClassLoaderFromBrooklynClassLoadingContext;
+import org.apache.brooklyn.core.management.classloading.JavaBrooklynClassLoadingContext;
import brooklyn.catalog.internal.CatalogBundleDto;
import brooklyn.catalog.internal.CatalogUtils;
@@ -58,9 +61,6 @@ import brooklyn.entity.rebind.dto.BasicPolicyMemento;
import brooklyn.entity.rebind.dto.MutableBrooklynMemento;
import brooklyn.event.basic.BasicAttributeSensor;
import brooklyn.event.basic.BasicConfigKey;
-import brooklyn.management.classloading.BrooklynClassLoadingContextSequential;
-import brooklyn.management.classloading.ClassLoaderFromBrooklynClassLoadingContext;
-import brooklyn.management.classloading.JavaBrooklynClassLoadingContext;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.text.Strings;
import brooklyn.util.xstream.XmlSerializer;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java
index d5e46cf..0a57b62 100644
--- a/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java
+++ b/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java
@@ -20,12 +20,12 @@ package brooklyn.event.basic;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.EntityInternal;
-import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.text.TemplateProcessor;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/internal/storage/DataGridFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/internal/storage/DataGridFactory.java b/core/src/main/java/brooklyn/internal/storage/DataGridFactory.java
index 8513ebb..d5264c1 100644
--- a/core/src/main/java/brooklyn/internal/storage/DataGridFactory.java
+++ b/core/src/main/java/brooklyn/internal/storage/DataGridFactory.java
@@ -18,13 +18,13 @@
*/
package brooklyn.internal.storage;
-import brooklyn.management.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
/**
* A factory for creating a {@link DataGrid}.
*
* Implementations of this interface should have a public no arg constructor; this constructor will be
- * called through reflection in the {@link brooklyn.management.internal.LocalManagementContext}.
+ * called through reflection in the {@link org.apache.brooklyn.core.management.internal.LocalManagementContext}.
*/
public interface DataGridFactory {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/internal/storage/impl/inmemory/InMemoryDataGridFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/internal/storage/impl/inmemory/InMemoryDataGridFactory.java b/core/src/main/java/brooklyn/internal/storage/impl/inmemory/InMemoryDataGridFactory.java
index 9be9134..4f0fbac 100644
--- a/core/src/main/java/brooklyn/internal/storage/impl/inmemory/InMemoryDataGridFactory.java
+++ b/core/src/main/java/brooklyn/internal/storage/impl/inmemory/InMemoryDataGridFactory.java
@@ -18,9 +18,10 @@
*/
package brooklyn.internal.storage.impl.inmemory;
+import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
+
import brooklyn.internal.storage.DataGrid;
import brooklyn.internal.storage.DataGridFactory;
-import brooklyn.management.internal.ManagementContextInternal;
public class InMemoryDataGridFactory implements DataGridFactory {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/management/ManagementContextInjectable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/ManagementContextInjectable.java b/core/src/main/java/brooklyn/management/ManagementContextInjectable.java
deleted file mode 100644
index 772dee3..0000000
--- a/core/src/main/java/brooklyn/management/ManagementContextInjectable.java
+++ /dev/null
@@ -1,33 +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.management;
-
-import org.apache.brooklyn.api.management.ManagementContext;
-
-/**
- * Provides a way for the {@link ManagementContext} to be injected directly.
- */
-public interface ManagementContextInjectable {
-
- /**
- * Sets the {@link ManagementContext} reference.
- */
- public void injectManagementContext(ManagementContext managementContext);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java
deleted file mode 100644
index fc975eb..0000000
--- a/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package brooklyn.management.classloading;
-
-import javax.annotation.Nullable;
-
-import org.apache.brooklyn.api.management.ManagementContext;
-import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext;
-
-import brooklyn.util.guava.Maybe;
-
-import com.google.common.base.Objects;
-
-/*
- * 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.
- */
-public abstract class AbstractBrooklynClassLoadingContext implements BrooklynClassLoadingContext {
-
- protected final ManagementContext mgmt;
-
- public AbstractBrooklynClassLoadingContext(ManagementContext mgmt) {
- this.mgmt = mgmt;
- }
-
- @Override
- public ManagementContext getManagementContext() {
- return mgmt;
- }
-
- @Override
- public Class<?> loadClass(String className) {
- return tryLoadClass(className).get();
- }
-
- @Override
- // this is the only one left for subclasses
- public abstract Maybe<Class<?>> tryLoadClass(String className);
-
- @Override
- public <T> Class<? extends T> loadClass(String className, @Nullable Class<T> supertype) {
- return tryLoadClass(className, supertype).get();
- }
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- public <T> Maybe<Class<? extends T>> tryLoadClass(String className, @Nullable Class<T> supertype) {
- Maybe<Class<?>> result = tryLoadClass(className);
- if (result.isAbsent()) return (Maybe)result;
- Class<?> clazz = result.get();
- if (supertype==null || supertype.isAssignableFrom(clazz)) return (Maybe)result;
- throw new ClassCastException(className+" is not an instance of "+supertype);
- }
-
- @Override
- public abstract String toString();
-
- @Override
- public int hashCode() {
- return Objects.hashCode(mgmt);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof BrooklynClassLoadingContext)) return false;
- if (!Objects.equal(mgmt, ((BrooklynClassLoadingContext)obj).getManagementContext())) return false;
- return true;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java b/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java
deleted file mode 100644
index a1270bc..0000000
--- a/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java
+++ /dev/null
@@ -1,136 +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.management.classloading;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.brooklyn.api.management.ManagementContext;
-import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import brooklyn.util.collections.MutableList;
-import brooklyn.util.collections.MutableSet;
-import brooklyn.util.exceptions.Exceptions;
-import brooklyn.util.guava.Maybe;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-public final class BrooklynClassLoadingContextSequential extends AbstractBrooklynClassLoadingContext {
-
- private static final Logger log = LoggerFactory.getLogger(BrooklynClassLoadingContextSequential.class);
-
- private final List<BrooklynClassLoadingContext> primaries = MutableList.<BrooklynClassLoadingContext>of();
- // secondaries used to put java classloader last
- private final Set<BrooklynClassLoadingContext> secondaries = MutableSet.<BrooklynClassLoadingContext>of();
-
- public BrooklynClassLoadingContextSequential(ManagementContext mgmt, BrooklynClassLoadingContext ...targets) {
- super(mgmt);
- for (BrooklynClassLoadingContext target: targets)
- add(target);
- }
-
- public void add(BrooklynClassLoadingContext target) {
- if (target instanceof BrooklynClassLoadingContextSequential) {
- for (BrooklynClassLoadingContext targetN: ((BrooklynClassLoadingContextSequential)target).primaries )
- add(targetN);
- for (BrooklynClassLoadingContext targetN: ((BrooklynClassLoadingContextSequential)target).secondaries )
- addSecondary(targetN);
- } else {
- this.primaries.add( target );
- }
- }
-
- public void addSecondary(BrooklynClassLoadingContext target) {
- if (!(target instanceof JavaBrooklynClassLoadingContext)) {
- // support for legacy catalog classloader only
- log.warn("Only Java classloaders should be secondary");
- }
- this.secondaries.add( target );
- }
-
- public Maybe<Class<?>> tryLoadClass(String className) {
- List<Throwable> errors = MutableList.of();
- for (BrooklynClassLoadingContext target: primaries) {
- Maybe<Class<?>> clazz = target.tryLoadClass(className);
- if (clazz.isPresent())
- return clazz;
- errors.add( ((Maybe.Absent<?>)clazz).getException() );
- }
- boolean noPrimaryErrors = errors.isEmpty();
- for (BrooklynClassLoadingContext target: secondaries) {
- Maybe<Class<?>> clazz = target.tryLoadClass(className);
- if (clazz.isPresent())
- return clazz;
- if (noPrimaryErrors)
- errors.add( ((Maybe.Absent<?>)clazz).getException() );
- }
-
- return Maybe.absent(Exceptions.create("Unable to load "+className+" from "+primaries, errors));
- }
-
- @Override
- public URL getResource(String resourceInThatDir) {
- for (BrooklynClassLoadingContext target: primaries) {
- URL result = target.getResource(resourceInThatDir);
- if (result!=null) return result;
- }
- for (BrooklynClassLoadingContext target: secondaries) {
- URL result = target.getResource(resourceInThatDir);
- if (result!=null) return result;
- }
- return null;
- }
-
- @Override
- public Iterable<URL> getResources(String name) {
- List<Iterable<URL>> resources = Lists.newArrayList();
- for (BrooklynClassLoadingContext target : primaries) {
- resources.add(target.getResources(name));
- }
- for (BrooklynClassLoadingContext target : secondaries) {
- resources.add(target.getResources(name));
- }
- return Iterables.concat(resources);
- }
-
- @Override
- public String toString() {
- return "classload:"+primaries+";"+secondaries;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), primaries, secondaries);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (!super.equals(obj)) return false;
- if (!(obj instanceof BrooklynClassLoadingContextSequential)) return false;
- if (!Objects.equal(primaries, ((BrooklynClassLoadingContextSequential)obj).primaries)) return false;
- if (!Objects.equal(secondaries, ((BrooklynClassLoadingContextSequential)obj).secondaries)) return false;
- return true;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java
deleted file mode 100644
index 104b3a1..0000000
--- a/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java
+++ /dev/null
@@ -1,66 +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.management.classloading;
-
-import java.net.URL;
-
-import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext;
-
-public class ClassLoaderFromBrooklynClassLoadingContext extends ClassLoader {
-
- /** Constructs a {@link ClassLoader} which delegates to the given {@link BrooklynClassLoadingContext} */
- public static ClassLoader of(BrooklynClassLoadingContext clc) {
- return new ClassLoaderFromBrooklynClassLoadingContext(clc);
- }
-
- protected final BrooklynClassLoadingContext clc;
-
- protected ClassLoaderFromBrooklynClassLoadingContext(BrooklynClassLoadingContext clc) {
- this.clc = clc;
- }
-
- @Override
- public Class<?> findClass(String className) throws ClassNotFoundException {
- Class<?> result = clc.loadClass(className);
- if (result!=null) return result;
-
- // last resort. see comment in XStream CompositeClassLoader
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- if (contextClassLoader != null) {
- result = contextClassLoader.loadClass(className);
- if (result!=null) return result;
- }
- return null;
- }
-
- @Override
- protected URL findResource(String name) {
- URL result = clc.getResource(name);
- if (result!=null) return result;
-
- // last resort. see comment in XStream CompositeClassLoader
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- if (contextClassLoader != null) {
- result = contextClassLoader.getResource(name);
- if (result!=null) return result;
- }
- return null;
- }
-
-}