brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [67/72] [abbrv] incubator-brooklyn git commit: BROOKLYN-162 - jclouds last few package prefixes needed, and tidy in core and elsewhere related (or observed in the process)
Date Wed, 19 Aug 2015 11:10:25 GMT
BROOKLYN-162 - jclouds last few package prefixes needed, and tidy in core and elsewhere related (or observed in the process)


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a1ad34d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a1ad34d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a1ad34d7

Branch: refs/heads/master
Commit: a1ad34d718e37bbab7108956a2f3f9959be68000
Parents: 64c2b2e
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Aug 18 22:38:46 2015 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Aug 19 00:52:55 2015 +0100

----------------------------------------------------------------------
 .../brooklyn/core/catalog/CatalogLoadMode.java  |    2 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |    2 +-
 .../core/internal/BrooklynInitialization.java   |    2 +-
 .../mgmt/ha/HighAvailabilityManagerImpl.java    |   14 +-
 ...ntPlaneSyncRecordPersisterToObjectStore.java |   18 +-
 .../ha/dto/BasicManagementNodeSyncRecord.java   |  194 ++++
 .../ha/dto/ManagementPlaneSyncRecordImpl.java   |   99 ++
 .../internal/AbstractManagementContext.java     |    2 +-
 .../mgmt/internal/LocalLocationManager.java     |    4 +-
 .../core/mgmt/internal/LocalUsageManager.java   |    6 +-
 .../BrooklynMementoPersisterToObjectStore.java  |  697 ++++++++++++
 .../mgmt/persist/BrooklynPersistenceUtils.java  |  269 +++++
 .../persist/CatalogItemLibrariesConverter.java  |   68 ++
 .../core/mgmt/persist/FileBasedObjectStore.java |  425 +++++++
 .../persist/FileBasedStoreObjectAccessor.java   |  132 +++
 .../mgmt/persist/LocationWithObjectStore.java   |   27 +
 .../core/mgmt/persist/MementoSerializer.java    |   52 +
 .../brooklyn/core/mgmt/persist/PersistMode.java |   26 +
 .../persist/PersistenceActivityMetrics.java     |   83 ++
 .../mgmt/persist/PersistenceObjectStore.java    |  142 +++
 .../mgmt/persist/RetryingMementoSerializer.java |   95 ++
 .../persist/StoreObjectAccessorLocking.java     |  218 ++++
 .../core/mgmt/persist/XmlMementoSerializer.java |  505 +++++++++
 .../rebind/ActivePartialRebindIteration.java    |    4 +-
 .../mgmt/rebind/BasicLocationRebindSupport.java |    2 +-
 .../rebind/ImmediateDeltaChangeListener.java    |    2 +-
 .../mgmt/rebind/InitialFullRebindIteration.java |    2 +-
 .../rebind/PeriodicDeltaChangeListener.java     |    4 +-
 .../core/mgmt/rebind/RebindIteration.java       |    6 +-
 .../core/mgmt/rebind/RebindManagerImpl.java     |    8 +-
 .../mgmt/rebind/dto/MementosGenerators.java     |    4 +-
 .../BrooklynMementoPersisterToObjectStore.java  |  697 ------------
 .../persister/BrooklynPersistenceUtils.java     |  269 -----
 .../CatalogItemLibrariesConverter.java          |   68 --
 .../rebind/persister/FileBasedObjectStore.java  |  425 -------
 .../persister/FileBasedStoreObjectAccessor.java |  132 ---
 .../persister/LocationWithObjectStore.java      |   27 -
 .../rebind/persister/MementoSerializer.java     |   52 -
 .../core/mgmt/rebind/persister/PersistMode.java |   26 -
 .../persister/PersistenceActivityMetrics.java   |   83 --
 .../persister/PersistenceObjectStore.java       |  142 ---
 .../persister/RetryingMementoSerializer.java    |   95 --
 .../persister/StoreObjectAccessorLocking.java   |  218 ----
 .../rebind/persister/XmlMementoSerializer.java  |  505 ---------
 .../dto/BasicManagementNodeSyncRecord.java      |  194 ----
 .../dto/ManagementPlaneSyncRecordImpl.java      |   99 --
 .../rebind/transformer/CompoundTransformer.java |    2 +-
 .../objs/proxy/InternalLocationFactory.java     |    4 +-
 .../brooklyn/effector/core/EffectorTasks.java   |    6 +-
 .../brooklyn/entity/core/AbstractEntity.java    |    2 +-
 .../apache/brooklyn/entity/core/Entities.java   |    4 +-
 .../brooklyn/entity/core/EntitySuppliers.java   |    4 +-
 .../drivers/ReflectiveEntityDriverFactory.java  |    4 +-
 .../entity/group/DynamicClusterImpl.java        |    2 +-
 .../brooklyn/entity/stock/BasicStartable.java   |    2 +-
 .../entity/stock/BasicStartableImpl.java        |    2 +-
 .../location/access/BrooklynAccessUtils.java    |    6 +-
 .../location/access/PortForwardManagerImpl.java |    2 +-
 .../PortForwardManagerLocationResolver.java     |    8 +-
 .../location/basic/AbstractLocation.java        |  707 ------------
 .../basic/AbstractLocationResolver.java         |  188 ----
 .../AggregatingMachineProvisioningLocation.java |  139 ---
 .../location/basic/BasicHardwareDetails.java    |   56 -
 .../location/basic/BasicLocationDefinition.java |   85 --
 .../location/basic/BasicLocationRegistry.java   |  479 --------
 .../location/basic/BasicMachineDetails.java     |  180 ---
 .../location/basic/BasicMachineMetadata.java    |   84 --
 .../brooklyn/location/basic/BasicOsDetails.java |  123 ---
 .../location/basic/ByonLocationResolver.java    |  250 -----
 .../location/basic/CatalogLocationResolver.java |   79 --
 .../basic/DefinedLocationByIdResolver.java      |   74 --
 .../basic/DeprecatedKeysMappingBuilder.java     |   66 --
 .../FixedListMachineProvisioningLocation.java   |  474 --------
 .../location/basic/HasSubnetHostname.java       |   32 -
 .../location/basic/HostLocationResolver.java    |   90 --
 .../basic/LocalhostLocationResolver.java        |   74 --
 .../LocalhostMachineProvisioningLocation.java   |  346 ------
 ...calhostPropertiesFromBrooklynProperties.java |   56 -
 .../location/basic/LocationConfigKeys.java      |   79 --
 .../location/basic/LocationConfigUtils.java     |  558 ----------
 .../location/basic/LocationDynamicType.java     |   39 -
 .../location/basic/LocationInternal.java        |   93 --
 .../location/basic/LocationPredicates.java      |  108 --
 ...ocationPropertiesFromBrooklynProperties.java |  223 ----
 .../location/basic/LocationTypeSnapshot.java    |   40 -
 .../brooklyn/location/basic/Locations.java      |  158 ---
 .../brooklyn/location/basic/Machines.java       |  188 ----
 .../brooklyn/location/basic/MultiLocation.java  |  166 ---
 .../location/basic/MultiLocationResolver.java   |  145 ---
 .../location/basic/NamedLocationResolver.java   |   96 --
 .../brooklyn/location/basic/PortRanges.java     |  257 -----
 .../basic/RegistryLocationResolver.java         |   42 -
 .../basic/SingleMachineLocationResolver.java    |   77 --
 .../SingleMachineProvisioningLocation.java      |   91 --
 .../location/basic/SshMachineLocation.java      | 1032 -----------------
 .../location/basic/SupportsPortForwarding.java  |   39 -
 .../location/basic/WinRmMachineLocation.java    |  361 ------
 .../location/byon/ByonLocationResolver.java     |  253 +++++
 .../FixedListMachineProvisioningLocation.java   |  476 ++++++++
 .../location/byon/HostLocationResolver.java     |   93 ++
 .../byon/SingleMachineLocationResolver.java     |   81 ++
 .../byon/SingleMachineProvisioningLocation.java |   91 ++
 ...bstractCloudMachineProvisioningLocation.java |    2 +-
 .../cloud/AvailabilityZoneExtension.java        |    2 +-
 .../location/cloud/CloudLocationConfig.java     |    2 +-
 .../location/core/AbstractLocation.java         |  709 ++++++++++++
 .../location/core/AbstractLocationResolver.java |  188 ++++
 .../AggregatingMachineProvisioningLocation.java |  141 +++
 .../location/core/BasicHardwareDetails.java     |   56 +
 .../location/core/BasicLocationDefinition.java  |   85 ++
 .../location/core/BasicLocationRegistry.java    |  489 +++++++++
 .../location/core/BasicMachineDetails.java      |  183 ++++
 .../location/core/BasicMachineMetadata.java     |   84 ++
 .../brooklyn/location/core/BasicOsDetails.java  |  123 +++
 .../location/core/CatalogLocationResolver.java  |   79 ++
 .../core/DefinedLocationByIdResolver.java       |   74 ++
 .../core/DeprecatedKeysMappingBuilder.java      |   66 ++
 .../location/core/HasSubnetHostname.java        |   32 +
 .../location/core/LocationConfigKeys.java       |   79 ++
 .../location/core/LocationConfigUtils.java      |  559 ++++++++++
 .../location/core/LocationPredicates.java       |  108 ++
 ...ocationPropertiesFromBrooklynProperties.java |  223 ++++
 .../brooklyn/location/core/Locations.java       |  160 +++
 .../apache/brooklyn/location/core/Machines.java |  191 ++++
 .../brooklyn/location/core/MultiLocation.java   |  166 +++
 .../location/core/MultiLocationResolver.java    |  145 +++
 .../location/core/NamedLocationResolver.java    |   97 ++
 .../brooklyn/location/core/PortRanges.java      |  257 +++++
 .../location/core/RegistryLocationResolver.java |   42 +
 .../location/core/SupportsPortForwarding.java   |   39 +
 .../core/internal/LocationDynamicType.java      |   40 +
 .../core/internal/LocationInternal.java         |   93 ++
 .../core/internal/LocationTypeSnapshot.java     |   40 +
 .../brooklyn/location/geo/HostGeoInfo.java      |    4 +-
 .../localhost/LocalhostLocationResolver.java    |   76 ++
 .../LocalhostMachineProvisioningLocation.java   |  352 ++++++
 ...calhostPropertiesFromBrooklynProperties.java |   57 +
 .../location/ssh/SshMachineLocation.java        | 1037 ++++++++++++++++++
 .../winrm/AdvertiseWinrmLoginPolicy.java        |   80 ++
 .../location/winrm/WinRmMachineLocation.java    |  362 ++++++
 .../brooklyn/sensor/core/HttpRequestSensor.java |    3 -
 .../core/PortAttributeSensorAndConfigKey.java   |    2 +-
 .../brooklyn/sensor/feed/ssh/SshFeed.java       |    6 +-
 .../brooklyn/sensor/feed/ssh/SshPollValue.java  |    2 +-
 .../windows/WindowsPerformanceCounterFeed.java  |    2 +-
 .../brooklyn/util/core/ResourceUtils.java       |    2 +-
 .../brooklyn/util/core/file/ArchiveTasks.java   |    2 +-
 .../brooklyn/util/core/file/ArchiveUtils.java   |    2 +-
 .../util/core/task/ssh/SshFetchTaskFactory.java |    2 +-
 .../util/core/task/ssh/SshFetchTaskWrapper.java |    2 +-
 .../util/core/task/ssh/SshPutTaskFactory.java   |    2 +-
 .../util/core/task/ssh/SshPutTaskStub.java      |    2 +-
 .../brooklyn/util/core/task/ssh/SshTasks.java   |    6 +-
 .../internal/AbstractSshExecTaskFactory.java    |    2 +-
 .../ssh/internal/PlainSshExecTaskFactory.java   |    2 +-
 .../core/task/system/ProcessTaskFactory.java    |    2 +-
 .../util/core/task/system/ProcessTaskStub.java  |    2 +-
 .../internal/AbstractProcessTaskFactory.java    |    2 +-
 .../system/internal/ExecWithLoggingHelpers.java |    2 +-
 .../internal/SystemProcessTaskFactory.java      |    2 +-
 ...pache.brooklyn.api.location.LocationResolver |   16 +-
 ...apListAndOtherStructuredConfigKeyTest.groovy |    2 +-
 .../HighAvailabilityManagerFileBasedTest.java   |    2 +-
 ...ilabilityManagerInMemoryIntegrationTest.java |    4 +-
 .../ha/HighAvailabilityManagerInMemoryTest.java |    8 +-
 .../HighAvailabilityManagerSplitBrainTest.java  |   10 +-
 .../ha/HighAvailabilityManagerTestFixture.java  |   10 +-
 .../brooklyn/core/mgmt/ha/HotStandbyTest.java   |   12 +-
 ...agementPlaneSyncRecordPersisterInMemory.java |    2 +-
 .../core/mgmt/ha/MasterChooserTest.java         |    2 +-
 .../brooklyn/core/mgmt/ha/WarmStandbyTest.java  |   10 +-
 .../core/mgmt/internal/AccessManagerTest.java   |    2 +-
 .../BrooklynMementoPersisterFileBasedTest.java  |   55 +
 ...ntoPersisterInMemorySizeIntegrationTest.java |  106 ++
 .../BrooklynMementoPersisterInMemoryTest.java   |   33 +
 .../BrooklynMementoPersisterTestFixture.java    |  165 +++
 .../mgmt/persist/FileBasedObjectStoreTest.java  |  101 ++
 .../FileBasedStoreObjectAccessorWriterTest.java |   65 ++
 .../core/mgmt/persist/InMemoryObjectStore.java  |  170 +++
 .../InMemoryStoreObjectAccessorWriterTest.java  |   36 +
 .../core/mgmt/persist/ListeningObjectStore.java |  254 +++++
 ...nceStoreObjectAccessorWriterTestFixture.java |  136 +++
 .../mgmt/persist/XmlMementoSerializerTest.java  |  455 ++++++++
 .../core/mgmt/rebind/RebindCatalogItemTest.java |    2 +-
 .../core/mgmt/rebind/RebindEnricherTest.java    |    2 +-
 .../core/mgmt/rebind/RebindEntityTest.java      |    2 +-
 .../core/mgmt/rebind/RebindFeedTest.java        |    4 +-
 .../rebind/RebindLocalhostLocationTest.java     |    4 +-
 .../core/mgmt/rebind/RebindLocationTest.java    |    2 +-
 .../core/mgmt/rebind/RebindOptions.java         |    2 +-
 .../core/mgmt/rebind/RebindPolicyTest.java      |    2 +-
 .../rebind/RebindSshMachineLocationTest.java    |    4 +-
 .../core/mgmt/rebind/RebindTestFixture.java     |    6 +-
 .../core/mgmt/rebind/RebindTestUtils.java       |    8 +-
 .../BrooklynMementoPersisterFileBasedTest.java  |   55 -
 ...ntoPersisterInMemorySizeIntegrationTest.java |  106 --
 .../BrooklynMementoPersisterInMemoryTest.java   |   33 -
 .../BrooklynMementoPersisterTestFixture.java    |  165 ---
 .../persister/FileBasedObjectStoreTest.java     |  101 --
 .../FileBasedStoreObjectAccessorWriterTest.java |   65 --
 .../rebind/persister/InMemoryObjectStore.java   |  170 ---
 .../InMemoryStoreObjectAccessorWriterTest.java  |   36 -
 .../rebind/persister/ListeningObjectStore.java  |  254 -----
 ...nceStoreObjectAccessorWriterTestFixture.java |  136 ---
 .../persister/XmlMementoSerializerTest.java     |  455 --------
 .../transformer/CompoundTransformerTest.java    |    6 +-
 .../policy/basic/PolicySubscriptionTest.java    |    2 +-
 .../core/server/entity/BrooklynMetricsTest.java |    2 +-
 .../apache/brooklyn/core/test/HttpService.java  |    2 +-
 .../core/test/entity/TestApplication.java       |    4 +-
 .../core/test/entity/TestApplicationImpl.java   |    4 +-
 .../core/test/location/TestPaasLocation.java    |    2 +-
 .../longevity/EntityCleanupLongevityTest.java   |    2 +-
 .../EntityCleanupLongevityTestFixture.java      |    2 +-
 .../test/qa/longevity/EntityCleanupTest.java    |    2 +-
 .../qa/performance/AbstractPerformanceTest.java |    2 +-
 .../EntityPersistencePerformanceTest.java       |    2 +-
 .../FilePersistencePerformanceTest.java         |    2 +-
 .../effector/core/EffectorBasicTest.java        |    2 +-
 .../core/AbstractApplicationLegacyTest.java     |    2 +-
 .../entity/core/AbstractEntityLegacyTest.java   |    2 +-
 .../brooklyn/entity/core/EntitiesTest.java      |    2 +-
 .../entity/core/EntitySetFromFlagTest.java      |    2 +-
 .../brooklyn/entity/core/EntitySpecTest.java    |    2 +-
 .../entity/core/EntitySubscriptionTest.java     |    2 +-
 .../entity/core/EntitySuppliersTest.java        |    2 +-
 .../EntityConfigMapUsageLegacyTest.java         |    2 +-
 .../core/internal/EntityConfigMapUsageTest.java |    2 +-
 .../drivers/BasicEntityDriverManagerTest.java   |    4 +-
 .../drivers/EntityDriverRegistryTest.java       |    2 +-
 .../ReflectiveEntityDriverFactoryTest.java      |    2 +-
 .../RegistryEntityDriverFactoryTest.java        |    4 +-
 .../downloads/BasicDownloadsRegistryTest.java   |    2 +-
 .../DownloadProducerFromLocalRepoTest.java      |    2 +-
 .../DownloadProducerFromPropertiesTest.java     |    2 +-
 .../downloads/DownloadSubstitutersTest.java     |    2 +-
 .../entity/group/DynamicClusterTest.java        |    2 +-
 ...DynamicClusterWithAvailabilityZonesTest.java |    4 +-
 .../entity/group/DynamicFabricTest.java         |    4 +-
 .../entity/group/DynamicMultiGroupTest.java     |    2 +-
 .../entity/group/DynamicRegionsFabricTest.java  |    2 +-
 .../apache/brooklyn/entity/group/GroupTest.java |    2 +-
 .../group/MembershipTrackingPolicyTest.java     |    2 +-
 .../entity/group/QuarantineGroupTest.java       |    2 +-
 .../BalancingNodePlacementStrategyTest.java     |    2 +-
 .../ProportionalZoneFailureDetectorTest.java    |    2 +-
 .../entity/hello/LocalEntitiesTest.java         |    2 +-
 .../entity/stock/BasicStartableTest.java        |    4 +-
 .../brooklyn/entity/stock/DataEntityTest.java   |    2 +-
 .../entity/trait/StartableMethodsTest.java      |    2 +-
 .../access/BrooklynAccessUtilsTest.java         |    4 +-
 .../access/PortForwardManagerRebindTest.java    |    8 +-
 .../location/access/PortForwardManagerTest.java |    2 +-
 .../location/basic/AbstractLocationTest.java    |  183 ----
 ...regatingMachineProvisioningLocationTest.java |  115 --
 .../basic/ByonLocationResolverTest.java         |  422 -------
 ...stMachineProvisioningLocationRebindTest.java |  128 ---
 ...ixedListMachineProvisioningLocationTest.java |  574 ----------
 .../basic/HostLocationResolverTest.java         |  125 ---
 .../basic/LegacyAbstractLocationTest.java       |  150 ---
 .../basic/LocalhostLocationResolverTest.java    |  264 -----
 ...ocalhostMachineProvisioningLocationTest.java |  212 ----
 .../LocalhostProvisioningAndAccessTest.java     |   57 -
 .../location/basic/LocationConfigTest.java      |  202 ----
 .../location/basic/LocationConfigUtilsTest.java |  154 ---
 .../location/basic/LocationExtensionsTest.java  |  186 ----
 .../location/basic/LocationManagementTest.java  |   80 --
 .../location/basic/LocationPredicatesTest.java  |   98 --
 ...ionPropertiesFromBrooklynPropertiesTest.java |  121 --
 .../location/basic/LocationRegistryTest.java    |  158 ---
 .../location/basic/MachineDetailsTest.java      |   80 --
 .../location/basic/MultiLocationRebindTest.java |  119 --
 .../basic/MultiLocationResolverTest.java        |  198 ----
 .../location/basic/MultiLocationTest.java       |  118 --
 .../location/basic/PaasLocationTest.java        |   35 -
 .../brooklyn/location/basic/PortRangesTest.java |  129 ---
 .../RecordingMachineLocationCustomizer.java     |   71 --
 .../location/basic/SimulatedLocation.java       |  136 ---
 .../SingleMachineLocationResolverTest.java      |  130 ---
 .../SingleMachineProvisioningLocationTest.java  |   63 --
 .../SshMachineLocationIntegrationTest.java      |  139 ---
 .../SshMachineLocationPerformanceTest.java      |  171 ---
 .../SshMachineLocationReuseIntegrationTest.java |  171 ---
 .../location/basic/SshMachineLocationTest.java  |  339 ------
 .../basic/TestPortSupplierLocation.java         |   89 --
 .../location/byon/ByonLocationResolverTest.java |  429 ++++++++
 ...stMachineProvisioningLocationRebindTest.java |  131 +++
 ...ixedListMachineProvisioningLocationTest.java |  578 ++++++++++
 .../location/byon/HostLocationResolverTest.java |  126 +++
 .../byon/SingleMachineLocationResolverTest.java |  132 +++
 .../SingleMachineProvisioningLocationTest.java  |   65 ++
 .../location/core/AbstractLocationTest.java     |  185 ++++
 ...regatingMachineProvisioningLocationTest.java |  117 ++
 .../core/LegacyAbstractLocationTest.java        |  151 +++
 .../location/core/LocationConfigTest.java       |  204 ++++
 .../location/core/LocationConfigUtilsTest.java  |  156 +++
 .../location/core/LocationExtensionsTest.java   |  187 ++++
 .../location/core/LocationManagementTest.java   |   82 ++
 .../location/core/LocationPredicatesTest.java   |  102 ++
 ...ionPropertiesFromBrooklynPropertiesTest.java |  122 +++
 .../location/core/LocationRegistryTest.java     |  161 +++
 .../location/core/MachineDetailsTest.java       |   83 ++
 .../location/core/MultiLocationRebindTest.java  |  122 +++
 .../core/MultiLocationResolverTest.java         |  203 ++++
 .../location/core/MultiLocationTest.java        |  121 ++
 .../location/core/PaasLocationTest.java         |   35 +
 .../brooklyn/location/core/PortRangesTest.java  |  130 +++
 .../RecordingMachineLocationCustomizer.java     |   71 ++
 .../location/core/SimulatedLocation.java        |  141 +++
 .../location/core/TestPortSupplierLocation.java |   90 ++
 .../LocalhostLocationResolverTest.java          |  269 +++++
 ...ocalhostMachineProvisioningLocationTest.java |  215 ++++
 .../LocalhostProvisioningAndAccessTest.java     |   59 +
 .../brooklyn/location/geo/HostGeoInfoTest.java  |    2 +-
 .../geo/HostGeoLookupIntegrationTest.java       |    4 +-
 .../ssh/SshMachineLocationIntegrationTest.java  |  141 +++
 .../ssh/SshMachineLocationPerformanceTest.java  |  172 +++
 .../SshMachineLocationReuseIntegrationTest.java |  172 +++
 .../location/ssh/SshMachineLocationTest.java    |  345 ++++++
 .../winrm/AdvertiseWinrmLoginPolicyTest.java    |   51 +
 .../winrm/WinRmMachineLocationTest.java         |   44 +
 ...stomAggregatingEnricherDeprecatedTest.groovy |    5 +-
 .../enricher/CustomAggregatingEnricherTest.java |    2 +-
 .../TransformingEnricherDeprecatedTest.groovy   |    2 +-
 .../enricher/TransformingEnricherTest.java      |    2 +-
 .../sensor/feed/function/FunctionFeedTest.java  |    2 +-
 .../feed/http/HttpFeedIntegrationTest.java      |    4 +-
 .../feed/shell/ShellFeedIntegrationTest.java    |    2 +-
 .../sensor/feed/ssh/SshFeedIntegrationTest.java |    4 +-
 .../WindowsPerformanceCounterFeedTest.java      |    2 +-
 .../util/core/file/ArchiveUtilsTest.java        |    2 +-
 .../util/core/http/HttpToolIntegrationTest.java |    2 +-
 .../core/ssh/BashCommandsIntegrationTest.java   |    4 +-
 .../util/core/task/ssh/SshTasksTest.java        |    4 +-
 .../brooklyn/demo/GlobalWebFabricExample.java   |    2 +-
 .../brooklyn/demo/CumulusRDFApplication.java    |    2 +-
 .../brooklyn/demo/SingleWebServerExample.java   |    2 +-
 .../demo/WebClusterDatabaseExample.java         |    2 +-
 .../demo/WebClusterDatabaseExampleApp.java      |    2 +-
 .../demo/WebClusterDatabaseExampleGroovy.groovy |    2 +-
 .../JcloudsBlobStoreBasedObjectStore.java       |  237 ----
 .../jclouds/JcloudsStoreObjectAccessor.java     |  127 ---
 .../policy/os/AdvertiseWinrmLoginPolicy.java    |   81 --
 .../brooklyn/policy/os/CreateUserPolicy.java    |  173 ---
 .../JcloudsBlobStoreBasedObjectStore.java       |  237 ++++
 .../jclouds/JcloudsStoreObjectAccessor.java     |  127 +++
 ...AbstractJcloudsSubnetSshMachineLocation.java |    3 +-
 .../location/jclouds/BrooklynMachinePool.java   |    2 +-
 .../jclouds/JcloudsByonLocationResolver.java    |   12 +-
 .../location/jclouds/JcloudsLocation.java       |   21 +-
 .../location/jclouds/JcloudsLocationConfig.java |    4 +-
 .../jclouds/JcloudsLocationResolver.java        |    8 +-
 .../jclouds/JcloudsMachineLocation.java         |    2 +-
 ...JcloudsPropertiesFromBrooklynProperties.java |    6 +-
 .../jclouds/JcloudsSshMachineLocation.java      |    8 +-
 .../jclouds/JcloudsWinRmMachineLocation.java    |    2 +-
 .../jclouds/SudoTtyFixingCustomizer.java        |    2 +-
 .../policy/jclouds/os/CreateUserPolicy.java     |  173 +++
 .../location/jclouds/sample/setup-server.sh     |   31 +
 .../resources/sample/script/setup-server.sh     |   31 -
 .../persister/jclouds/BlobStoreCleaner.java     |   71 --
 .../persister/jclouds/BlobStoreExpiryTest.java  |  196 ----
 .../BlobStorePersistencePerformanceTest.java    |  120 --
 .../rebind/persister/jclouds/BlobStoreTest.java |  150 ---
 ...nMementoPersisterJcloudsObjectStoreTest.java |   66 --
 ...tyToBlobStorePersistencePerformanceTest.java |   64 --
 ...ailabilityManagerJcloudsObjectStoreTest.java |   79 --
 .../JcloudsBlobStoreBasedObjectStoreTest.java   |  118 --
 .../jclouds/JcloudsExpect100ContinueTest.java   |  148 ---
 .../JcloudsObjectStoreAccessorWriterTest.java   |  181 ---
 .../os/AdvertiseWinrmLoginPolicyTest.java       |   50 -
 .../policy/os/CreateUserPolicyLiveTest.java     |  111 --
 .../policy/os/CreateUserPolicyTest.java         |  136 ---
 .../mgmt/persist/jclouds/BlobStoreCleaner.java  |   71 ++
 .../persist/jclouds/BlobStoreExpiryTest.java    |  196 ++++
 .../BlobStorePersistencePerformanceTest.java    |  121 ++
 .../mgmt/persist/jclouds/BlobStoreTest.java     |  150 +++
 ...nMementoPersisterJcloudsObjectStoreTest.java |   67 ++
 ...tyToBlobStorePersistencePerformanceTest.java |   65 ++
 ...ailabilityManagerJcloudsObjectStoreTest.java |   80 ++
 .../JcloudsBlobStoreBasedObjectStoreTest.java   |  118 ++
 .../jclouds/JcloudsExpect100ContinueTest.java   |  148 +++
 .../JcloudsObjectStoreAccessorWriterTest.java   |  182 +++
 .../jclouds/AbstractJcloudsLiveTest.java        |    2 +-
 .../jclouds/BailOutJcloudsLocation.java         |    4 +-
 .../jclouds/BrooklynMachinePoolLiveTest.java    |    2 +-
 .../jclouds/JcloudsAddressesLiveTest.java       |    4 +-
 .../JcloudsByonLocationResolverAwsLiveTest.java |    2 +-
 ...dsByonLocationResolverSoftlayerLiveTest.java |    2 +-
 .../JcloudsByonLocationResolverTest.java        |    2 +-
 .../jclouds/JcloudsLocationMetadataTest.java    |    2 +-
 .../JcloudsLocationRebindMachineLiveTest.java   |    2 +-
 .../jclouds/JcloudsLocationResolverTest.java    |    2 +-
 .../location/jclouds/JcloudsLocationTest.java   |    2 +-
 .../location/jclouds/JcloudsLoginLiveTest.java  |    2 +-
 .../location/jclouds/LiveTestEntity.java        |    2 +-
 .../jclouds/RebindJcloudsLocationTest.java      |    2 +-
 ...loudsLocationUserLoginAndConfigLiveTest.java |    2 +-
 ...hineProvisioningLocationJcloudsLiveTest.java |    2 +-
 .../provider/AbstractJcloudsLocationTest.java   |    2 +-
 .../AwsEc2LocationWindowsLiveTest.groovy        |    2 +-
 .../provider/CarrenzaLocationLiveTest.groovy    |    2 +-
 .../provider/RackspaceLocationLiveTest.java     |    2 +-
 .../jclouds/os/CreateUserPolicyLiveTest.java    |  112 ++
 .../policy/jclouds/os/CreateUserPolicyTest.java |  137 +++
 .../followthesun/DefaultFollowTheSunModel.java  |    2 +-
 .../policy/ha/SshMachineFailureDetector.java    |    4 +-
 .../autoscaling/AutoScalerPolicyRebindTest.java |    2 +-
 .../enricher/HttpLatencyDetectorTest.java       |    2 +-
 .../AbstractFollowTheSunPolicyTest.java         |    2 +-
 .../followthesun/FollowTheSunModelTest.java     |    3 +-
 .../FollowTheSunPolicySoakTest.java             |    2 +-
 .../followthesun/FollowTheSunPolicyTest.java    |    2 +-
 .../brooklyn/policy/ha/HaPolicyRebindTest.java  |    2 +-
 .../brooklyn/policy/ha/ServiceReplacerTest.java |    2 +-
 .../AbstractLoadBalancingPolicyTest.java        |    2 +-
 .../BalanceableWorkerPoolTest.java              |    2 +-
 .../ItemsInContainersGroupTest.java             |    2 +-
 .../entity/monitoring/zabbix/ZabbixFeed.java    |    2 +-
 .../monitoring/zabbix/ZabbixServerImpl.java     |    2 +-
 .../entity/brooklynnode/BrooklynNodeImpl.java   |    2 +-
 .../brooklynnode/BrooklynNodeSshDriver.java     |    2 +-
 .../entity/chef/ChefLifecycleEffectorTasks.java |    2 +-
 .../brooklyn/entity/chef/ChefServerTasks.java   |    2 +-
 .../brooklyn/entity/chef/ChefSoloDriver.java    |    2 +-
 .../entity/chef/KnifeConvergeTaskFactory.java   |    2 +-
 .../java/JavaSoftwareProcessSshDriver.java      |    2 +-
 .../apache/brooklyn/entity/java/JmxSupport.java |    4 +-
 .../apache/brooklyn/entity/java/UsesJmx.java    |    2 +-
 .../entity/java/VanillaJavaAppSshDriver.java    |    2 +-
 .../entity/machine/MachineEntityImpl.java       |    4 +-
 .../entity/machine/MachineInitTasks.java        |    2 +-
 .../entity/machine/pool/ServerPoolImpl.java     |    4 +-
 .../entity/machine/pool/ServerPoolLocation.java |    2 +-
 .../pool/ServerPoolLocationResolver.java        |    6 +-
 .../base/AbstractSoftwareProcessSshDriver.java  |    2 +-
 .../AbstractSoftwareProcessWinRmDriver.java     |    2 +-
 .../base/EmptySoftwareProcessSshDriver.java     |    2 +-
 .../SameServerDriverLifecycleEffectorTasks.java |    2 +-
 .../software/base/SoftwareProcessImpl.java      |    4 +-
 .../base/VanillaSoftwareProcessSshDriver.java   |    2 +-
 .../base/VanillaWindowsProcessWinRmDriver.java  |    2 +-
 .../MachineLifecycleEffectorTasks.java          |   10 +-
 .../software/base/lifecycle/ScriptHelper.java   |    2 +-
 .../system_service/InitdServiceInstaller.java   |    2 +-
 .../system_service/SystemServiceEnricher.java   |    2 +-
 .../brooklyn/sensor/ssh/SshEffectorTasks.java   |    4 +-
 ...pache.brooklyn.api.location.LocationResolver |    2 +-
 .../BrooklynClusterIntegrationTest.java         |    2 +-
 .../BrooklynNodeIntegrationTest.java            |    8 +-
 .../entity/brooklynnode/BrooklynNodeTest.java   |    2 +-
 .../entity/chef/ChefLiveTestSupport.java        |    2 +-
 .../AbstractChefToyMySqlEntityLiveTest.java     |    2 +-
 .../brooklyn/entity/java/EntityPollingTest.java |    2 +-
 .../brooklyn/entity/java/JavaOptsTest.java      |    2 +-
 ...SoftwareProcessSshDriverIntegrationTest.java |    2 +-
 .../entity/java/VanillaJavaAppRebindTest.java   |    2 +-
 .../entity/java/VanillaJavaAppTest.java         |    4 +-
 .../machine/pool/AbstractServerPoolTest.java    |    2 +-
 .../pool/ServerPoolLocationResolverTest.java    |    2 +-
 .../entity/machine/pool/ServerPoolTest.java     |    2 +-
 ...ctSoftwareProcessRestartIntegrationTest.java |    2 +-
 .../base/DoNothingSoftwareProcessDriver.java    |    2 +-
 .../base/MachineLifecycleEffectorTasksTest.java |  140 ---
 .../software/base/SameServerEntityTest.java     |    4 +-
 .../software/base/SoftwareEffectorTest.java     |    4 +-
 .../base/SoftwareProcessEntityLatchTest.java    |    4 +-
 .../base/SoftwareProcessEntityRebindTest.java   |    4 +-
 .../base/SoftwareProcessEntityTest.java         |    9 +-
 ...SoftwareProcessSshDriverIntegrationTest.java |    4 +-
 .../MachineLifecycleEffectorTasksTest.java      |  147 +++
 .../software/base/lifecycle/MyEntityImpl.java   |    2 +-
 .../base/lifecycle/NaiveScriptRunnerTest.java   |    2 +-
 .../base/lifecycle/ScriptHelperTest.java        |    4 +-
 .../base/lifecycle/StartStopSshDriverTest.java  |    2 +-
 .../mgmt/usage/LocationUsageTrackingTest.java   |    4 +-
 .../base/test/driver/MockSshDriver.java         |    2 +-
 ...rWithAvailabilityZonesMultiLocationTest.java |    4 +-
 .../location/MachineDetailsEc2LiveTest.java     |    6 +-
 .../MachineDetailsGoogleComputeLiveTest.java    |    6 +-
 .../test/location/WinRmMachineLocationTest.java |   44 -
 .../test/mysql/AbstractToyMySqlEntityTest.java  |    4 +-
 .../mysql/DynamicToyMySqlEntityBuilder.java     |    6 +-
 .../test/mysql/DynamicToyMySqlEntityTest.java   |    2 +-
 .../PortAttributeSensorAndConfigKeyTest.java    |    4 +-
 .../test/ssh/SshCommandIntegrationTest.java     |    2 +-
 .../SystemServiceEnricherTest.java              |    2 +-
 .../brooklyn/sensor/feed/jmx/JmxFeedTest.java   |    6 +-
 .../sensor/feed/jmx/RebindJmxFeedTest.java      |    4 +-
 .../sensor/ssh/SshEffectorTasksTest.java        |    4 +-
 .../entity/database/crate/CrateNode.java        |    2 +-
 .../database/crate/CrateNodeSshDriver.java      |    2 +-
 .../entity/database/mariadb/MariaDbNode.java    |    2 +-
 .../database/mariadb/MariaDbNodeImpl.java       |    4 +-
 .../database/mariadb/MariaDbSshDriver.java      |    2 +-
 .../entity/database/mysql/MySqlNode.java        |    2 +-
 .../entity/database/mysql/MySqlNodeImpl.java    |    4 +-
 .../entity/database/mysql/MySqlSshDriver.java   |    4 +-
 .../database/postgresql/PostgreSqlNode.java     |    2 +-
 .../PostgreSqlNodeChefImplFromScratch.java      |    4 +-
 .../postgresql/PostgreSqlSshDriver.java         |    2 +-
 .../database/rubyrep/RubyRepSshDriver.java      |    2 +-
 .../crate/CrateNodeIntegrationTest.java         |    2 +-
 .../mariadb/MariaDbIntegrationTest.java         |    2 +-
 .../mariadb/MariaDbLiveRackspaceTest.java       |    2 +-
 .../database/mysql/MySqlIntegrationTest.java    |    2 +-
 .../database/mysql/MySqlLiveRackspaceTest.java  |    2 +-
 .../database/postgresql/PostgreSqlChefTest.java |    4 +-
 .../postgresql/PostgreSqlIntegrationTest.java   |    2 +-
 .../postgresql/PostgreSqlRackspaceLiveTest.java |    4 +-
 .../PostgreSqlRebindIntegrationTest.java        |    2 +-
 .../database/rubyrep/RubyRepEc2LiveTest.java    |    2 +-
 .../rubyrep/RubyRepIntegrationTest.java         |    4 +-
 .../rubyrep/RubyRepRackspaceLiveTest.java       |    4 +-
 .../messaging/activemq/ActiveMQSshDriver.java   |    2 +-
 .../kafka/AbstractfKafkaSshDriver.java          |    2 +-
 .../entity/messaging/kafka/KafkaBroker.java     |    2 +-
 .../messaging/kafka/KafkaBrokerSshDriver.java   |    2 +-
 .../kafka/KafkaZooKeeperSshDriver.java          |    2 +-
 .../entity/messaging/qpid/QpidSshDriver.java    |    2 +-
 .../messaging/rabbit/RabbitDestination.java     |    2 +-
 .../messaging/rabbit/RabbitSshDriver.java       |    2 +-
 .../entity/messaging/storm/StormSshDriver.java  |    4 +-
 .../entity/zookeeper/ZooKeeperSshDriver.java    |    2 +-
 .../messaging/kafka/KafkaIntegrationTest.java   |    2 +-
 .../messaging/rabbit/RabbitIntegrationTest.java |    2 +-
 .../entity/monitoring/monit/MonitNodeImpl.java  |    2 +-
 .../entity/monitoring/monit/MonitSshDriver.java |    2 +-
 .../monitoring/monit/MonitIntegrationTest.java  |    2 +-
 .../entity/network/bind/BindDnsServer.java      |    2 +-
 .../entity/network/bind/BindDnsServerImpl.java  |    4 +-
 .../network/bind/BindDnsServerSshDriver.java    |    2 +-
 .../bind/DoNothingSoftwareProcessDriver.java    |    2 +-
 .../network/bind/TestBindDnsServerImpl.java     |    2 +-
 .../cassandra/CassandraDatacenterImpl.java      |    2 +-
 .../entity/nosql/cassandra/CassandraNode.java   |    2 +-
 .../nosql/cassandra/CassandraNodeImpl.java      |    2 +-
 .../nosql/cassandra/CassandraNodeSshDriver.java |    4 +-
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |    2 +-
 .../CouchbaseSyncGatewaySshDriver.java          |    2 +-
 .../nosql/couchdb/CouchDBNodeSshDriver.java     |    2 +-
 .../nosql/elasticsearch/ElasticSearchNode.java  |    2 +-
 .../ElasticSearchNodeSshDriver.java             |    2 +-
 .../nosql/mongodb/AbstractMongoDBSshDriver.java |    2 +-
 .../nosql/mongodb/MongoDBClientSshDriver.java   |    2 +-
 .../entity/nosql/mongodb/MongoDBSshDriver.java  |    3 +-
 .../sharding/MongoDBConfigServerSshDriver.java  |    3 +-
 .../sharding/MongoDBRouterSshDriver.java        |    3 +-
 .../entity/nosql/redis/RedisStoreImpl.java      |    2 +-
 .../entity/nosql/redis/RedisStoreSshDriver.java |    2 +-
 .../entity/nosql/riak/RiakNodeSshDriver.java    |    2 +-
 .../brooklyn/entity/nosql/solr/SolrServer.java  |    2 +-
 .../entity/nosql/solr/SolrServerSshDriver.java  |    2 +-
 ...assandraDatacenterRebindIntegrationTest.java |    2 +-
 .../cassandra/CassandraDatacenterTest.java      |    2 +-
 .../nosql/cassandra/CassandraFabricTest.java    |    2 +-
 .../nosql/couchbase/CouchbaseOfflineTest.java   |    4 +-
 .../nosql/couchdb/AbstractCouchDBNodeTest.java  |    2 +-
 .../ElasticSearchNodeIntegrationTest.java       |    2 +-
 .../nosql/mongodb/MongoDBIntegrationTest.java   |    2 +-
 .../mongodb/MongoDBRebindIntegrationTest.java   |    2 +-
 .../MongoDBReplicaSetIntegrationTest.java       |    2 +-
 .../MongoDBConfigServerIntegrationTest.java     |    2 +-
 ...MongoDBShardedDeploymentIntegrationTest.java |    2 +-
 .../redis/RedisClusterIntegrationTest.java      |    2 +-
 .../nosql/redis/RedisIntegrationTest.java       |    2 +-
 .../nosql/riak/RiakNodeIntegrationTest.java     |    2 +-
 .../entity/osgi/karaf/KarafSshDriver.java       |    2 +-
 .../entity/osgi/karaf/KarafContainerTest.java   |    2 +-
 .../entity/proxy/AbstractControllerImpl.java    |    2 +-
 .../entity/proxy/nginx/NginxSshDriver.java      |    2 +-
 .../entity/webapp/JavaWebAppSshDriver.java      |    2 +-
 .../entity/webapp/jboss/JBoss6SshDriver.java    |    2 +-
 .../entity/webapp/jboss/JBoss7SshDriver.java    |    2 +-
 .../entity/webapp/jetty/Jetty6SshDriver.java    |    2 +-
 .../webapp/nodejs/NodeJsWebAppService.java      |    2 +-
 .../webapp/nodejs/NodeJsWebAppSshDriver.java    |    2 +-
 .../entity/webapp/tomcat/Tomcat7SshDriver.java  |    2 +-
 .../entity/webapp/tomcat/TomcatServer.java      |    2 +-
 .../entity/webapp/tomcat/TomcatSshDriver.java   |    2 +-
 .../entity/dns/AbstractGeoDnsServiceTest.java   |   12 +-
 .../geoscaling/GeoscalingIntegrationTest.java   |    2 +-
 .../entity/proxy/AbstractControllerTest.java    |    4 +-
 .../brooklyn/entity/proxy/UrlMappingTest.java   |    2 +-
 .../nginx/NginxClusterIntegrationTest.java      |    2 +-
 .../nginx/NginxHttpsSslIntegrationTest.java     |    2 +-
 .../proxy/nginx/NginxLightIntegrationTest.java  |    2 +-
 .../proxy/nginx/NginxRebindIntegrationTest.java |    2 +-
 .../nginx/NginxRebindWithHaIntegrationTest.java |    4 +-
 .../nginx/NginxUrlMappingIntegrationTest.java   |    2 +-
 .../proxy/nginx/NginxWebClusterEc2LiveTest.java |    2 +-
 .../AbstractWebAppFixtureIntegrationTest.java   |    2 +-
 ...lledDynamicWebAppClusterIntegrationTest.java |    2 +-
 .../ControlledDynamicWebAppClusterTest.java     |    2 +-
 .../entity/webapp/DynamicWebAppClusterTest.java |    2 +-
 .../entity/webapp/DynamicWebAppFabricTest.java  |    2 +-
 .../webapp/ElasticCustomLocationTest.java       |    2 +-
 ...ElasticJavaWebAppServiceIntegrationTest.java |    2 +-
 .../webapp/TomcatAutoScalerPolicyTest.java      |    2 +-
 .../webapp/WebAppConcurrentDeployTest.java      |    2 +-
 .../webapp/WebAppLiveIntegrationTest.groovy     |    5 +-
 ...namicWebAppClusterRebindIntegrationTest.java |    2 +-
 ...namicWebAppClusterRebindIntegrationTest.java |    2 +-
 ...Boss6ServerNonInheritingIntegrationTest.java |    2 +-
 ...Boss7ServerNonInheritingIntegrationTest.java |    2 +-
 .../JBoss7ServerRebindingIntegrationTest.java   |    2 +-
 ...ultiVersionWebAppFixtureIntegrationTest.java |    2 +-
 .../JettyWebAppFixtureIntegrationTest.java      |    2 +-
 .../NodeJsWebAppFixtureIntegrationTest.java     |    2 +-
 .../NodeJsWebAppSimpleIntegrationTest.java      |    4 +-
 ...mcat8ServerWebAppFixtureIntegrationTest.java |    2 +-
 ...ableRetrieveUsageMetricsIntegrationTest.java |    2 +-
 ...omcatServerWebAppFixtureIntegrationTest.java |    2 +-
 .../camp/brooklyn/ByonLocationsYamlTest.java    |   10 +-
 .../brooklyn/EmptySoftwareProcessYamlTest.java  |    2 +-
 .../camp/brooklyn/LocationsYamlTest.java        |    8 +-
 .../catalog/CatalogYamlLocationTest.java        |    2 +-
 .../org/apache/brooklyn/cli/CloudExplorer.java  |    2 +-
 .../main/java/org/apache/brooklyn/cli/Main.java |    4 +-
 .../java/org/apache/brooklyn/cli/CliTest.java   |    2 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |   12 +-
 .../brooklyn/launcher/BrooklynWebServer.java    |    4 +-
 .../BrooklynLauncherHighAvailabilityTest.java   |    2 +-
 .../BrooklynLauncherRebindCatalogTest.java      |    2 +-
 .../BrooklynLauncherRebindTestFixture.java      |    6 +-
 .../BrooklynLauncherRebindTestToFiles.java      |    6 +-
 ...lynLauncherRebindToCloudObjectStoreTest.java |    9 +-
 .../brooklyn/launcher/BrooklynLauncherTest.java |    2 +-
 .../blueprints/AbstractBlueprintTest.java       |    2 +-
 .../qa/load/SimulatedJBoss7ServerImpl.java      |    2 +-
 .../qa/load/SimulatedMySqlNodeImpl.java         |    2 +-
 .../qa/load/SimulatedNginxControllerImpl.java   |    2 +-
 .../brooklyn/qa/load/SimulatedTheeTierApp.java  |    2 +-
 .../org/apache/brooklyn/qa/load/LoadTest.java   |    2 +-
 .../ApplicationResourceIntegrationTest.java     |    2 +-
 .../rest/client/BrooklynApiRestClientTest.java  |    2 +-
 .../rest/resources/LocationResource.java        |    2 +-
 .../brooklyn/rest/resources/ServerResource.java |    6 +-
 .../rest/transform/LocationTransformer.java     |    6 +-
 .../brooklyn/rest/util/EntityLocationUtils.java |    2 +-
 .../rest/resources/ApplicationResourceTest.java |    6 +-
 .../rest/resources/LocationResourceTest.java    |    2 +-
 .../rest/resources/UsageResourceTest.java       |    4 +-
 .../rest/testing/BrooklynRestApiTest.java       |    2 +-
 .../testing/mocks/RestMockSimpleEntity.java     |    2 +-
 .../rest/util/EntityLocationUtilsTest.java      |    4 +-
 .../test/osgi/entities/SimpleLocation.java      |    2 +-
 .../test/osgi/entities/more/MoreLocation.java   |    2 +-
 648 files changed, 20297 insertions(+), 20156 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogLoadMode.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogLoadMode.java b/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogLoadMode.java
index 1bf6020..73f5a4e 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogLoadMode.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogLoadMode.java
@@ -19,7 +19,7 @@
 package org.apache.brooklyn.core.catalog;
 
 import org.apache.brooklyn.core.catalog.internal.CatalogInitialization;
-import org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode;
+import org.apache.brooklyn.core.mgmt.persist.PersistMode;
 import org.slf4j.LoggerFactory;
 
 /** @deprecated since 0.7.0 replaced by {@link CatalogInitialization} */

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
index 1b197d4..4fd7878 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
@@ -54,7 +54,7 @@ import org.apache.brooklyn.core.catalog.internal.CatalogClasspathDo.CatalogScann
 import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
 import org.apache.brooklyn.core.objs.BrooklynObjectInternal.ConfigurationSupportInternal;
 import org.apache.brooklyn.core.server.BrooklynServerConfig;
-import org.apache.brooklyn.location.basic.BasicLocationRegistry;
+import org.apache.brooklyn.location.core.BasicLocationRegistry;
 import org.apache.brooklyn.util.collections.MutableList;
 import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.collections.MutableSet;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
index 715cff6..e28be77 100644
--- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
+++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
@@ -20,7 +20,7 @@ package org.apache.brooklyn.core.internal;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.brooklyn.location.basic.PortRanges;
+import org.apache.brooklyn.location.core.PortRanges;
 import org.apache.brooklyn.util.core.crypto.SecureKeys;
 import org.apache.brooklyn.util.core.flags.TypeCoercions;
 import org.apache.brooklyn.util.net.Networking;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java
index 6f2bcba..df6f402 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java
@@ -50,18 +50,18 @@ import org.apache.brooklyn.core.config.ConfigKeys;
 import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement;
 import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
 import org.apache.brooklyn.core.mgmt.ha.BasicMasterChooser.AlphabeticMasterChooser;
+import org.apache.brooklyn.core.mgmt.ha.dto.BasicManagementNodeSyncRecord;
+import org.apache.brooklyn.core.mgmt.ha.dto.ManagementPlaneSyncRecordImpl;
+import org.apache.brooklyn.core.mgmt.ha.dto.ManagementPlaneSyncRecordImpl.Builder;
 import org.apache.brooklyn.core.mgmt.internal.BrooklynObjectManagementMode;
 import org.apache.brooklyn.core.mgmt.internal.LocalEntityManager;
 import org.apache.brooklyn.core.mgmt.internal.LocationManagerInternal;
 import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
 import org.apache.brooklyn.core.mgmt.internal.ManagementTransitionMode;
+import org.apache.brooklyn.core.mgmt.persist.BrooklynPersistenceUtils;
+import org.apache.brooklyn.core.mgmt.persist.PersistenceActivityMetrics;
+import org.apache.brooklyn.core.mgmt.persist.BrooklynPersistenceUtils.CreateBackupMode;
 import org.apache.brooklyn.core.mgmt.rebind.RebindManagerImpl;
-import org.apache.brooklyn.core.mgmt.rebind.persister.BrooklynPersistenceUtils;
-import org.apache.brooklyn.core.mgmt.rebind.persister.PersistenceActivityMetrics;
-import org.apache.brooklyn.core.mgmt.rebind.persister.BrooklynPersistenceUtils.CreateBackupMode;
-import org.apache.brooklyn.core.mgmt.rebind.plane.dto.BasicManagementNodeSyncRecord;
-import org.apache.brooklyn.core.mgmt.rebind.plane.dto.ManagementPlaneSyncRecordImpl;
-import org.apache.brooklyn.core.mgmt.rebind.plane.dto.ManagementPlaneSyncRecordImpl.Builder;
 import org.apache.brooklyn.core.server.BrooklynServerConfig;
 import org.apache.brooklyn.entity.core.EntityInternal;
 import org.apache.brooklyn.util.collections.MutableList;
@@ -1020,7 +1020,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
 
     protected ManagementNodeSyncRecord createManagementNodeSyncRecord(boolean useLocalTimestampAsRemoteTimestamp) {
         long timestamp = currentTimeMillis();
-        org.apache.brooklyn.core.mgmt.rebind.plane.dto.BasicManagementNodeSyncRecord.Builder builder = BasicManagementNodeSyncRecord.builder()
+        org.apache.brooklyn.core.mgmt.ha.dto.BasicManagementNodeSyncRecord.Builder builder = BasicManagementNodeSyncRecord.builder()
                 .brooklynVersion(BrooklynVersion.get())
                 .nodeId(ownNodeId)
                 .status(getNodeState())

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java
index 92093c6..8380a9f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java
@@ -33,14 +33,14 @@ import org.apache.brooklyn.api.mgmt.ha.ManagementNodeState;
 import org.apache.brooklyn.api.mgmt.ha.ManagementNodeSyncRecord;
 import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecord;
 import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecordPersister;
-import org.apache.brooklyn.core.mgmt.rebind.persister.MementoSerializer;
-import org.apache.brooklyn.core.mgmt.rebind.persister.PersistenceObjectStore;
-import org.apache.brooklyn.core.mgmt.rebind.persister.RetryingMementoSerializer;
-import org.apache.brooklyn.core.mgmt.rebind.persister.StoreObjectAccessorLocking;
-import org.apache.brooklyn.core.mgmt.rebind.persister.XmlMementoSerializer;
-import org.apache.brooklyn.core.mgmt.rebind.persister.PersistenceObjectStore.StoreObjectAccessorWithLock;
-import org.apache.brooklyn.core.mgmt.rebind.plane.dto.BasicManagementNodeSyncRecord;
-import org.apache.brooklyn.core.mgmt.rebind.plane.dto.ManagementPlaneSyncRecordImpl;
+import org.apache.brooklyn.core.mgmt.ha.dto.BasicManagementNodeSyncRecord;
+import org.apache.brooklyn.core.mgmt.ha.dto.ManagementPlaneSyncRecordImpl;
+import org.apache.brooklyn.core.mgmt.persist.MementoSerializer;
+import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore;
+import org.apache.brooklyn.core.mgmt.persist.RetryingMementoSerializer;
+import org.apache.brooklyn.core.mgmt.persist.StoreObjectAccessorLocking;
+import org.apache.brooklyn.core.mgmt.persist.XmlMementoSerializer;
+import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore.StoreObjectAccessorWithLock;
 import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.apache.brooklyn.util.text.Strings;
 import org.apache.brooklyn.util.time.Duration;
@@ -111,7 +111,7 @@ public class ManagementPlaneSyncRecordPersisterToObjectStore implements Manageme
     /**
      * @param mgmt not used much at present but handy to ensure we know it so that obj store is prepared
      * @param objectStore the objectStore use to read/write management-plane data;
-     *   this must have been {@link PersistenceObjectStore#prepareForSharedUse(org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode, HighAvailabilityMode)}
+     *   this must have been {@link PersistenceObjectStore#prepareForSharedUse(org.apache.brooklyn.core.mgmt.persist.PersistMode, HighAvailabilityMode)}
      * @param classLoader ClassLoader to use when deserializing data
      */
     public ManagementPlaneSyncRecordPersisterToObjectStore(ManagementContext mgmt, PersistenceObjectStore objectStore, ClassLoader classLoader) {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/BasicManagementNodeSyncRecord.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/BasicManagementNodeSyncRecord.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/BasicManagementNodeSyncRecord.java
new file mode 100644
index 0000000..d8f18b1
--- /dev/null
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/BasicManagementNodeSyncRecord.java
@@ -0,0 +1,194 @@
+/*
+ * 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.mgmt.ha.dto;
+
+import java.io.Serializable;
+import java.net.URI;
+
+import org.apache.brooklyn.api.mgmt.ha.ManagementNodeState;
+import org.apache.brooklyn.api.mgmt.ha.ManagementNodeSyncRecord;
+import org.apache.brooklyn.core.BrooklynVersion;
+import org.apache.brooklyn.util.time.Time;
+import org.codehaus.jackson.annotate.JsonAutoDetect;
+import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+
+import com.google.common.base.Objects;
+
+/**
+ * Represents the state of a management node within the Brooklyn management plane
+ * (DTO class).
+ * 
+ * @author aled
+ */
+@JsonAutoDetect(fieldVisibility=Visibility.ANY, getterVisibility=Visibility.NONE)
+public class BasicManagementNodeSyncRecord implements ManagementNodeSyncRecord, Serializable {
+
+    private static final long serialVersionUID = 4918161834047884244L;
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private String brooklynVersion = BrooklynVersion.get();
+        protected String nodeId;
+        protected URI uri;
+        protected ManagementNodeState status;
+        protected Long priority;
+        protected long localTimestamp;
+        protected Long remoteTimestamp;
+
+        protected Builder self() {
+            return (Builder) this;
+        }
+        public Builder brooklynVersion(String val) {
+            brooklynVersion = val; return self();
+        }
+        public Builder nodeId(String val) {
+            nodeId = val; return self();
+        }
+        public Builder uri(URI val) {
+            uri = val; return self();
+        }
+        public Builder status(ManagementNodeState val) {
+            status = val; return self();
+        }
+        public Builder priority(Long val) {
+            priority = val; return self();
+        }
+        public Builder localTimestamp(long val) {
+            localTimestamp = val; return self();
+        }
+        public Builder remoteTimestamp(Long val) {
+            remoteTimestamp = val; return self();
+        }
+        public Builder from(ManagementNodeSyncRecord other) {
+            return from(other, false);
+        }
+        public Builder from(ManagementNodeSyncRecord other, boolean ignoreNulls) {
+            if (ignoreNulls && other==null) return this;
+            if (other.getBrooklynVersion()!=null) brooklynVersion = other.getBrooklynVersion();
+            if (other.getNodeId()!=null) nodeId = other.getNodeId();
+            if (other.getUri()!=null) uri = other.getUri();
+            if (other.getStatus()!=null) status = other.getStatus();
+            if (other.getPriority()!=null) priority = other.getPriority();
+            if (other.getLocalTimestamp()>0) localTimestamp = other.getLocalTimestamp();
+            if (other.getRemoteTimestamp()!=null) remoteTimestamp = other.getRemoteTimestamp();
+            return this;
+        }
+        public ManagementNodeSyncRecord build() {
+            return new BasicManagementNodeSyncRecord(this);
+        }
+    }
+    
+    private String brooklynVersion;
+    private String nodeId;
+    private URI uri;
+    private ManagementNodeState status;
+    private Long priority;
+    private Long localTimestamp;
+    private Long remoteTimestamp;
+    
+    /** @deprecated since 0.7.0, use {@link #localTimestamp} or {@link #remoteTimestamp},
+     * but kept (or rather added back in) to support deserializing previous instances */
+    @Deprecated
+    private Long timestampUtc;
+
+
+    // for de-serialization
+    @SuppressWarnings("unused")
+    private BasicManagementNodeSyncRecord() {
+    }
+
+    // Trusts the builder to not mess around with mutability concurrently with build().
+    protected BasicManagementNodeSyncRecord(Builder builder) {
+        brooklynVersion = builder.brooklynVersion;
+        nodeId = builder.nodeId;
+        uri = builder.uri;
+        status = builder.status;
+        priority = builder.priority;
+        localTimestamp = builder.localTimestamp;
+        remoteTimestamp = builder.remoteTimestamp;
+    }
+
+    @Override
+    public String getBrooklynVersion() {
+        return brooklynVersion;
+    }
+    
+    @Override
+    public String getNodeId() {
+        return nodeId;
+    }
+    
+    @Override
+    public URI getUri() {
+        return uri;
+    }
+    
+    @Override
+    public ManagementNodeState getStatus() {
+        return status;
+    }
+    
+    @Override
+    public Long getPriority() {
+        return priority;
+    }
+    
+    @Override
+    public long getLocalTimestamp() {
+        if (localTimestamp!=null) return localTimestamp;
+        if (timestampUtc!=null) return timestampUtc;
+        throw new NullPointerException("localTimestamp not known for "+getNodeId());
+    }
+    
+    @Override
+    public Long getRemoteTimestamp() {
+        return remoteTimestamp;
+    }
+    
+    @Override
+    public String toString() {
+        return Objects.toStringHelper(this)
+                .add("nodeId", getNodeId())
+                .add("status", getStatus()).toString();
+    }
+    
+    @Override
+    public String toVerboseString() {
+        return Objects.toStringHelper(this)
+                .omitNullValues()
+                .add("brooklynVersion", getBrooklynVersion())
+                .add("nodeId", getNodeId())
+                .add("uri", getUri())
+                .add("status", getStatus())
+                .add("priority", getPriority())
+                .add("localTimestamp", getLocalTimestamp()+"="+Time.makeDateString(getLocalTimestamp()))
+                .add("remoteTimestamp", getRemoteTimestamp()+(getRemoteTimestamp()==null ? "" : 
+                    "="+Time.makeDateString(getRemoteTimestamp())))
+                .toString();
+    }
+
+    /** used here for store to inject remote timestamp */
+    public void setRemoteTimestamp(Long remoteTimestamp) {
+        this.remoteTimestamp = remoteTimestamp;
+    }
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/ManagementPlaneSyncRecordImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/ManagementPlaneSyncRecordImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/ManagementPlaneSyncRecordImpl.java
new file mode 100644
index 0000000..dd89320
--- /dev/null
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/ManagementPlaneSyncRecordImpl.java
@@ -0,0 +1,99 @@
+/*
+ * 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.mgmt.ha.dto;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.apache.brooklyn.api.mgmt.ha.ManagementNodeSyncRecord;
+import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecord;
+import org.apache.brooklyn.util.collections.MutableMap;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+
+public class ManagementPlaneSyncRecordImpl implements ManagementPlaneSyncRecord, Serializable {
+
+    private static final long serialVersionUID = -4207907303446336973L;
+
+    public static Builder builder() {
+        return new Builder();
+    }
+    
+    public static class Builder {
+        protected String masterNodeId;
+        protected final Map<String,ManagementNodeSyncRecord> nodes = MutableMap.of();
+        
+        public Builder masterNodeId(String val) {
+            masterNodeId = val; return this;
+        }
+        public Builder nodes(Iterable<ManagementNodeSyncRecord> vals) {
+            checkState(!Iterables.contains(checkNotNull(vals, "nodes must not be null"), null),  "nodes must not contain null: %s", vals);
+            for (ManagementNodeSyncRecord val: vals) nodes.put(val.getNodeId(), val);
+            return this;
+        }
+        public Builder node(ManagementNodeSyncRecord val) {
+            checkNotNull(val, "node must not be null"); 
+            nodes.put(val.getNodeId(), val);
+            return this;
+        }
+        public ManagementPlaneSyncRecord build() {
+            return new ManagementPlaneSyncRecordImpl(this);
+        }
+    }
+
+    private String masterNodeId;
+    private Map<String, ManagementNodeSyncRecord> managementNodes;
+    
+    private ManagementPlaneSyncRecordImpl(Builder builder) {
+        masterNodeId = builder.masterNodeId;
+        managementNodes = Maps.newLinkedHashMap();
+        for (ManagementNodeSyncRecord node : builder.nodes.values()) {
+            checkState(!managementNodes.containsKey(node.getNodeId()), "duplicate nodeId %s", node.getNodeId());
+            managementNodes.put(node.getNodeId(), node);
+        }
+    }
+
+    @Override
+    public String getMasterNodeId() {
+        return masterNodeId;
+    }
+    
+    @Override
+    public Map<String, ManagementNodeSyncRecord> getManagementNodes() {
+        return managementNodes;
+    }
+
+    @Override
+    public String toString() {
+        return Objects.toStringHelper(this)
+                .add("masterNodeId", masterNodeId)
+                .add("nodes", managementNodes.keySet())
+                .toString();
+    }
+
+    @Override
+    public String toVerboseString() {
+        return toString();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
index b5a5163..18e1540 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
@@ -69,7 +69,7 @@ import org.apache.brooklyn.entity.core.AbstractEntity;
 import org.apache.brooklyn.entity.core.EntityInternal;
 import org.apache.brooklyn.entity.drivers.BasicEntityDriverManager;
 import org.apache.brooklyn.entity.drivers.downloads.BasicDownloadsManager;
-import org.apache.brooklyn.location.basic.BasicLocationRegistry;
+import org.apache.brooklyn.location.core.BasicLocationRegistry;
 import org.apache.brooklyn.util.GroovyJavaMethods;
 import org.apache.brooklyn.util.collections.MutableList;
 import org.apache.brooklyn.util.collections.MutableMap;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java
index 303f387..132ac8f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java
@@ -39,8 +39,8 @@ import org.apache.brooklyn.core.objs.proxy.InternalLocationFactory;
 import org.apache.brooklyn.entity.lifecycle.Lifecycle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.brooklyn.location.basic.AbstractLocation;
-import org.apache.brooklyn.location.basic.LocationInternal;
+import org.apache.brooklyn.location.core.AbstractLocation;
+import org.apache.brooklyn.location.core.internal.LocationInternal;
 import org.apache.brooklyn.util.core.config.ConfigBag;
 import org.apache.brooklyn.util.core.task.Tasks;
 import org.apache.brooklyn.util.exceptions.Exceptions;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
index dd32548..e236546 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
@@ -45,9 +45,9 @@ import org.apache.brooklyn.entity.core.EntityInternal;
 import org.apache.brooklyn.entity.lifecycle.Lifecycle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.brooklyn.location.basic.AbstractLocation;
-import org.apache.brooklyn.location.basic.LocationConfigKeys;
-import org.apache.brooklyn.location.basic.LocationInternal;
+import org.apache.brooklyn.location.core.AbstractLocation;
+import org.apache.brooklyn.location.core.LocationConfigKeys;
+import org.apache.brooklyn.location.core.internal.LocationInternal;
 import org.apache.brooklyn.util.core.flags.TypeCoercions;
 import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.apache.brooklyn.util.javalang.Reflections;


Mime
View raw message