brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [30/45] git commit: Merge remote-tracking branch 'apache-git/master' into osgi
Date Fri, 04 Jul 2014 09:51:12 GMT
Merge remote-tracking branch 'apache-git/master' into osgi


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

Branch: refs/heads/master
Commit: 492ccb7f8110b17a23e7befe32230b857a369cb0
Parents: 468d788 f28d9cc
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Jul 3 11:43:28 2014 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Jul 3 11:43:28 2014 +0100

----------------------------------------------------------------------
 api/src/main/java/brooklyn/entity/Entity.java   |  15 +-
 .../rebind/PersistenceExceptionHandler.java     |  32 +++
 .../brooklyn/entity/rebind/RebindContext.java   |   3 +-
 .../entity/rebind/RebindExceptionHandler.java   |  15 ++
 .../brooklyn/entity/rebind/RebindManager.java   |   2 +
 .../brooklyn/entity/rebind/RebindSupport.java   |   8 +-
 .../mementos/BrooklynMementoPersister.java      |   7 +-
 .../brooklyn/config/render/RendererHints.java   |  10 +
 .../brooklyn/entity/basic/AbstractEntity.java   |   9 +-
 .../entity/basic/AbstractGroupImpl.java         |   1 +
 .../brooklyn/entity/basic/DynamicGroup.java     |   5 +
 .../java/brooklyn/entity/basic/Entities.java    |   9 +
 .../brooklyn/entity/effector/Effectors.java     |   8 +-
 .../entity/group/QuarantineGroupImpl.java       |  15 +-
 .../rebind/BasicEnricherRebindSupport.java      |  13 +-
 .../entity/rebind/BasicEntityRebindSupport.java |  60 +++---
 .../rebind/BasicLocationRebindSupport.java      |  14 +-
 .../entity/rebind/BasicPolicyRebindSupport.java |  14 +-
 .../rebind/ImmediateDeltaChangeListener.java    |  22 ++-
 .../rebind/PeriodicDeltaChangeListener.java     |  24 +--
 .../rebind/PersistenceExceptionHandlerImpl.java | 102 ++++++++++
 .../entity/rebind/RebindContextImpl.java        |  21 +-
 .../rebind/RebindExceptionHandlerImpl.java      | 196 +++++++++++++++++--
 .../entity/rebind/RebindManagerImpl.java        | 103 ++++++++--
 .../AbstractBrooklynMementoPersister.java       |   5 +-
 .../BrooklynMementoPersisterInMemory.java       |  22 ++-
 .../BrooklynMementoPersisterToFile.java         |   9 +-
 .../BrooklynMementoPersisterToMultiFile.java    |  19 +-
 .../BrooklynMementoPersisterToObjectStore.java  |  54 ++---
 .../internal/BrooklynFeatureEnablement.java     |   8 +-
 .../management/internal/LocalEntityManager.java |  11 ++
 .../NonDeploymentManagementContext.java         |   6 +
 .../util/xstream/ImmutableListConverter.java    |  14 +-
 .../util/xstream/ImmutableMapConverter.java     |  38 ++++
 .../util/xstream/ImmutableSetConverter.java     |  36 ++++
 .../brooklyn/util/xstream/XmlSerializer.java    |   2 +
 .../brooklyn/entity/basic/DynamicGroupTest.java |  20 +-
 .../java/brooklyn/entity/group/GroupTest.java   | 105 ++++++++++
 .../entity/rebind/RebindFailuresTest.java       |  78 ++++++++
 .../brooklyn/entity/rebind/RebindGroupTest.java | 106 ++++++++++
 .../entity/rebind/RebindLocationTest.java       |   4 +-
 .../entity/rebind/RebindPolicyTest.java         |  55 ++++++
 .../entity/rebind/RebindTestFixture.java        |  31 +--
 .../brooklyn/entity/rebind/RebindTestUtils.java |   8 +-
 .../rebind/RecordingRebindExceptionHandler.java |   2 +-
 .../BrooklynMementoPersisterTestFixture.java    |   2 +-
 ...BrooklynMementoPersisterToMultiFileTest.java |   3 +-
 .../persister/XmlMementoSerializerTest.java     |  70 ++++++-
 .../HighAvailabilityManagerSplitBrainTest.java  |   3 +-
 .../ha/HighAvailabilityManagerTestFixture.java  |   3 +-
 .../AbstractWebAppFixtureIntegrationTest.java   |   5 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |   5 +-
 52 files changed, 1231 insertions(+), 201 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/492ccb7f/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/492ccb7f/usage/launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.java
----------------------------------------------------------------------
diff --cc usage/launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.java
index 9e8c01a,6cdcf04..7d94e9e
--- a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.java
+++ b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.java
@@@ -32,9 -32,10 +32,11 @@@ import brooklyn.entity.Application
  import brooklyn.entity.basic.ApplicationBuilder;
  import brooklyn.entity.basic.BrooklynShutdownHooks;
  import brooklyn.entity.basic.Entities;
 +import brooklyn.entity.basic.EntityInternal;
  import brooklyn.entity.basic.StartableApplication;
  import brooklyn.entity.proxying.EntitySpec;
+ import brooklyn.entity.rebind.PersistenceExceptionHandler;
+ import brooklyn.entity.rebind.PersistenceExceptionHandlerImpl;
  import brooklyn.entity.rebind.RebindManager;
  import brooklyn.entity.rebind.RebindManagerImpl;
  import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore;


Mime
View raw message