This closes #303
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/04ce06b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/04ce06b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/04ce06b9 Branch: refs/heads/master Commit: 04ce06b97d3f1f0225dc3c994a55a04fdd0f9f71 Parents: 083ede8 45fa39b Author: Alex Heneveld <[email protected]> Authored: Thu Nov 6 10:36:35 2014 +0000 Committer: Alex Heneveld <[email protected]> Committed: Thu Nov 6 10:36:35 2014 +0000 ---------------------------------------------------------------------- .../entity/rebind/BrooklynObjectType.java | 28 +- .../mementos/BrooklynMementoPersister.java | 35 ++- .../mementos/BrooklynMementoRawData.java | 43 +++ .../catalog/internal/BasicBrooklynCatalog.java | 6 +- .../brooklyn/catalog/internal/CatalogDo.java | 3 +- .../brooklyn/catalog/internal/CatalogDto.java | 11 +- .../catalog/internal/CatalogItemDo.java | 3 +- .../catalog/internal/CatalogLibrariesDto.java | 7 +- .../brooklyn/catalog/internal/CatalogUtils.java | 32 +- .../java/brooklyn/config/BrooklynLogging.java | 46 +++ .../basic/AbstractMultipleSensorAggregator.java | 7 +- .../brooklyn/enricher/basic/Aggregator.java | 8 +- .../brooklyn/entity/basic/AbstractEntity.java | 32 +- .../brooklyn/entity/basic/DynamicGroupImpl.java | 5 +- .../entity/basic/ServiceStateLogic.java | 10 +- .../group/AbstractMembershipTrackingPolicy.java | 4 +- .../rebind/PeriodicDeltaChangeListener.java | 6 +- .../entity/rebind/PersisterDeltaImpl.java | 31 ++ .../rebind/RebindExceptionHandlerImpl.java | 6 +- .../entity/rebind/RebindManagerImpl.java | 147 +++++---- .../rebind/dto/BrooklynMementoManifestImpl.java | 15 + .../AbstractBrooklynMementoPersister.java | 18 +- .../BrooklynMementoPersisterInMemory.java | 5 +- .../BrooklynMementoPersisterToMultiFile.java | 16 + .../BrooklynMementoPersisterToObjectStore.java | 303 ++++++++----------- .../java/brooklyn/event/basic/AttributeMap.java | 6 +- .../ha/HighAvailabilityManagerImpl.java | 10 +- .../ha/ManagementPlaneSyncRecordDeltaImpl.java | 11 + ...ntPlaneSyncRecordPersisterToObjectStore.java | 12 +- .../brooklyn/management/ha/OsgiManager.java | 11 +- .../management/internal/LocalEntityManager.java | 12 +- .../internal/LocalLocationManager.java | 12 +- .../management/usage/LocationUsage.java | 2 +- .../entity/rebind/RebindFailuresTest.java | 3 +- .../entity/rebind/RebindTestFixture.java | 2 +- .../rebind/RecordingRebindExceptionHandler.java | 6 +- .../BrooklynMementoPersisterTestFixture.java | 2 +- .../brooklyn/location/jclouds/JcloudsUtil.java | 2 +- .../java/brooklyn/util/javalang/Equals.java | 59 ++++ .../src/main/java/brooklyn/util/time/Time.java | 4 +- .../test/java/brooklyn/util/time/TimeTest.java | 4 +- 41 files changed, 677 insertions(+), 308 deletions(-) ----------------------------------------------------------------------
