This closes #416
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e7ac5aa2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e7ac5aa2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e7ac5aa2 Branch: refs/heads/master Commit: e7ac5aa2f0a80343747971e8db208b8877406456 Parents: ddf0a44 8a30e18 Author: Alex Heneveld <[email protected]> Authored: Fri Feb 6 12:41:58 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Fri Feb 6 12:41:58 2015 +0000 ---------------------------------------------------------------------- .../brooklyn/catalog/CatalogPredicates.java | 15 ++- .../OsgiBrooklynClassLoadingContext.java | 4 + .../entitlement/EntitlementManagerAdapter.java | 99 +++++++++++++++----- .../management/entitlement/Entitlements.java | 89 ++++++++++++------ .../management/internal/EffectorUtils.java | 4 +- .../internal/EntityChangeListener.java | 4 +- .../internal/EntityManagementSupport.java | 5 +- .../entitlement/AcmeEntitlementManagerTest.java | 3 +- .../AcmeEntitlementManagerTestFixture.java | 7 +- .../entitlement/EntitlementsTest.java | 8 +- .../entitlement/EntityEntitlementTest.java | 9 +- .../rest/resources/ApplicationResource.java | 7 +- .../rest/resources/CatalogResource.java | 63 ++++++++++++- .../rest/resources/EffectorResource.java | 5 +- .../rest/util/BrooklynRestResourceUtils.java | 4 +- 15 files changed, 246 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
