This closes #987 Introduce relationships between brooklyn objects
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/52241ae6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/52241ae6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/52241ae6 Branch: refs/heads/master Commit: 52241ae613db56707b21a50696c531dbf6780e89 Parents: c6273b8 05f91af Author: Svetoslav Neykov <[email protected]> Authored: Tue Oct 27 16:47:19 2015 +0200 Committer: Svetoslav Neykov <[email protected]> Committed: Tue Oct 27 16:47:19 2015 +0200 ---------------------------------------------------------------------- .../basic/relations/RelationshipType.java | 38 ++++ .../org/apache/brooklyn/api/entity/Entity.java | 11 +- .../apache/brooklyn/api/location/Location.java | 11 +- .../api/mgmt/rebind/RebindExceptionHandler.java | 5 + .../mementos/BrooklynMementoPersister.java | 5 +- .../api/mgmt/rebind/mementos/Memento.java | 4 +- .../brooklyn/api/objs/BrooklynObject.java | 26 +++ .../apache/brooklyn/api/objs/Configurable.java | 6 + .../org/apache/brooklyn/api/policy/Policy.java | 9 +- .../apache/brooklyn/api/sensor/Enricher.java | 15 +- .../org/apache/brooklyn/api/sensor/Feed.java | 4 + .../core/catalog/internal/CatalogItemDo.java | 21 ++- .../internal/CatalogItemDtoAbstract.java | 18 +- .../core/enricher/AbstractEnricher.java | 6 + .../brooklyn/core/entity/AbstractEntity.java | 9 +- .../brooklyn/core/entity/EntityInternal.java | 3 + .../brooklyn/core/entity/EntityRelations.java | 180 ++++++++++++++++++ .../apache/brooklyn/core/feed/AbstractFeed.java | 6 + .../core/location/AbstractLocation.java | 8 +- .../access/PortForwardManagerClient.java | 5 + .../location/internal/LocationInternal.java | 3 + .../AbstractBrooklynObjectRebindSupport.java | 27 +++ .../mgmt/rebind/RebindContextLookupContext.java | 18 ++ .../mgmt/rebind/RebindExceptionHandlerImpl.java | 17 +- .../core/mgmt/rebind/dto/AbstractMemento.java | 47 ++--- .../mgmt/rebind/dto/BasicEnricherMemento.java | 1 - .../mgmt/rebind/dto/BasicEntityMemento.java | 2 - .../core/mgmt/rebind/dto/BasicFeedMemento.java | 1 - .../mgmt/rebind/dto/BasicLocationMemento.java | 1 - .../mgmt/rebind/dto/BasicPolicyMemento.java | 1 - .../mgmt/rebind/dto/MementosGenerators.java | 13 +- .../core/objs/AbstractBrooklynObject.java | 25 ++- .../core/objs/AbstractEntityAdjunct.java | 3 +- .../core/objs/BrooklynObjectInternal.java | 11 +- .../brooklyn/core/policy/AbstractPolicy.java | 6 + .../relations/AbstractBasicRelationSupport.java | 63 +++++++ .../relations/ByObjectBasicRelationSupport.java | 104 ++++++++++ .../core/relations/EmptyRelationSupport.java | 60 ++++++ .../core/relations/RelationshipTypes.java | 188 +++++++++++++++++++ .../stock/SensorPropagatingEnricher.java | 2 +- .../entity/group/AbstractGroupImpl.java | 2 + .../util/core/xstream/XmlSerializer.java | 3 +- .../effector/EffectorSayHiGroovyTest.groovy | 2 +- .../mgmt/persist/XmlMementoSerializerTest.java | 23 ++- .../rebind/RebindClassInitializationTest.java | 78 ++++++++ .../core/mgmt/rebind/RebindEntityTest.java | 3 +- .../relations/RelationsEntityBasicTest.java | 55 ++++++ .../relations/RelationsEntityRebindTest.java | 51 +++++ .../core/relations/RelationshipTest.java | 58 ++++++ .../util/core/internal/FlagUtilsTest.java | 5 + .../VanillaSoftwareProcessIntegrationTest.java | 2 +- .../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 5 + 52 files changed, 1181 insertions(+), 89 deletions(-) ----------------------------------------------------------------------
