This closes #646
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b08c4829 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b08c4829 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b08c4829 Branch: refs/heads/master Commit: b08c48298826126c2318560dc9ddbd24ce59fa73 Parents: eb4992e 88a09ba Author: Alex Heneveld <[email protected]> Authored: Fri Apr 21 23:55:00 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Apr 21 23:55:00 2017 +0100 ---------------------------------------------------------------------- .../internal/AbstractBrooklynObjectSpec.java | 211 ++++++++++---- .../mementos/BrooklynMementoManifest.java | 30 +- .../api/mgmt/rebind/mementos/Memento.java | 33 ++- .../brooklyn/api/objs/BrooklynObject.java | 19 ++ .../brooklyn/spi/creation/CampResolver.java | 2 +- .../brooklyn/camp/brooklyn/RebindOsgiTest.java | 54 ++++ .../catalog/CatalogOsgiYamlEntityTest.java | 59 +++- .../brooklyn/catalog/CatalogYamlEntityTest.java | 79 +++--- .../brooklyn/catalog/CatalogYamlRebindTest.java | 273 +++++++++---------- .../src/test/yaml/python-webserver.bom | 98 +++++++ .../core/catalog/internal/CatalogItemDo.java | 21 ++ .../internal/CatalogItemDtoAbstract.java | 5 +- .../core/catalog/internal/CatalogUtils.java | 26 +- .../internal/JavaCatalogToSpecTransformer.java | 8 +- .../apache/brooklyn/core/entity/Entities.java | 9 + .../access/PortForwardManagerClient.java | 6 + .../core/mgmt/EntityManagementUtils.java | 7 +- .../BrooklynClassLoadingContextSequential.java | 7 +- .../internal/AbstractManagementContext.java | 17 +- .../BrooklynMementoPersisterToObjectStore.java | 61 +++-- .../core/mgmt/rebind/RebindIteration.java | 233 ++++++++++------ .../core/mgmt/rebind/dto/AbstractMemento.java | 30 +- .../rebind/dto/BrooklynMementoManifestImpl.java | 5 +- .../rebind/dto/EntityMementoManifestImpl.java | 13 +- .../mgmt/rebind/dto/MementosGenerators.java | 5 +- .../rebind/transformer/CompoundTransformer.java | 30 +- .../core/objs/AbstractBrooklynObject.java | 60 +++- .../core/objs/AbstractEntityAdjunct.java | 8 +- .../core/objs/BrooklynObjectInternal.java | 9 + .../core/objs/proxy/InternalEntityFactory.java | 14 +- .../objs/proxy/InternalLocationFactory.java | 13 +- .../core/objs/proxy/InternalPolicyFactory.java | 24 +- .../resolve/entity/JavaEntitySpecResolver.java | 2 +- .../typereg/AbstractTypePlanTransformer.java | 3 +- .../brooklyn/util/core/ClassLoaderUtils.java | 40 ++- .../brooklyn/util/core/xstream/XmlUtil.java | 26 +- .../core/mgmt/osgi/OsgiStandaloneTest.java | 2 + .../rebind/RebindConfigInheritanceTest.java | 2 +- .../util/core/ClassLoaderUtilsTest.java | 3 +- .../brooklyn/util/osgi/OsgiTestResources.java | 2 + 40 files changed, 1079 insertions(+), 470 deletions(-) ----------------------------------------------------------------------
