You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2016/03/10 23:02:34 UTC
incubator-geode git commit: GEODE-17: Cleanup some dead code
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-17-2 57282de8e -> a84def5fe
GEODE-17: Cleanup some dead code
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a84def5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a84def5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a84def5f
Branch: refs/heads/feature/GEODE-17-2
Commit: a84def5feb430314e31f660b0c26014fceeb783e
Parents: 57282de
Author: Jens Deppe <jd...@pivotal.io>
Authored: Thu Mar 10 11:43:46 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Thu Mar 10 14:01:45 2016 -0800
----------------------------------------------------------------------
.../internal/security/CLIOperationContext.java | 27 --------------------
.../management/internal/security/Resource.java | 6 -----
2 files changed, 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a84def5f/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/CLIOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/CLIOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/CLIOperationContext.java
index e66f9f4..fdc683d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/CLIOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/CLIOperationContext.java
@@ -72,34 +72,7 @@ public class CLIOperationContext extends ResourceOperationContext {
}
private static void cache(String commandName, ResourceOperation op) {
-//<<<<<<< HEAD
-// ResourceOperationCode resourceOpCode = null;
-//
-// if (op != null) {
-// String opString = op.operation().toString();
-// if (opString != null)
-// resourceOpCode = ResourceOperationCode.parse(opString);
-// }
-//
-// if(resourceOpCode==null){
-// if (commandName.startsWith(GETTER_DESCRIBE) || commandName.startsWith(GETTER_LIST)
-// || commandName.startsWith(GETTER_STATUS)) {
-// resourceOpCode = ResourceOperationCode.LIST_DS;
-// }
-// }
-//
-//
-// if(resourceOpCode!=null) {
-// commandToCodeMapping.put(commandName, resourceOpCode);
-// } else {
-// throw new GemFireConfigException(
-// "Error while configuring authorization for gfsh commands. No opCode defined for command " + commandName);
-//
-// }
-//=======
commandToCodeMapping.put(commandName, op);
-//>>>>>>> 38de96006d5841f71d82dd807bccb942b5fefb4e
-
}
public Map<String, String> getCommandOptions() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a84def5f/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/Resource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/Resource.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/Resource.java
index 342d6e9..75120d0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/Resource.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/Resource.java
@@ -17,19 +17,13 @@
package com.gemstone.gemfire.management.internal.security;
public enum Resource {
-//<<<<<<< HEAD
ASYNC_EVENT_QUEUE,
CLIENT,
CLIENT_SERVER,
CLUSTER_CONFIGURTION,
CONTINUOUS_QUERY,
-//=======
DEFAULT,
MBEAN,
-// DISTRIBUTED_SYSTEM,
-// MEMBER,
-// REGION,
-//>>>>>>> 38de96006d5841f71d82dd807bccb942b5fefb4e
DISKSTORE,
DISKSTORE_OFFLINE,
DISTRIBUTED_SYSTEM,