You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/17 09:19:36 UTC
[6/6] brooklyn-server git commit: This closes #852
This closes #852
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/efa4af66
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/efa4af66
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/efa4af66
Branch: refs/heads/master
Commit: efa4af664e5de3a412d955458d380b67719728f7
Parents: 7c6f7d4 48d9999
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Tue Oct 17 10:19:16 2017 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Tue Oct 17 10:19:16 2017 +0100
----------------------------------------------------------------------
.../brooklyn/api/catalog/BrooklynCatalog.java | 11 +
.../catalog/internal/BasicBrooklynCatalog.java | 36 ++
.../catalog/internal/CatalogInitialization.java | 462 +++++++++++--------
.../internal/AbstractManagementContext.java | 8 +-
.../mgmt/internal/LocalManagementContext.java | 4 -
.../rebind/PeriodicDeltaChangeListener.java | 2 -
.../core/mgmt/rebind/RebindIteration.java | 37 +-
.../ha/HighAvailabilityManagerTestFixture.java | 3 +-
.../mgmt/rebind/RebindCatalogEntityTest.java | 153 ------
.../core/mgmt/rebind/RebindEntityTest.java | 2 +
.../rebind/RebindHistoricCatalogItemTest.java | 53 +++
.../core/mgmt/rebind/RebindTestFixture.java | 11 -
.../core/mgmt/rebind/RebindTestUtils.java | 3 +
.../entity/LocalManagementContextForTests.java | 12 +
.../core/mgmt/rebind/catalog-myapp_1.0.0 | 36 ++
.../brooklyn/launcher/common/BasicLauncher.java | 125 ++---
launcher/pom.xml | 7 +
.../AbstractBrooklynLauncherRebindTest.java | 177 +++++++
.../BrooklynLauncherHighAvailabilityTest.java | 118 +----
.../BrooklynLauncherRebindAppsTest.java | 42 ++
.../BrooklynLauncherRebindCatalogOsgiTest.java | 219 +++++++++
.../BrooklynLauncherRebindCatalogTest.java | 140 +++---
.../brooklyn/launcher/BrooklynLauncherTest.java | 10 +-
.../resources/rebind-test-empty-catalog.bom | 22 +
.../rest/testing/BrooklynRestApiTest.java | 4 +-
.../brooklyn/rest/BrooklynRestApiLauncher.java | 3 +-
.../brooklyn/rest/HaMasterCheckFilterTest.java | 9 +-
.../main/java/org/apache/brooklyn/cli/Main.java | 76 +--
28 files changed, 1057 insertions(+), 728 deletions(-)
----------------------------------------------------------------------