You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/08/01 22:13:02 UTC
[7/8] git commit: This closes #69
This closes #69
Conflicts:
core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java - imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/491eb609
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/491eb609
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/491eb609
Branch: refs/heads/master
Commit: 491eb609c01f6a285f226f043f6ee1512cfca820
Parents: d67444a 0194580
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Aug 1 16:11:53 2014 -0400
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Aug 1 16:11:53 2014 -0400
----------------------------------------------------------------------
.../java/brooklyn/basic/BrooklynObject.java | 31 +++
api/src/main/java/brooklyn/entity/Entity.java | 10 +-
.../brooklyn/entity/proxying/EntitySpec.java | 7 +
.../entity/rebind/BrooklynObjectType.java | 30 +++
.../rebind/PersistenceExceptionHandler.java | 13 +-
.../entity/rebind/RebindExceptionHandler.java | 43 +---
.../main/java/brooklyn/location/Location.java | 5 +-
.../java/brooklyn/location/LocationSpec.java | 7 +
api/src/main/java/brooklyn/policy/Enricher.java | 3 +
.../java/brooklyn/policy/EntityAdjunct.java | 9 +-
api/src/main/java/brooklyn/policy/Policy.java | 3 +
.../brooklyn/basic/AbstractBrooklynObject.java | 33 +++
.../brooklyn/basic/BrooklynObjectInternal.java | 24 ++
.../brooklyn/entity/basic/AbstractEntity.java | 61 ++---
.../brooklyn/entity/basic/EntityFunctions.java | 7 +-
.../brooklyn/entity/basic/EntityInternal.java | 3 +-
.../brooklyn/entity/basic/PolicyDescriptor.java | 2 +-
.../entity/proxying/InternalEntityFactory.java | 186 ++++++--------
.../entity/proxying/InternalFactory.java | 131 ++++++++++
.../proxying/InternalLocationFactory.java | 78 +-----
.../entity/proxying/InternalPolicyFactory.java | 109 +--------
.../rebind/BasicEnricherRebindSupport.java | 2 +-
.../entity/rebind/BasicPolicyRebindSupport.java | 2 +-
.../rebind/PeriodicDeltaChangeListener.java | 8 +-
.../rebind/PersistenceExceptionHandlerImpl.java | 29 +--
.../rebind/RebindExceptionHandlerImpl.java | 244 ++++---------------
.../entity/rebind/RebindManagerImpl.java | 74 ++----
.../entity/rebind/dto/BrooklynMementoImpl.java | 20 +-
.../entity/rebind/dto/MementosGenerators.java | 4 +-
.../BrooklynMementoPersisterToFile.java | 1 +
.../BrooklynMementoPersisterToMultiFile.java | 20 +-
.../BrooklynMementoPersisterToObjectStore.java | 97 +++-----
.../location/basic/AbstractLocation.java | 49 ++--
.../location/basic/LocationInternal.java | 3 +-
.../policy/basic/AbstractEntityAdjunct.java | 35 +--
.../brooklyn/entity/basic/DynamicGroupTest.java | 2 +-
.../brooklyn/entity/basic/EntitySpecTest.java | 4 +-
.../entity/rebind/RebindFailuresTest.java | 17 +-
.../rebind/RecordingRebindExceptionHandler.java | 113 ++-------
.../loadbalancing/LoadBalancingPolicy.java | 2 +-
.../autoscaling/AutoScalerPolicyRebindTest.java | 2 +-
.../BrooklynComponentTemplateResolver.java | 13 -
.../rest/transform/PolicyTransformer.java | 2 +-
.../rest/util/BrooklynRestResourceUtils.java | 2 +-
.../util/BrooklynRestResourceUtilsTest.java | 2 +-
45 files changed, 641 insertions(+), 901 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/491eb609/api/src/main/java/brooklyn/entity/proxying/EntitySpec.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/491eb609/api/src/main/java/brooklyn/location/LocationSpec.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/491eb609/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/491eb609/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java
----------------------------------------------------------------------
diff --cc core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java
index d6a31fb,7abf68f..4d53fbb
--- a/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java
+++ b/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java
@@@ -29,7 -30,7 +30,8 @@@ import org.slf4j.LoggerFactory
import brooklyn.config.ConfigKey;
import brooklyn.entity.Entity;
+import brooklyn.entity.Group;
+ import brooklyn.entity.basic.AbstractApplication;
import brooklyn.entity.basic.AbstractEntity;
import brooklyn.entity.basic.BrooklynTaskTags;
import brooklyn.entity.basic.EntityInternal;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/491eb609/core/src/main/java/brooklyn/location/basic/AbstractLocation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/491eb609/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/491eb609/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/491eb609/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/491eb609/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java
----------------------------------------------------------------------