You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/09/23 19:50:21 UTC
[11/13] git commit: This closes #175
This closes #175
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e6882607
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e6882607
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e6882607
Branch: refs/heads/master
Commit: e6882607198fb61377c9c66ca0b8448e8ec6659f
Parents: 472c06f d160d16
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 23 18:41:58 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Sep 23 18:41:58 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/catalog/BrooklynCatalog.java | 14 +-
.../main/java/brooklyn/catalog/CatalogItem.java | 40 ++--
.../entity/rebind/BrooklynObjectType.java | 1 +
.../brooklyn/entity/rebind/RebindContext.java | 3 +
.../entity/rebind/RebindExceptionHandler.java | 6 +
.../java/brooklyn/mementos/BrooklynMemento.java | 9 +-
.../mementos/BrooklynMementoManifest.java | 2 +
.../mementos/BrooklynMementoPersister.java | 4 +
.../brooklyn/mementos/CatalogItemMemento.java | 49 ++++
.../brooklyn/basic/AbstractBrooklynObject.java | 78 ++++---
.../java/brooklyn/catalog/CatalogLoadMode.java | 71 ++++++
.../catalog/internal/BasicBrooklynCatalog.java | 143 ++++++++++--
.../catalog/internal/CatalogClasspathDo.java | 2 +-
.../internal/CatalogConfigurationDto.java | 2 +-
.../brooklyn/catalog/internal/CatalogDo.java | 134 +++++++----
.../brooklyn/catalog/internal/CatalogDto.java | 25 +-
.../catalog/internal/CatalogItemBuilder.java | 8 +-
.../catalog/internal/CatalogItemDo.java | 26 ++-
.../internal/CatalogItemDtoAbstract.java | 174 +++++++++++---
.../brooklyn/catalog/internal/CatalogItems.java | 74 ------
.../catalog/internal/CatalogLibrariesDto.java | 10 +-
.../catalog/internal/CatalogXmlSerializer.java | 7 +
.../brooklyn/config/BrooklynServerConfig.java | 76 +++---
.../rebind/BasicCatalogItemRebindSupport.java | 71 ++++++
.../rebind/BasicEnricherRebindSupport.java | 7 +-
.../rebind/ImmediateDeltaChangeListener.java | 6 +
.../rebind/PeriodicDeltaChangeListener.java | 24 +-
.../entity/rebind/PersisterDeltaImpl.java | 31 ++-
.../entity/rebind/RebindContextImpl.java | 17 +-
.../rebind/RebindContextLookupContext.java | 10 +
.../rebind/RebindExceptionHandlerImpl.java | 33 ++-
.../entity/rebind/RebindManagerImpl.java | 105 ++++++++-
.../rebind/dto/BasicCatalogItemMemento.java | 231 +++++++++++++++++++
.../entity/rebind/dto/BrooklynMementoImpl.java | 37 ++-
.../rebind/dto/BrooklynMementoManifestImpl.java | 27 ++-
.../entity/rebind/dto/MementosGenerators.java | 24 +-
.../rebind/dto/MutableBrooklynMemento.java | 46 +++-
.../AbstractBrooklynMementoPersister.java | 6 +
.../BrooklynMementoPersisterInMemory.java | 6 +
.../BrooklynMementoPersisterToMultiFile.java | 73 +++++-
.../BrooklynMementoPersisterToObjectStore.java | 73 ++++--
.../rebind/persister/FileBasedObjectStore.java | 3 +-
.../persister/FileBasedStoreObjectAccessor.java | 4 -
.../persister/StoreObjectAccessorLocking.java | 3 +-
.../rebind/persister/XmlMementoSerializer.java | 21 +-
.../internal/BrooklynFeatureEnablement.java | 5 +-
.../ha/HighAvailabilityManagerImpl.java | 4 +-
...ntPlaneSyncRecordPersisterToObjectStore.java | 2 +-
.../brooklyn/management/ha/OsgiManager.java | 5 +-
.../internal/AbstractManagementContext.java | 53 ++---
.../brooklyn/camp/lite/CampYamlLiteTest.java | 125 +++++-----
.../catalog/internal/CatalogDtoTest.java | 46 ++--
.../brooklyn/catalog/internal/CatalogItems.java | 79 +++++++
.../catalog/internal/CatalogLoadTest.java | 2 +-
.../entity/rebind/RebindCatalogEntityTest.java | 7 +
.../entity/rebind/RebindCatalogItemTest.java | 172 ++++++++++++++
...talogWhenCatalogPersistenceDisabledTest.java | 94 ++++++++
.../entity/rebind/RebindLocationTest.java | 2 +-
.../entity/rebind/RebindTestFixture.java | 68 +++++-
.../brooklyn/entity/rebind/RebindTestUtils.java | 30 ++-
.../persister/XmlMementoSerializerTest.java | 69 +++++-
.../rebind/rebind-catalog-item-test-catalog.xml | 28 +++
.../policy/ha/ServiceFailureDetector.java | 2 +-
.../webapp/ControlledDynamicWebAppCluster.java | 3 +-
.../entity/webapp/DynamicWebAppCluster.java | 6 +-
usage/cli/src/main/java/brooklyn/cli/Main.java | 3 +-
.../assets/tpl/catalog/details-entity.html | 2 +-
.../brooklyn/launcher/BrooklynLauncher.java | 35 ++-
.../rest/resources/CatalogResource.java | 2 +-
.../rest/resources/CatalogResourceTest.java | 9 +-
70 files changed, 2150 insertions(+), 519 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6882607/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java
----------------------------------------------------------------------