Merge pull request #99 from SalesforceEng/2.0

Merging changes from 2.0 to master
salesforce · Aug 17, 2016 · 11f79ac · 11f79ac
2 parents 9e0fadf + 7cc2cb6
commit 11f79ac
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/ArgusClient/pom.xml b/ArgusClient/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>4.0-SNAPSHOT</version>
+        <version>2.0.1</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-client</artifactId>

diff --git a/ArgusCore/pom.xml b/ArgusCore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>4.0-SNAPSHOT</version>
+        <version>2.0.1</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-core</artifactId>

diff --git a/ArgusCore/src/main/java/com/salesforce/dva/argus/service/schema/AsyncHbaseSchemaService.java b/ArgusCore/src/main/java/com/salesforce/dva/argus/service/schema/AsyncHbaseSchemaService.java
@@ -100,6 +100,16 @@ private AsyncHbaseSchemaService(SystemConfiguration systemConfig) {
 
         config.overrideConfig("hbase.zookeeper.quorum",
             systemConfig.getValue(Property.HBASE_ZOOKEEPER_CONNECT.getName(), Property.HBASE_ZOOKEEPER_CONNECT.getDefaultValue()));
+        config.overrideConfig("hbase.security.auth.enable",
+                systemConfig.getValue(Property.HBASE_SECURITY_AUTH_ENABLE.getName(), Property.HBASE_SECURITY_AUTH_ENABLE.getDefaultValue()));
+        config.overrideConfig("hbase.rpc.protection", 
+        		systemConfig.getValue(Property.HBASE_RPC_PROTECTION.getName(), Property.HBASE_RPC_PROTECTION.getDefaultValue()));
+        config.overrideConfig("hbase.sasl.clientconfig",
+        		systemConfig.getValue(Property.HBASE_SASL_CLIENTCONFIG.getName(), Property.HBASE_SASL_CLIENTCONFIG.getDefaultValue()));
+        config.overrideConfig("hbase.kerberos.regionserver.principal",
+        		systemConfig.getValue(Property.HBASE_KERBEROS_REGIONSERVER_PRINCIPAL.getName(), Property.HBASE_KERBEROS_REGIONSERVER_PRINCIPAL.getDefaultValue()));
+        config.overrideConfig("hbase.security.authentication", 
+        		systemConfig.getValue(Property.HBASE_SECURITY_AUTHENTICATION.getName(), Property.HBASE_SECURITY_AUTHENTICATION.getDefaultValue()));
         config.overrideConfig("hbase.rpcs.batch.size", "16192");
         config.overrideConfig("hbase.rpcs.buffered_flush_interval", "5000");
         config.overrideConfig("hbase.zookeeper.session.timeout", "6000");
@@ -671,7 +681,12 @@ public String getTableName() {
      */
     public enum Property {
 
-        HBASE_ZOOKEEPER_CONNECT("service.property.schema.hbase.zookeeper.connect", "hbase.zookeeper.com:1234");
+        HBASE_ZOOKEEPER_CONNECT("service.property.schema.hbase.zookeeper.connect", "hbase.zookeeper.com:1234"),
+        HBASE_SECURITY_AUTHENTICATION("service.property.schema.hbase.security.authentication", ""),
+        HBASE_RPC_PROTECTION("service.property.schema.hbase.rpc.protection", ""),
+        HBASE_SASL_CLIENTCONFIG("service.property.schema.hbase.sasl.clientconfig", "Client"),
+        HBASE_SECURITY_AUTH_ENABLE("service.property.schema.hbase.security.auth.enable", "false"),
+        HBASE_KERBEROS_REGIONSERVER_PRINCIPAL("service.property.schema.hbase.kerberos.regionserver.principal", "");
 
         private final String _name;
         private final String _defaultValue;

diff --git a/ArgusWebServices/pom.xml b/ArgusWebServices/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>4.0-SNAPSHOT</version>
+        <version>2.0.1</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-webservices</artifactId>
@@ -199,4 +199,4 @@
         	<version>2.6</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.salesforce.argus</groupId>
     <artifactId>argus</artifactId>
-    <version>4.0-SNAPSHOT</version>
+    <version>2.0.1</version>
     <packaging>pom</packaging>
     <name>Argus</name>
     <description>A pom for all Argus projects. It provides standards for plugin versions, configuration and a number of other things.</description>