This closes #108 New PerUserEntitlementManager keyword: user
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3b746e3e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3b746e3e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3b746e3e Branch: refs/heads/master Commit: 3b746e3ece6ed5a3e78e418294f0bceba024da3b Parents: 06f68e1 4ff1e1a Author: Sam Corbett <sam.corb...@cloudsoftcorp.com> Authored: Mon Apr 11 18:30:41 2016 +0100 Committer: Sam Corbett <sam.corb...@cloudsoftcorp.com> Committed: Mon Apr 11 18:30:41 2016 +0100 ---------------------------------------------------------------------- .../entitlement/EntitlementManagerAdapter.java | 4 + .../core/mgmt/entitlement/Entitlements.java | 117 ++++++++++++------- .../entitlement/PerUserEntitlementManager.java | 6 +- .../org/apache/brooklyn/rest/api/ScriptApi.java | 8 +- .../brooklyn/rest/resources/ScriptResource.java | 6 + .../brooklyn/rest/resources/ServerResource.java | 6 +- .../AbstractRestApiEntitlementsTest.java | 35 +++++- .../ActivityApiEntitlementsTest.java | 2 + .../EntityConfigApiEntitlementsTest.java | 2 + .../entitlement/ScriptApiEntitlementsTest.java | 56 +++++++++ .../entitlement/SensorApiEntitlementsTest.java | 2 + .../entitlement/ServerApiEntitlementsTest.java | 24 ++++ 12 files changed, 215 insertions(+), 53 deletions(-) ----------------------------------------------------------------------
