geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tush...@apache.org
Subject [52/79] incubator-geode git commit: GEODE-17 : Integrated Security Code Merge This is manual merge of code from int_security branch.
Date Tue, 03 Nov 2015 11:26:14 GMT
GEODE-17 : Integrated Security Code Merge
This is manual merge of code from int_security branch.

DE-17 : Integrated Security Code Merge


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1393ad27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1393ad27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1393ad27

Branch: refs/heads/feature/GEODE-17
Commit: 1393ad27d5d101484bc951a87843c0ac3f44905b
Parents: 1922937
Author: Tushar Khairnar <tkhairnar@pivotal.io>
Authored: Thu Aug 27 10:28:57 2015 +0530
Committer: tushark <tushark@apache.org>
Committed: Tue Nov 3 16:51:47 2015 +0530

----------------------------------------------------------------------
 .../management/internal/cli/commands/HDFSStoreCommands.java       | 2 +-
 .../gemfire/management/internal/security/ResourceConstants.java   | 3 ++-
 .../management/internal/security/ResourceOperationContext.java    | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1393ad27/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java
index 6bc5e5d..cc504fd 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java
@@ -58,7 +58,7 @@ import com.gemstone.gemfire.management.internal.security.ResourceOperation;
 public class HDFSStoreCommands   extends AbstractCommandsSupport {  
   @CliCommand (value = CliStrings.CREATE_HDFS_STORE, help = CliStrings.CREATE_HDFS_STORE__HELP)
   @CliMetaData (relatedTopic = CliStrings.TOPIC_GEMFIRE_HDFSSTORE, writesToSharedConfiguration
= true)
-  @ResourceOperation( resource=Resource.DISTRIBUTED_SYSTEM, operation=ResourceConstants.CREATE_HDFS_STORE)
+  @ResourceOperation(resource = Resource.DISTRIBUTED_SYSTEM, operation= ResourceConstants.CREATE_HDFS_STORE)
   public Result createHdfsStore(      
       @CliOption (key = CliStrings.CREATE_HDFS_STORE__NAME,                  
                   mandatory = true,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1393ad27/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceConstants.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceConstants.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceConstants.java
index e26bc64..01abb8c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceConstants.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceConstants.java
@@ -46,7 +46,7 @@ public class ResourceConstants {
   public static final String DESTROY_DISKSTORE = "DESTROY_DISKSTORE";
   public static final String DESTROY_FUNCTION = "DESTROY_FUNCTION";
   public static final String DESTROY_INDEX = "DESTROY_INDEX";
-  
+
   public static final String DESTROY_REGION = "DESTROY_REGION";
   public static final String EXECUTE_FUNCTION = "EXECUTE_FUNCTION";
   public static final String EXPORT_CONFIG = "EXPORT_CONFIG";
@@ -93,6 +93,7 @@ public class ResourceConstants {
   public static final String STOP_CONTINUOUS_QUERY = "STOP_CONTINUOUS_QUERY";
   public static final String SET_DISK_USAGE = "SET_DISK_USAGE";
   
+
   public static final String CREATE_HDFS_STORE = "CREATE_HDFS_STORE";
   public static final String ALTER_HDFS_STORE = "ALTER_HDFS_STORE";
   public static final String DESTROY_HDFS_STORE = "DESTROY_HDFS_STORE";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1393ad27/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java
index 3801d66..c88e42c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/security/ResourceOperationContext.java
@@ -88,7 +88,6 @@ public abstract class ResourceOperationContext extends OperationContext
{
     private static final int OP_CREATE_HDFS_STORE = 64;
     private static final int OP_ALTER_HDFS_STORE = 65;
     private static final int OP_DESTROY_HDFS_STORE = 66;
-    
 
     private static final int OP_PULSE_DASHBOARD = 92;
     private static final int OP_PULSE_DATABROWSER = 93;


Mime
View raw message