You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/29 23:26:57 UTC
[1/2] incubator-geode git commit: GEODE-17: do not initialize the
JSONAuthorization with a default json
Repository: incubator-geode
Updated Branches:
refs/heads/develop ce43082f9 -> a3f308af1
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/develop
Commit: c06a7956619284da55c4028f289f3b2c922e437c
Parents: 72be65f
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Fri Apr 29 14:25:14 2016 -0700
Committer: Jinmei Liao <ji...@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 {
[2/2] incubator-geode git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-geode into develop
Posted by ji...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a3f308af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a3f308af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a3f308af
Branch: refs/heads/develop
Commit: a3f308af174996cb964853ec1787cbe3a353dd8a
Parents: c06a795 ce43082
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Fri Apr 29 14:26:18 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri Apr 29 14:26:18 2016 -0700
----------------------------------------------------------------------
.../cli/commands/FunctionCommandsDUnitTest.java | 72 +++++++++++++++++++-
.../cli/commands/ToUpperResultCollector.java | 65 ++++++++++++++++++
2 files changed, 135 insertions(+), 2 deletions(-)
----------------------------------------------------------------------