This closes #506
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4fc5a07f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4fc5a07f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4fc5a07f Branch: refs/heads/master Commit: 4fc5a07ffeebd5dd172d328f44b6d2175693837a Parents: 4027986 b13cb63 Author: Alex Heneveld <[email protected]> Authored: Mon Feb 9 15:36:05 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Feb 9 15:36:05 2015 +0000 ---------------------------------------------------------------------- .../basic/AbstractBrooklynObjectSpec.java | 17 ++ .../java/brooklyn/management/EntityManager.java | 2 + .../src/main/java/brooklyn/BrooklynVersion.java | 219 +++++++++++++--- .../brooklyn/entity/basic/AbstractEntity.java | 4 +- .../entity/group/DynamicClusterImpl.java | 21 +- .../entity/proxying/EntityProxyImpl.java | 2 +- .../entity/proxying/InternalEntityFactory.java | 12 +- .../rebind/ActivePartialRebindIteration.java | 163 ++++++++++++ .../rebind/InitialFullRebindIteration.java | 130 +++++++++ .../entity/rebind/RebindContextImpl.java | 13 +- .../rebind/RebindContextLookupContext.java | 23 +- .../brooklyn/entity/rebind/RebindIteration.java | 262 +++++++++---------- .../entity/rebind/RebindManagerImpl.java | 80 ++++-- .../BrooklynMementoPersisterToObjectStore.java | 4 + .../rebind/persister/XmlMementoSerializer.java | 161 +++++++++++- .../ha/HighAvailabilityManagerImpl.java | 10 +- .../brooklyn/management/ha/OsgiManager.java | 18 +- .../internal/AbstractManagementContext.java | 6 +- .../internal/BrooklynObjectManagementMode.java | 31 +++ .../internal/BrooklynObjectManagerInternal.java | 36 +++ .../internal/EntityManagementSupport.java | 6 +- .../internal/EntityManagerInternal.java | 15 +- .../management/internal/LocalEntityManager.java | 62 +++-- .../internal/LocalLocationManager.java | 49 ++-- .../internal/LocationManagerInternal.java | 14 +- .../internal/ManagementTransitionInfo.java | 39 +-- .../internal/ManagementTransitionMode.java | 127 +++++++++ .../internal/NonDeploymentEntityManager.java | 1 - .../internal/NonDeploymentLocationManager.java | 1 - .../main/java/brooklyn/util/http/HttpTool.java | 5 + .../osgi/tests/more/MoreEntityImpl.java | 2 +- .../osgi/tests/more/MoreEntityImpl.java | 2 +- .../osgi/tests/more/MoreEntityImpl.java | 2 +- .../test/java/brooklyn/BrooklynVersionTest.java | 49 +++- .../catalog/internal/CatalogTestUtils.java | 46 ++++ .../entity/group/DynamicClusterTest.java | 14 + .../entity/rebind/ActivePartialRebindTest.java | 108 ++++++++ .../rebind/ActivePartialRebindVersionTest.java | 119 +++++++++ .../entity/rebind/RebindEntityTest.java | 27 +- .../rebind/RebindLocalhostLocationTest.java | 22 ++ .../entity/rebind/RebindTestFixture.java | 23 +- .../brooklyn/entity/rebind/RebindTestUtils.java | 8 +- .../BrooklynMementoPersisterTestFixture.java | 6 +- .../persister/XmlMementoSerializerTest.java | 31 +++ .../ha/HighAvailabilityManagerInMemoryTest.java | 21 +- .../osgi/OsgiVersionMoreEntityTest.java | 61 +++-- .../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 12452 -> 12428 bytes .../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 12615 -> 12590 bytes ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 12757 -> 12729 bytes .../entity/database/mysql/MySqlNodeImpl.java | 2 +- .../main/java/brooklyn/cli/AbstractMain.java | 14 +- usage/cli/src/main/java/brooklyn/cli/Main.java | 26 +- .../cli/src/test/java/brooklyn/cli/CliTest.java | 2 +- .../brooklyn/cli/CloudExplorerLiveTest.java | 11 +- .../brooklyn/launcher/BrooklynLauncher.java | 15 +- .../brooklyn/launcher/BrooklynWebServer.java | 13 +- .../brooklyn/launcher/WebAppRunnerTest.java | 4 +- .../java/brooklyn/rest/BrooklynWebConfig.java | 7 +- .../brooklyn/rest/resources/ScriptResource.java | 1 + .../brooklyn/rest/resources/ServerResource.java | 15 ++ .../provider/ExplicitUsersSecurityProvider.java | 2 + .../rest/util/BrooklynRestResourceUtils.java | 2 +- .../main/java/brooklyn/test/HttpTestUtils.java | 4 +- .../brooklyn/util/exceptions/Exceptions.java | 8 +- 64 files changed, 1787 insertions(+), 413 deletions(-) ----------------------------------------------------------------------
