This closes #846
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0adf3fdd Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0adf3fdd Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0adf3fdd Branch: refs/heads/master Commit: 0adf3fdd9ab5204b4ff321532caaf0802006a2cf Parents: 1ae9aaa af1396f Author: Duncan Godwin <[email protected]> Authored: Mon Oct 2 13:49:44 2017 +0100 Committer: Duncan Godwin <[email protected]> Committed: Mon Oct 2 13:49:44 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/mgmt/rebind/RebindManager.java | 14 +- .../brooklyn/core/catalog/CatalogLoadMode.java | 73 --------- .../catalog/internal/CatalogInitialization.java | 88 +--------- .../NonDeploymentManagementContext.java | 19 --- .../rebind/ImmediateDeltaChangeListener.java | 160 ------------------- .../core/mgmt/rebind/RebindIteration.java | 60 ++----- .../core/mgmt/rebind/RebindManagerImpl.java | 30 ---- .../mgmt/rebind/dto/BasicEntityMemento.java | 2 +- .../mgmt/rebind/dto/MementosGenerators.java | 5 +- .../core/server/BrooklynServerConfig.java | 8 - .../core/mgmt/rebind/RebindCatalogItemTest.java | 2 - .../core/mgmt/rebind/RebindFailuresTest.java | 18 ++- .../core/mgmt/rebind/RebindFeedWithHaTest.java | 3 +- .../launcher/osgi/OsgiLauncherImpl.java | 2 +- .../BrooklynLauncherRebindCatalogTest.java | 2 +- .../brooklyn/launcher/BrooklynLauncherTest.java | 2 +- .../CleanOrphanedLocationsIntegrationTest.java | 2 +- .../main/java/org/apache/brooklyn/cli/Main.java | 21 +-- .../java/org/apache/brooklyn/cli/CliTest.java | 32 +--- 19 files changed, 45 insertions(+), 498 deletions(-) ----------------------------------------------------------------------
