brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [14/15] git commit: This closes #197
Date Wed, 01 Oct 2014 18:03:14 GMT
This closes #197


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1f2a378b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1f2a378b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1f2a378b

Branch: refs/heads/master
Commit: 1f2a378bd4a0d74759d79cfd87f27c2b1738b5e8
Parents: 8a1fd77 6ba1639
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Oct 1 18:31:36 2014 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Oct 1 18:31:36 2014 +0100

----------------------------------------------------------------------
 api/src/main/java/brooklyn/entity/Entity.java   |  10 +-
 .../brooklyn/entity/rebind/RebindContext.java   |   4 +
 .../entity/rebind/RebindExceptionHandler.java   |  19 +-
 .../brooklyn/entity/rebind/RebindManager.java   |  54 +-
 .../brooklyn/entity/rebind/RebindSupport.java   |   2 +-
 .../brooklyn/management/ExecutionContext.java   |   8 +
 .../brooklyn/management/LocationManager.java    |   3 -
 .../brooklyn/management/ManagementContext.java  |  15 +
 api/src/main/java/brooklyn/management/Task.java |   8 +
 .../management/ha/HighAvailabilityManager.java  |  16 +-
 .../management/ha/HighAvailabilityMode.java     |  12 +-
 .../management/ha/ManagementNodeState.java      |  14 +
 .../management/ha/ManagementNodeSyncRecord.java |   2 +
 .../ha/ManagementPlaneSyncRecordPersister.java  |   1 +
 .../mementos/BrooklynMementoPersister.java      |   3 +
 .../brooklyn/enricher/basic/Transformer.java    |   1 +
 .../brooklyn/entity/basic/AbstractEntity.java   | 115 ++--
 .../entity/basic/AbstractGroupImpl.java         |  25 +-
 .../brooklyn/entity/basic/BrooklynTaskTags.java |   4 +
 .../java/brooklyn/entity/basic/Entities.java    |  22 +-
 .../brooklyn/entity/basic/EntityInternal.java   |   6 +-
 .../basic/EntityTransientCopyInternal.java      | 106 ++++
 .../entity/basic/ServiceStateLogic.java         |   6 +-
 .../entity/proxying/EntityProxyImpl.java        | 119 +++-
 .../entity/proxying/InternalEntityFactory.java  |  30 +-
 .../AbstractBrooklynObjectRebindSupport.java    |   3 +-
 .../entity/rebind/BasicEntityRebindSupport.java |   8 +-
 .../rebind/PeriodicDeltaChangeListener.java     |  54 +-
 .../entity/rebind/RebindContextImpl.java        |  12 +
 .../rebind/RebindExceptionHandlerImpl.java      |  37 +-
 .../entity/rebind/RebindManagerImpl.java        | 324 +++++++++--
 .../AbstractBrooklynMementoPersister.java       |   9 +-
 .../BrooklynMementoPersisterToMultiFile.java    |   8 +
 .../BrooklynMementoPersisterToObjectStore.java  |  70 ++-
 .../persister/RetryingMementoSerializer.java    |   4 +
 .../dto/BasicManagementNodeSyncRecord.java      |  22 +-
 .../brooklyn/event/basic/BasicSensorEvent.java  |  20 +-
 .../internal/BrooklynFeatureEnablement.java     |  18 +
 .../location/basic/AbstractLocation.java        |  67 +--
 .../location/basic/LocationInternal.java        |   1 -
 .../management/ha/BasicMasterChooser.java       | 158 +++++-
 .../ha/HighAvailabilityManagerImpl.java         | 241 ++++++--
 .../ha/ManagementPlaneSyncRecordDeltaImpl.java  |  11 +-
 ...ntPlaneSyncRecordPersisterToObjectStore.java |  15 +-
 .../internal/AbstractManagementContext.java     |  24 +-
 .../internal/BrooklynGarbageCollector.java      |   1 +
 .../internal/EntityManagementSupport.java       |  68 ++-
 .../internal/EntityManagerInternal.java         |  15 +
 .../management/internal/LocalAccessManager.java |   1 -
 .../management/internal/LocalEntityManager.java | 246 ++++++--
 .../internal/LocalLocationManager.java          | 171 ++++--
 .../internal/LocalManagementContext.java        |   4 +-
 .../internal/LocationManagerInternal.java       |  40 ++
 .../internal/ManagementTransitionInfo.java      |  30 +-
 .../internal/NonDeploymentEntityManager.java    |  39 ++
 .../internal/NonDeploymentLocationManager.java  |  51 +-
 .../NonDeploymentManagementContext.java         |  67 ++-
 .../util/task/AbstractExecutionContext.java     |   7 +-
 .../util/task/BasicExecutionContext.java        |   7 +-
 .../main/java/brooklyn/util/task/BasicTask.java |   2 +-
 .../java/brooklyn/util/task/ScheduledTask.java  |  18 +
 .../src/main/java/brooklyn/util/task/Tasks.java |  51 ++
 .../entity/rebind/RebindCatalogEntityTest.java  |   5 +-
 .../entity/rebind/RebindEntityTest.java         |   7 +-
 .../entity/rebind/RebindFailuresTest.java       |  33 +-
 .../entity/rebind/RebindTestFixture.java        |   4 +-
 .../brooklyn/entity/rebind/RebindTestUtils.java |  22 +-
 .../rebind/RecordingRebindExceptionHandler.java |   5 -
 ...BrooklynMementoPersisterToMultiFileTest.java |   2 +-
 .../transformer/CompoundTransformerTest.java    |   1 +
 .../ha/HighAvailabilityManagerInMemoryTest.java |   4 +
 .../HighAvailabilityManagerSplitBrainTest.java  |  51 +-
 .../ha/HighAvailabilityManagerTestFixture.java  |  14 +-
 .../brooklyn/management/ha/HotStandbyTest.java  | 564 +++++++++++++++++++
 .../management/ha/MasterChooserTest.java        |  71 ++-
 .../brooklyn/management/ha/WarmStandbyTest.java | 150 +++++
 .../entity/TestApplicationNoEnrichersImpl.java  |  15 -
 .../util/task/ScheduledExecutionTest.java       | 159 +++++-
 .../entity/proxy/nginx/UrlMappingImpl.java      |   7 +-
 .../brooklyn/entity/proxy/UrlMappingTest.java   |   8 +
 .../AbstractWebAppFixtureIntegrationTest.java   |   5 +-
 usage/cli/src/main/java/brooklyn/cli/Main.java  |  12 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |   7 +-
 .../BrooklynLauncherHighAvailabilityTest.java   |  25 +-
 ...lynLauncherRebindToCloudObjectStoreTest.java |   4 -
 .../brooklyn/util/exceptions/Exceptions.java    |  30 +-
 .../util/text/NaturalOrderComparator.java       |   3 +-
 .../main/java/brooklyn/util/time/Duration.java  |  12 +
 88 files changed, 3152 insertions(+), 597 deletions(-)
----------------------------------------------------------------------



Mime
View raw message