This closes #911
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f34f0433 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f34f0433 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f34f0433 Branch: refs/heads/master Commit: f34f0433bd945dd09f054639b6e3ba00dbefa0b9 Parents: 93f6f0f a63b8cf Author: Aled Sage <aled.s...@gmail.com> Authored: Wed Sep 23 11:51:39 2015 +0100 Committer: Aled Sage <aled.s...@gmail.com> Committed: Wed Sep 23 11:51:39 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/api/catalog/CatalogItem.java | 12 + .../org/apache/brooklyn/api/entity/Entity.java | 124 ++++- .../apache/brooklyn/api/entity/EntityLocal.java | 45 +- .../brooklyn/api/mgmt/ManagementContext.java | 9 + .../brooklyn/api/objs/BrooklynObject.java | 73 ++- .../core/catalog/internal/CatalogItemDo.java | 11 +- .../internal/CatalogItemDtoAbstract.java | 14 +- .../brooklyn/core/entity/AbstractEntity.java | 504 ++++++++++++++----- .../brooklyn/core/entity/EntityInternal.java | 60 ++- .../core/location/AbstractLocation.java | 84 +++- .../access/PortForwardManagerClient.java | 5 + .../internal/AbstractManagementContext.java | 11 +- .../mgmt/internal/BasicSubscriptionContext.java | 3 +- .../NonDeploymentManagementContext.java | 7 + .../core/mgmt/internal/SubscriptionTracker.java | 16 + .../core/objs/AbstractEntityAdjunct.java | 177 +++++-- .../core/objs/BrooklynObjectInternal.java | 9 + .../core/sensor/DependentConfiguration.java | 8 +- .../brooklyn/enricher/stock/UpdatingMap.java | 2 +- .../core/entity/EntitySubscriptionTest.java | 12 +- .../brooklyn/core/entity/EntityTypeTest.java | 4 +- .../core/entity/hello/LocalEntitiesTest.java | 8 +- .../core/location/LocationSubscriptionTest.java | 241 +++++++++ .../policy/basic/PolicySubscriptionTest.java | 4 +- .../core/test/entity/TestApplicationImpl.java | 2 +- .../software/base/SoftwareProcessImpl.java | 4 +- .../entity/proxy/nginx/UrlMappingImpl.java | 4 +- .../AbstractWebAppFixtureIntegrationTest.java | 5 +- .../brooklyn/rest/resources/EntityResource.java | 2 +- 29 files changed, 1234 insertions(+), 226 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f34f0433/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java ----------------------------------------------------------------------
