This closes #867
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8d7444ae Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8d7444ae Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8d7444ae Branch: refs/heads/master Commit: 8d7444aeaf08680b97662e1d016f423085d3b0bf Parents: 5eb08b2 8a2d51e Author: Alex Heneveld <[email protected]> Authored: Sat Oct 28 11:02:41 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Sat Oct 28 11:02:41 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/mgmt/rebind/RebindManager.java | 9 +- .../rebind/mementos/ManagedBundleMemento.java | 5 + .../camp/brooklyn/AbstractYamlTest.java | 2 +- .../catalog/CatalogOsgiYamlEntityTest.java | 2 +- .../catalog/CatalogOsgiYamlVersioningTest.java | 2 +- .../brooklyn/test/lite/CampYamlLiteTest.java | 2 +- .../catalog/internal/BasicBrooklynCatalog.java | 2 +- .../catalog/internal/CatalogInitialization.java | 37 +- .../mgmt/ha/HighAvailabilityManagerImpl.java | 13 +- .../core/mgmt/ha/OsgiArchiveInstaller.java | 265 ++++++++--- .../brooklyn/core/mgmt/ha/OsgiManager.java | 33 ++ .../NonDeploymentManagementContext.java | 5 + .../rebind/PeriodicDeltaChangeListener.java | 19 +- .../core/mgmt/rebind/RebindIteration.java | 2 +- .../core/mgmt/rebind/RebindManagerImpl.java | 5 + .../rebind/dto/BasicManagedBundleMemento.java | 20 +- .../core/server/BrooklynServerConfig.java | 13 + .../core/typereg/BasicManagedBundle.java | 23 +- .../core/mgmt/ha/OsgiArchiveInstallerTest.java | 83 ++++ .../core/mgmt/rebind/RebindTestFixture.java | 13 +- .../AbstractBrooklynLauncherRebindTest.java | 68 ++- .../BrooklynLauncherRebindCatalogOsgiTest.java | 476 ++++++++++++++++++- 22 files changed, 998 insertions(+), 101 deletions(-) ----------------------------------------------------------------------
