This closes #872
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/48f09007 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/48f09007 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/48f09007 Branch: refs/heads/master Commit: 48f0900712b26de9892c696a537b81f45a61da38 Parents: 43a861c c840fbe Author: Alex Heneveld <[email protected]> Authored: Wed Nov 1 15:50:43 2017 +0000 Committer: Alex Heneveld <[email protected]> Committed: Wed Nov 1 15:50:43 2017 +0000 ---------------------------------------------------------------------- .../brooklyn/api/mgmt/ManagementContext.java | 11 +- .../api/mgmt/ha/HighAvailabilityManager.java | 9 + .../CatalogOsgiVersionMoreEntityRebindTest.java | 2 +- .../catalog/internal/CatalogInitialization.java | 20 +- .../mgmt/ha/HighAvailabilityManagerImpl.java | 17 +- .../core/mgmt/ha/OsgiArchiveInstaller.java | 8 + .../brooklyn/core/mgmt/ha/OsgiManager.java | 7 + .../mgmt/internal/LocalManagementContext.java | 33 +- .../NonDeploymentManagementContext.java | 9 +- .../mgmt/rebind/RebindExceptionHandlerImpl.java | 4 +- .../core/mgmt/rebind/RebindIteration.java | 44 +- .../core/mgmt/rebind/RebindManagerImpl.java | 4 + .../core/typereg/BasicBrooklynTypeRegistry.java | 70 +- .../core/typereg/BundleUpgradeParser.java | 390 +++++++- .../core/typereg/RegisteredTypePredicates.java | 20 +- .../core/typereg/BundleUpgradeParserTest.java | 226 ++++- .../AbstractBrooklynLauncherRebindTest.java | 21 +- .../BrooklynLauncherRebindCatalogOsgiTest.java | 930 ++++++++++++------- .../BrooklynLauncherUpgradeCatalogOsgiTest.java | 42 + .../java/org/apache/brooklyn/cli/CliTest.java | 3 +- utils/common/dependencies/osgi/README.md | 2 + .../brooklyn-test-osgi-com-example-entities.jar | Bin 22115 -> 22125 bytes .../osgi/brooklyn-test-osgi-entities.jar | Bin 22878 -> 22889 bytes .../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 15983 -> 15996 bytes .../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 16958 -> 16957 bytes ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14146 -> 14144 bytes 26 files changed, 1410 insertions(+), 462 deletions(-) ----------------------------------------------------------------------
