GEODE-17: do not initialize the JSONAuthorization with a default json
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c06a7956 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c06a7956 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c06a7956 Branch: refs/heads/feature/GEODE-1276 Commit: c06a7956619284da55c4028f289f3b2c922e437c Parents: 72be65f Author: Jinmei Liao <jil...@pivotal.io> Authored: Fri Apr 29 14:25:14 2016 -0700 Committer: Jinmei Liao <jil...@pivotal.io> Committed: Fri Apr 29 14:25:14 2016 -0700 ---------------------------------------------------------------------- .../management/internal/security/ResourceOperationContext.java | 2 +- .../gemfire/management/internal/security/JSONAuthorization.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c06a7956/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java index 50f9b78..7f6f72e 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java @@ -45,7 +45,7 @@ public class ResourceOperationContext extends OperationContext { if (operation != null) this.operation = OperationCode.valueOf(operation); if (regionName !=null ) this.regionName = regionName; - setParts(this.resource.name()+":"+this.operation.name()+":"+regionName); + setParts(this.resource.name()+":"+this.operation.name()+":"+this.regionName); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c06a7956/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java index 9670822..7f1d2bf 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorization.java @@ -66,7 +66,7 @@ public class JSONAuthorization implements AccessControl, Authenticator { public JSONAuthorization() throws IOException, JSONException { // initialize with a default json file - setUpWithJsonFile("shiro-ini.json"); + //setUpWithJsonFile("shiro-ini.json"); } public JSONAuthorization(String jsonFileName) throws IOException, JSONException {
