ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sneet...@apache.org
Subject [5/9] ARGUS-137 Rename Apache Argus to Apache Ranger on the codebase/config
Date Thu, 30 Oct 2014 02:12:08 GMT
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/security-admin/src/main/webapp/WEB-INF/log4j.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/WEB-INF/log4j.xml b/security-admin/src/main/webapp/WEB-INF/log4j.xml
index 71d81b3..cce0613 100644
--- a/security-admin/src/main/webapp/WEB-INF/log4j.xml
+++ b/security-admin/src/main/webapp/WEB-INF/log4j.xml
@@ -17,88 +17,71 @@
 -->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
 
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d [%t] %-5p %C{6} (%F:%L) - %m%n" />
-			<!-- <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/> -->
-		</layout>
-	</appender>
-	<!-- 
-	<appender name="daily_rolling_file" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="file" value="/xa_portal.log" />
+	<appender name="xa_log_appender" class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="file" value="${catalina.base}/logs/xa_portal.log" />
 		<param name="datePattern" value="'.'yyyy-MM-dd" />
 		<param name="append" value="true" />
 		<layout class="org.apache.log4j.PatternLayout">
 			<param name="ConversionPattern" value="%d [%t] %-5p %C{6} (%F:%L) - %m%n" />
 		</layout>
 	</appender>
-	<appender name="sql_daily_rolling_file" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="file" value="xa_portal_sql.log" />
+
+	<appender name="sql_appender" class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="file" value="${catalina.base}/logs/xa_portal_sql.log" />
 		<param name="datePattern" value="'.'yyyy-MM-dd" />
 		<param name="append" value="true" />
 		<layout class="org.apache.log4j.PatternLayout">
 			<param name="ConversionPattern" value="%d [%t] %-5p %C{6} (%F:%L) - %m%n" />
 		</layout>
 	</appender>
- 	-->
+
 	<category name="org.springframework" additivity="false">
 		<priority value="warn" />
-		<appender-ref ref="console" />
-		<!--<appender-ref ref="daily_rolling_file" /> -->
+		<appender-ref ref="xa_log_appender" />
 	</category>
+
 	<category name="org.hibernate.SQL" additivity="false">
 		<priority value="warn" />
-		<appender-ref ref="console" />
-		<!-- <appender-ref ref="sql_daily_rolling_file" /> -->
+		<appender-ref ref="sql_appender" />
 	</category>
-	<!-- <category name="org.hibernate.type.descriptor.sql.BasicBinder" additivity="false"> 
-		<priority value="trace" /> <appender-ref ref="console" /> <appender-ref ref="sql_daily_rolling_file" 
-		/> </category> -->
 	<category name="jdbc.sqlonly" additivity="false">
 		<priority value="fatal" />
-		<appender-ref ref="console" />
-		<!-- <appender-ref ref="log4jdbc_daily_rolling_file" /> -->
+		<appender-ref ref="sql_appender" />
 	</category>
 
 	<category name="jdbc.sqltiming" additivity="false">
 		<priority value="warn" />
-		<appender-ref ref="console" />
-		<!-- <appender-ref ref="log4jdbc_daily_rolling_file" /> -->
+		<appender-ref ref="sql_appender" />
 	</category>
 	<category name="jdbc.audit" additivity="false">
 		<priority value="fatal" />
-		<appender-ref ref="console" />
-		<!-- <appender-ref ref="log4jdbc_daily_rolling_file" /> -->
+		<appender-ref ref="sql_appender" />
 	</category>
 	<category name="jdbc.resultset" additivity="false">
 		<priority value="fatal" />
-		<appender-ref ref="console" />
-		<!-- <appender-ref ref="log4jdbc_daily_rolling_file" /> -->
+		<appender-ref ref="sql_appender" />
 	</category>
+
 	<category name="jdbc.connection" additivity="false">
 		<priority value="fatal" />
-		<appender-ref ref="console" />
-		<!-- <appender-ref ref="log4jdbc_daily_rolling_file" /> -->
+		<appender-ref ref="sql_appender" />
 	</category>
 
 	<category name="com.xasecure" additivity="false">
 		<priority value="info" />
-		<appender-ref ref="console" />
-		<!-- <appender-ref ref="daily_rolling_file" /> -->
+		<appender-ref ref="xa_log_appender" />
 	</category>
 
 	<category name="xa" additivity="false">
 		<priority value="info" />
-		<appender-ref ref="console" />
-		<!-- <appender-ref ref="daily_rolling_file" /> -->
+		<appender-ref ref="xa_log_appender" />
 	</category>
 
 	<root>
 		<priority value="warn" />
-		<appender-ref ref="console" />
-		<!-- <appender-ref ref="daily_rolling_file" /> -->
+		<appender-ref ref="xa_log_appender" />
 	</root>
-</log4j:configuration>  
\ No newline at end of file
+
+</log4j:configuration>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/security-admin/src/main/webapp/WEB-INF/log4j.xml.prod
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/WEB-INF/log4j.xml.prod b/security-admin/src/main/webapp/WEB-INF/log4j.xml.prod
deleted file mode 100644
index a5cf8ce..0000000
--- a/security-admin/src/main/webapp/WEB-INF/log4j.xml.prod
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-	<appender name="xa_log_appender" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="file" value="${catalina.base}/logs/xa_portal.log" />
-		<param name="datePattern" value="'.'yyyy-MM-dd" />
-		<param name="append" value="true" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d [%t] %-5p %C{6} (%F:%L) - %m%n" />
-		</layout>
-	</appender>
-
-	<appender name="sql_appender" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="file" value="${catalina.base}/logs/xa_portal_sql.log" />
-		<param name="datePattern" value="'.'yyyy-MM-dd" />
-		<param name="append" value="true" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d [%t] %-5p %C{6} (%F:%L) - %m%n" />
-		</layout>
-	</appender>
-
-	<category name="org.springframework" additivity="false">
-		<priority value="warn" />
-		<appender-ref ref="xa_log_appender" />
-	</category>
-
-	<category name="org.hibernate.SQL" additivity="false">
-		<priority value="warn" />
-		<appender-ref ref="sql_appender" />
-	</category>
-	<category name="jdbc.sqlonly" additivity="false">
-		<priority value="fatal" />
-		<appender-ref ref="sql_appender" />
-	</category>
-
-	<category name="jdbc.sqltiming" additivity="false">
-		<priority value="warn" />
-		<appender-ref ref="sql_appender" />
-	</category>
-	<category name="jdbc.audit" additivity="false">
-		<priority value="fatal" />
-		<appender-ref ref="sql_appender" />
-	</category>
-	<category name="jdbc.resultset" additivity="false">
-		<priority value="fatal" />
-		<appender-ref ref="sql_appender" />
-	</category>
-
-	<category name="jdbc.connection" additivity="false">
-		<priority value="fatal" />
-		<appender-ref ref="sql_appender" />
-	</category>
-
-	<category name="com.xasecure" additivity="false">
-		<priority value="info" />
-		<appender-ref ref="xa_log_appender" />
-	</category>
-
-	<category name="xa" additivity="false">
-		<priority value="info" />
-		<appender-ref ref="xa_log_appender" />
-	</category>
-
-	<root>
-		<priority value="warn" />
-		<appender-ref ref="xa_log_appender" /> 
-	</root>
-
-</log4j:configuration>  

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/security-admin/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/WEB-INF/web.xml b/security-admin/src/main/webapp/WEB-INF/web.xml
index 71934ca..143ba57 100644
--- a/security-admin/src/main/webapp/WEB-INF/web.xml
+++ b/security-admin/src/main/webapp/WEB-INF/web.xml
@@ -23,7 +23,7 @@
   <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>META-INF/applicationContext.xml
-			META-INF/security-applicationContext.xml
+			WEB-INF/classes/conf/security-applicationContext.xml
 			META-INF/scheduler-applicationContext.xml</param-value>
   </context-param>
   <context-param>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/src/main/assembly/admin-web.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml
index bad48df..87e4b34 100644
--- a/src/main/assembly/admin-web.xml
+++ b/src/main/assembly/admin-web.xml
@@ -18,7 +18,7 @@
 <assembly>
   <id>admin</id> 
   <formats>
-     <format>tar</format>
+     <format>tar.gz</format>
      <format>zip</format>
   </formats>
   <baseDirectory>${project.name}-${project.version}-admin</baseDirectory>
@@ -28,11 +28,22 @@
     <moduleSet>
      <binaries>
         <includeDependencies>false</includeDependencies>
+        <unpack>true</unpack>
+        <outputDirectory>/ews/webapp</outputDirectory>
+     </binaries>
+     <includes>
+		<include>org.apache.ranger:security-admin-web</include>
+     </includes>
+    </moduleSet>
+
+    <moduleSet>
+     <binaries>
+        <includeDependencies>false</includeDependencies>
         <unpack>false</unpack>
-        <outputDirectory>/war</outputDirectory>
+        <outputDirectory>/ews/ranger_jaas</outputDirectory>
      </binaries>
      <includes>
-		<include>org.apache.argus:security-admin-web</include>
+		<include>org.apache.ranger:unixauthclient</include>
      </includes>
     </moduleSet>
 
@@ -54,7 +65,7 @@
         </dependencySets>
      </binaries>
      <includes>
-	    <include>org.apache.argus:embededwebserver</include>
+	    <include>org.apache.ranger:embededwebserver</include>
      </includes>
     </moduleSet>
 
@@ -87,7 +98,7 @@
         </dependencySets>
      </binaries>
      <includes>
-	    <include>org.apache.argus:credentialbuilder</include>
+	    <include>org.apache.ranger:credentialbuilder</include>
      </includes>
     </moduleSet>
 
@@ -100,7 +111,7 @@
 		<fileMode>544</fileMode>
 	</fileSet>
 	<fileSet>
-		<outputDirectory>/ews</outputDirectory>
+		<outputDirectory>/ews/webapp/WEB-INF/classes/conf.dist</outputDirectory>
 		<directory>embededwebserver/conf</directory>
 		<fileMode>700</fileMode>
 	</fileSet>
@@ -113,6 +124,7 @@
 		<directory>security-admin/unixauth-config</directory>
 		<fileMode>544</fileMode>
 	</fileSet>
+
 	<fileSet>
 		<outputDirectory>/db</outputDirectory>
 		<directory>security-admin/db</directory>
@@ -130,8 +142,9 @@
 		<outputDirectory>/</outputDirectory>
 		<directory>security-admin/scripts</directory>
 		<includes>
-			<include>install.sh</include>
+			<include>setup.sh</include>
 			<include>setup_authentication.sh</include>
+			<include>set_globals.sh</include>
 		</includes>
 		<fileMode>544</fileMode>
 	</fileSet>
@@ -152,5 +165,11 @@
 		</includes>
 		<fileMode>444</fileMode>
 	</fileSet>
+   <fileSet>
+        <directory>security-admin/src/bin</directory>
+        <outputDirectory>bin</outputDirectory>
+        <fileMode>0755</fileMode>
+        <directoryMode>0755</directoryMode>
+    </fileSet>
   </fileSets>
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/src/main/assembly/hbase-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/hbase-agent.xml b/src/main/assembly/hbase-agent.xml
index 22ce083..2a2eff9 100644
--- a/src/main/assembly/hbase-agent.xml
+++ b/src/main/assembly/hbase-agent.xml
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 <assembly>
-  <id>hbase-agent</id> 
+  <id>hbase-plugin</id>
   <formats>
-     <format>tar</format>
+     <format>tar.gz</format>
 	 <format>zip</format>
   </formats>
-  <baseDirectory>${project.name}-${project.version}-hbase-agent</baseDirectory>
+  <baseDirectory>${project.name}-${project.version}-hbase-plugin</baseDirectory>
   <includeBaseDirectory>true</includeBaseDirectory>
   <moduleSets>
     <moduleSet>
@@ -43,11 +43,11 @@
         <outputDirectory>/lib</outputDirectory>
      </binaries>
      <includes>
-	<include>security_agents.agents-audit:agents-audit</include>
-	<include>security_agents.agents-cred:agents-cred</include>
-	<include>security_agents.agents-impl:agents-impl</include>
-	<include>security_agents.agents-common:agents-common</include>
-	<include>security_agents.hbase-agent:hbase-agent</include>
+	<include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include>
+	<include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include>
+	<include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include>
+	<include>security_plugins.ranger-plugins-common:ranger-plugins-common</include>
+	<include>security_plugins.ranger-hbase-plugin:ranger-hbase-plugin</include>
      </includes>
     </moduleSet>
     <moduleSet>
@@ -76,8 +76,8 @@
         <unpack>false</unpack>
      </binaries>
      <includes>
-		<include>security_agents.agents-installer:agents-installer</include>
-		<include>org.apache.argus:credentialbuilder</include>
+		<include>security_plugins.plugins-installer:plugins-installer</include>
+		<include>org.apache.ranger:credentialbuilder</include>
      </includes>
     </moduleSet>
   </moduleSets> 	
@@ -112,18 +112,18 @@
         <fileMode>444</fileMode>
     </fileSet>
   </fileSets>
-  <!-- enable/disable script for agent -->
+  <!-- enable/disable script for Plugin -->
   <files>
     <file>
 		<source>agents-common/scripts/enable-agent.sh</source>
         <outputDirectory>/</outputDirectory>
-        <destName>enable-hbase-agent.sh</destName>
+        <destName>enable-hbase-plugin.sh</destName>
         <fileMode>755</fileMode>
     </file>
     <file>
 		<source>agents-common/scripts/enable-agent.sh</source>
         <outputDirectory>/</outputDirectory>
-        <destName>disable-hbase-agent.sh</destName>
+        <destName>disable-hbase-plugin.sh</destName>
         <fileMode>755</fileMode>
     </file>
     <file>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/src/main/assembly/hdfs-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/hdfs-agent.xml b/src/main/assembly/hdfs-agent.xml
index 53b25cd..8e73a67 100644
--- a/src/main/assembly/hdfs-agent.xml
+++ b/src/main/assembly/hdfs-agent.xml
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 <assembly>
-  <id>hdfs-agent</id> 
+  <id>hdfs-plugin</id>
   <formats>
-     <format>tar</format>
+     <format>tar.gz</format>
 	 <format>zip</format>
   </formats>
-  <baseDirectory>${project.name}-${project.version}-hdfs-agent</baseDirectory>
+  <baseDirectory>${project.name}-${project.version}-hdfs-plugin</baseDirectory>
   <includeBaseDirectory>true</includeBaseDirectory>
   <moduleSets>
     <moduleSet>
@@ -44,11 +44,11 @@
         <outputDirectory>/lib</outputDirectory>
      </binaries>
      <includes>
-	<include>security_agents.agents-audit:agents-audit</include>
-	<include>security_agents.agents-cred:agents-cred</include>
-	<include>security_agents.agents-impl:agents-impl</include>
-	<include>security_agents.agents-common:agents-common</include>
-	<include>security_agents.hdfs-agent:hdfs-agent</include>
+	<include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include>
+	<include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include>
+	<include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include>
+	<include>security_plugins.ranger-plugins-common:ranger-plugins-common</include>
+	<include>security_plugins.ranger-hdfs-plugin:ranger-hdfs-plugin</include>
      </includes>
     </moduleSet>
     <moduleSet>
@@ -77,8 +77,8 @@
         <unpack>false</unpack>
      </binaries>
      <includes>
-		<include>security_agents.agents-installer:agents-installer</include>
-        <include>org.apache.argus:credentialbuilder</include>
+		<include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include>
+        <include>org.apache.ranger:credentialbuilder</include>
      </includes>
     </moduleSet>
   </moduleSets> 	
@@ -102,18 +102,18 @@
 		<fileMode>444</fileMode>
 	</fileSet>
   </fileSets>
-  <!-- enable/disable script for agent -->
+  <!-- enable/disable script for plugin -->
   <files>
 	<file>
 		<source>agents-common/scripts/enable-agent.sh</source>
 		<outputDirectory>/</outputDirectory>
-		<destName>enable-hdfs-agent.sh</destName>
+		<destName>enable-hdfs-plugin.sh</destName>
 		<fileMode>755</fileMode>
 	</file>
 	<file>
 		<source>agents-common/scripts/enable-agent.sh</source>
 		<outputDirectory>/</outputDirectory>
-		<destName>disable-hdfs-agent.sh</destName>
+		<destName>disable-hdfs-plugin.sh</destName>
 		<fileMode>755</fileMode>
 	</file>
 	<file>
@@ -125,7 +125,7 @@
     <file>
 		<source>hdfs-agent/conf/xasecure-hadoop-env.sh</source>
 		<outputDirectory>/install/conf.templates/enable</outputDirectory>
-		<destName>set-hdfs-agent-env.sh</destName>
+		<destName>set-hdfs-plugin-env.sh</destName>
 		<fileMode>755</fileMode>
     </file>	
   </files>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/src/main/assembly/hive-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/hive-agent.xml b/src/main/assembly/hive-agent.xml
index 5cef1d5..000d9b4 100644
--- a/src/main/assembly/hive-agent.xml
+++ b/src/main/assembly/hive-agent.xml
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 <assembly>
-  <id>hive-agent</id> 
+  <id>hive-plugin</id>
   <formats>
-     <format>tar</format>
+     <format>tar.gz</format>
 	 <format>zip</format>
   </formats>
-  <baseDirectory>${project.name}-${project.version}-hive-agent</baseDirectory>
+  <baseDirectory>${project.name}-${project.version}-hive-plugin</baseDirectory>
   <includeBaseDirectory>true</includeBaseDirectory>
   <moduleSets>
     <moduleSet>
@@ -44,11 +44,11 @@
         <outputDirectory>/lib</outputDirectory>
      </binaries>
      <includes>
-	<include>security_agents.agents-audit:agents-audit</include>
-	<include>security_agents.agents-cred:agents-cred</include>
-	<include>security_agents.agents-impl:agents-impl</include>
-	<include>security_agents.agents-common:agents-common</include>
-	<include>security_agents.hive-agent:hive-agent</include>
+	<include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include>
+	<include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include>
+	<include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include>
+	<include>security_plugins.ranger-plugins-common:ranger-plugins-common</include>
+	<include>security_plugins.ranger-hive-plugin:ranger-hive-plugin</include>
      </includes>
     </moduleSet>
     <moduleSet>
@@ -77,8 +77,8 @@
         <unpack>false</unpack>
      </binaries>
      <includes>
-	    <include>security_agents.agents-installer:agents-installer</include>
-        <include>org.apache.argus:credentialbuilder</include>
+	    <include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include>
+        <include>org.apache.ranger:credentialbuilder</include>
      </includes>
     </moduleSet>
   </moduleSets> 	
@@ -117,13 +117,13 @@
     <file>
 		<source>agents-common/scripts/enable-agent.sh</source>
         <outputDirectory>/</outputDirectory>
-        <destName>enable-hive-agent.sh</destName>
+        <destName>enable-hive-plugin.sh</destName>
         <fileMode>755</fileMode>
     </file>
     <file>
 		<source>agents-common/scripts/enable-agent.sh</source>
         <outputDirectory>/</outputDirectory>
-        <destName>disable-hive-agent.sh</destName>
+        <destName>disable-hive-plugin.sh</destName>
         <fileMode>755</fileMode>
     </file>
     <file>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/src/main/assembly/knox-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/knox-agent.xml b/src/main/assembly/knox-agent.xml
index 5889d87..78f3251 100644
--- a/src/main/assembly/knox-agent.xml
+++ b/src/main/assembly/knox-agent.xml
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 <assembly>
-  <id>knox-agent</id> 
+  <id>knox-plugin</id>
   <formats>
-     <format>tar</format>
+     <format>tar.gz</format>
 	 <format>zip</format>
   </formats>
-  <baseDirectory>${project.name}-${project.version}-knox-agent</baseDirectory>
+  <baseDirectory>${project.name}-${project.version}-knox-plugin</baseDirectory>
   <includeBaseDirectory>true</includeBaseDirectory>
   <moduleSets>
     <moduleSet>
@@ -48,11 +48,11 @@
         <outputDirectory>/lib</outputDirectory>
      </binaries>
      <includes>
-		<include>security_agents.agents-audit:agents-audit</include>
-		<include>security_agents.agents-cred:agents-cred</include>
-		<include>security_agents.agents-impl:agents-impl</include>
-		<include>security_agents.agents-common:agents-common</include>
-		<include>security_agents.knox-agent:knox-agent</include>
+		<include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include>
+		<include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include>
+		<include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include>
+		<include>security_plugins.ranger-plugins-common:ranger-plugins-common</include>
+		<include>security_plugins.ranger-knox-plugin:ranger-knox-plugin</include>
      </includes>
     </moduleSet>
     <moduleSet>
@@ -81,8 +81,8 @@
         </dependencySets>
      </binaries>
      <includes>
-		<include>security_agents.agents-installer:agents-installer</include>
-    	<include>org.apache.argus:credentialbuilder</include>
+		<include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include>
+	<include>org.apache.ranger:credentialbuilder</include>
      </includes>
     </moduleSet>
   </moduleSets> 	
@@ -116,18 +116,18 @@
         <fileMode>444</fileMode>
     </fileSet>
   </fileSets>
-  <!-- enable/disable script for agent -->
+  <!-- enable/disable script for plugin -->
   <files>
     <file>
 		<source>agents-common/scripts/enable-agent.sh</source>
         <outputDirectory>/</outputDirectory>
-        <destName>enable-knox-agent.sh</destName>
+        <destName>enable-knox-plugin.sh</destName>
         <fileMode>755</fileMode>
     </file>
     <file>
 		<source>agents-common/scripts/enable-agent.sh</source>
         <outputDirectory>/</outputDirectory>
-        <destName>disable-knox-agent.sh</destName>
+        <destName>disable-knox-plugin.sh</destName>
         <fileMode>755</fileMode>
     </file>
     <file>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/src/main/assembly/ranger-src.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/ranger-src.xml b/src/main/assembly/ranger-src.xml
new file mode 100644
index 0000000..cf6b1da
--- /dev/null
+++ b/src/main/assembly/ranger-src.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<assembly>
+  <id>src</id>
+  <formats>
+     <format>tar.gz</format>
+     <format>zip</format>
+  </formats>
+  <baseDirectory>${project.name}-${project.version}-src</baseDirectory>
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>.</directory>
+      <includes>
+        <include>LICENCE.txt</include>
+        <include>README.txt</include>
+        <include>NOTICE.txt</include>
+	<include>DISCLAIMER.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>.</directory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <excludes>
+        <exclude>.git/**</exclude>
+        <exclude>**/.gitignore</exclude>
+        <exclude>**/.svn</exclude>
+        <exclude>**/*.iws</exclude>
+        <exclude>**/*.ipr</exclude>
+        <exclude>**/*.iml</exclude>
+        <exclude>**/.classpath</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>**/.settings</exclude>
+        <exclude>**/target/**</exclude>
+        <!-- until the code that does this is fixed -->
+        <exclude>**/*.log</exclude>
+        <exclude>**/build/**</exclude>
+        <exclude>**/file:/**</exclude>
+	<exclude>**/debugfiles.list</exclude>
+	<exclude>**/debuglinks.list</exclude>
+	<exclude>**/debugsources.list</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/src/main/assembly/storm-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/storm-agent.xml b/src/main/assembly/storm-agent.xml
index 9537b49..a3afaef 100644
--- a/src/main/assembly/storm-agent.xml
+++ b/src/main/assembly/storm-agent.xml
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 <assembly>
-  <id>storm-agent</id> 
+  <id>storm-plugin</id>
   <formats>
-     <format>tar</format>
+     <format>tar.gz</format>
 	 <format>zip</format>
   </formats>
-  <baseDirectory>${project.name}-${project.version}-storm-agent</baseDirectory>
+  <baseDirectory>${project.name}-${project.version}-storm-plugin</baseDirectory>
   <includeBaseDirectory>true</includeBaseDirectory>
   <moduleSets>
     <moduleSet>
@@ -64,19 +64,19 @@
                         <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
                         <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include>
                         <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include>
-						<include>security_agents.agents-cred:agents-cred</include>
-						<include>org.apache.argus:credentialbuilder</include>
+						<include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include>
+						<include>org.apache.ranger:credentialbuilder</include>
                     </includes>
             </dependencySet>
         </dependencySets>
         <outputDirectory>/lib</outputDirectory>
      </binaries>
      <includes>
-		<include>security_agents.agents-audit:agents-audit</include>
-		<include>security_agents.agents-cred:agents-cred</include>
-		<include>security_agents.agents-impl:agents-impl</include>
-		<include>security_agents.agents-common:agents-common</include>
-		<include>security_agents.storm-agent:storm-agent</include>
+		<include>security_plugins.ranger-plugins-audit:ranger-plugins-audit</include>
+		<include>security_plugins.ranger-plugins-cred:ranger-plugins-cred</include>
+		<include>security_plugins.ranger-plugins-impl:ranger-plugins-impl</include>
+		<include>security_plugins.ranger-plugins-common:ranger-plugins-common</include>
+		<include>security_plugins.ranger-storm-plugin:ranger-storm-plugin</include>
      </includes>
     </moduleSet>
     <moduleSet>
@@ -86,8 +86,8 @@
         <unpack>false</unpack>
      </binaries>
      <includes>
-		<include>security_agents.agents-installer:agents-installer</include>
-		<include>org.apache.argus:credentialbuilder</include>
+		<include>security_plugins.ranger-plugins-installer:ranger-plugins-installer</include>
+		<include>org.apache.ranger:credentialbuilder</include>
      </includes>
     </moduleSet>
    </moduleSets>
@@ -121,18 +121,18 @@
         <fileMode>444</fileMode>
     </fileSet>
   </fileSets>
-  <!-- enable/disable script for agent -->
+  <!-- enable/disable script for Plugin -->
  <files>
     <file>
 		<source>agents-common/scripts/enable-agent.sh</source>
         <outputDirectory>/</outputDirectory>
-        <destName>enable-storm-agent.sh</destName>
+        <destName>enable-storm-plugin.sh</destName>
         <fileMode>755</fileMode>
     </file>
     <file>
 		<source>agents-common/scripts/enable-agent.sh</source>
         <outputDirectory>/</outputDirectory>
-        <destName>disable-storm-agent.sh</destName>
+        <destName>disable-storm-plugin.sh</destName>
         <fileMode>755</fileMode>
     </file>
     <file>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/src/main/assembly/usersync.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/usersync.xml b/src/main/assembly/usersync.xml
index f7a554d..dccdbe8 100644
--- a/src/main/assembly/usersync.xml
+++ b/src/main/assembly/usersync.xml
@@ -18,7 +18,8 @@
 <assembly>
   <id>usersync</id>
   <formats>
-     <format>tar</format>
+     <format>tar.gz</format>
+	 <format>zip</format>
   </formats>
   <baseDirectory>${project.name}-${project.version}-usersync</baseDirectory>
   <includeBaseDirectory>true</includeBaseDirectory>
@@ -45,7 +46,7 @@
 					<include>org.apache.hadoop:hadoop-auth</include>
 					<include>org.slf4j:slf4j-api</include>
 					<include>org.apache.hadoop:hadoop-common</include>
-					<include>org.apache.argus:credentialbuilder</include>
+					<include>org.apache.ranger:credentialbuilder</include>
 				</includes>
 				<unpack>false</unpack>
   			</dependencySet>
@@ -53,8 +54,8 @@
         <outputDirectory>/dist</outputDirectory>
      </binaries>
      <includes>
-	<include>org.apache.argus:unixauthservice</include>
-	<include>org.apache.argus:unixusersync</include>
+	<include>org.apache.ranger:unixauthservice</include>
+	<include>org.apache.ranger:unixusersync</include>
      </includes>
     </moduleSet>
     <moduleSet>
@@ -64,7 +65,7 @@
         <unpack>false</unpack>
      </binaries>
      <includes>
-	<include>security_agents.agents-installer:agents-installer</include>
+	<include>security_plugins.plugins-installer:plugins-installer</include>
      </includes>
     </moduleSet>
   </moduleSets> 	
@@ -72,8 +73,8 @@
 	<fileSet>
 	    	<directoryMode>755</directoryMode>
 	    	<fileMode>644</fileMode>
-		<outputDirectory>/conf</outputDirectory>
-		<directory>unixauthservice/conf</directory>
+		<outputDirectory>/conf.dist</outputDirectory>
+		<directory>unixauthservice/conf.dist</directory>
 		<excludes>
 			<exclude>jaas.conf</exclude>
 		</excludes>
@@ -99,7 +100,7 @@
 	<fileSet>
 	    	<directoryMode>755</directoryMode>
 	    	<fileMode>644</fileMode>
-		<outputDirectory>/cert</outputDirectory>
+		<outputDirectory>/conf.dist/cert</outputDirectory>
 		<directory>unixauthservice/cert</directory>
 	</fileSet>
 	<fileSet>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/storm-agent/pom.xml
----------------------------------------------------------------------
diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml
index f1b68a2..7179bf0 100644
--- a/storm-agent/pom.xml
+++ b/storm-agent/pom.xml
@@ -17,17 +17,17 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>security_agents.storm-agent</groupId>
-  <artifactId>storm-agent</artifactId>
-  <name>Storm Security Agent</name>
-  <description>Storm Security Agents</description>
+  <groupId>security_plugins.ranger-storm-plugin</groupId>
+  <artifactId>ranger-storm-plugin</artifactId>
+  <name>Storm Security Plugin</name>
+  <description>Storm Security Plugins</description>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <parent>
-     <groupId>org.apache.argus</groupId>
-     <artifactId>argus</artifactId>
+     <groupId>org.apache.ranger</groupId>
+     <artifactId>ranger</artifactId>
      <version>0.4.0</version>
      <relativePath>..</relativePath>
   </parent>
@@ -38,17 +38,17 @@
 		<version>0.9.2-incubating</version>
 	</dependency>
     <dependency>
-      <groupId>security_agents.agents-common</groupId>
-      <artifactId>agents-common</artifactId>
+      <groupId>security_plugins.ranger-plugins-common</groupId>
+      <artifactId>ranger-plugins-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>security_agents.agents-audit</groupId>
-      <artifactId>agents-audit</artifactId>
+      <groupId>security_plugins.ranger-plugins-audit</groupId>
+      <artifactId>ranger-plugins-audit</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.argus</groupId>
+      <groupId>org.apache.ranger</groupId>
       <artifactId>credentialbuilder</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/ugsync/pom.xml
----------------------------------------------------------------------
diff --git a/ugsync/pom.xml b/ugsync/pom.xml
index 60913cc..c1a0193 100644
--- a/ugsync/pom.xml
+++ b/ugsync/pom.xml
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-      <groupId>org.apache.argus</groupId>
-      <artifactId>argus</artifactId>
+      <groupId>org.apache.ranger</groupId>
+      <artifactId>ranger</artifactId>
       <version>0.4.0</version>
 	  <relativePath>..</relativePath>
     </parent>
@@ -90,7 +90,7 @@
       	<version>${slf4j-api.version}</version>
       </dependency>   
 	  <dependency>
-    	<groupId>org.apache.argus</groupId>
+	<groupId>org.apache.ranger</groupId>
     	<artifactId>credentialbuilder</artifactId>
     	<version>${project.version}</version>  	
 	  </dependency>  

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthclient/pom.xml
----------------------------------------------------------------------
diff --git a/unixauthclient/pom.xml b/unixauthclient/pom.xml
index 8f52385..cb7dbce 100644
--- a/unixauthclient/pom.xml
+++ b/unixauthclient/pom.xml
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-      <groupId>org.apache.argus</groupId>
-      <artifactId>argus</artifactId>
+      <groupId>org.apache.ranger</groupId>
+      <artifactId>ranger</artifactId>
       <version>0.4.0</version>
       <relativePath>..</relativePath>
     </parent>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthnative/pom.xml
----------------------------------------------------------------------
diff --git a/unixauthnative/pom.xml b/unixauthnative/pom.xml
index eb2f608..edf4893 100644
--- a/unixauthnative/pom.xml
+++ b/unixauthnative/pom.xml
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-      <groupId>org.apache.argus</groupId>
-      <artifactId>argus</artifactId>
+      <groupId>org.apache.ranger</groupId>
+      <artifactId>ranger</artifactId>
       <version>0.4.0</version>
       <relativePath>..</relativePath>
     </parent>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/conf.dist/jaas.conf
----------------------------------------------------------------------
diff --git a/unixauthservice/conf.dist/jaas.conf b/unixauthservice/conf.dist/jaas.conf
new file mode 100644
index 0000000..af5e8db
--- /dev/null
+++ b/unixauthservice/conf.dist/jaas.conf
@@ -0,0 +1,6 @@
+PolicyManager {
+	com.xasecure.authentication.unix.jaas.RemoteUnixLoginModule REQUIRED
+			authServiceHostName="192.168.22.88" authServicePort="5151" debug="true"
+			keyStore="keystore.jks" keyStorePassword="password"
+			trustStore="unixauthclient.jks" trustStorePassword="mEmePaS3w9rD" ;
+} ;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/conf.dist/log4j.xml
----------------------------------------------------------------------
diff --git a/unixauthservice/conf.dist/log4j.xml b/unixauthservice/conf.dist/log4j.xml
new file mode 100644
index 0000000..0ef266b
--- /dev/null
+++ b/unixauthservice/conf.dist/log4j.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="true">
+
+   <appender name="logFile" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="file" value="${logdir}/usersync.log" />
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+        <layout class="org.apache.log4j.PatternLayout">
+		<param name="ConversionPattern" value="%d{dd MMM yyyy HH:mm:ss} %5p %c{1} [%t] - %m%n"/>
+        </layout>
+   </appender>
+
+  <appender name="console" class="org.apache.log4j.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+    <layout class="org.apache.log4j.PatternLayout">
+	<param name="ConversionPattern" value="%d{dd MMM yyyy HH:mm:ss} %5p %c{1} [%t] - %m%n"/>
+    </layout>
+  </appender>
+
+  <root>
+    <priority value ="info" />
+    <appender-ref ref="logFile" />
+  </root>
+
+</log4j:configuration>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/conf.dist/unixauthservice.properties
----------------------------------------------------------------------
diff --git a/unixauthservice/conf.dist/unixauthservice.properties b/unixauthservice/conf.dist/unixauthservice.properties
new file mode 100644
index 0000000..3b75abd
--- /dev/null
+++ b/unixauthservice/conf.dist/unixauthservice.properties
@@ -0,0 +1,151 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+authServicePort = 5151
+
+useSSL = true
+
+#
+# SSL Parameters
+#
+
+keyStore 			= 	./conf/cert/authserver.jks
+keyStorePassword	=	aNtHSrV086
+trustStore			=	./conf/cert/mytruststore.jks
+trustStorePassword  =   changeit
+passwordValidatorPath = ./native/credValidator.uexe
+
+#
+# Admin Groups
+#
+#admin.users   =
+
+#
+# Admin ROLE to be added
+#
+#admin.roleNames = ROLE_ADMIN
+
+#
+# User Group Synchronization
+#
+usergroupSync.enabled = true
+
+usergroupSync.source.impl.class=com.xasecure.unixusersync.process.UnixUserGroupBuilder
+
+usergroupSync.sink.impl.class=com.xasecure.unixusersync.process.PolicyMgrUserGroupBuilder
+
+
+#
+# UserGroupSink: policy manager
+#
+usergroupSync.policymanager.baseURL =
+
+usergroupSync.policymanager.MaxRecordsPerAPICall = 1000
+
+usergroupSync.policymanager.mockRun = false
+
+#
+# Relevant only if sync source is unix
+usergroupSync.unix.minUserId = 500
+
+# sync interval in milli seconds
+# user, groups would be synced again at the end of each sync interval
+#
+# default value is 300000(5min)
+# if value of usergroupSync.source.impl.class is
+# com.xasecure.unixusersync.process.UnixUserGroupBuilder
+#
+# default value is 21600000(360min)
+# if value of usergroupSync.source.impl.class is
+# com.xasecure.unixusersync.process.LdapUserGroupBuilder
+usergroupSync.sleepTimeInMillisBetweenSyncCycle =
+
+# sync source class
+# we provide 2 classes out of box
+# com.xasecure.unixusersync.process.UnixUserGroupBuilder
+# com.xasecure.ldapusersync.process.LdapUserGroupBuilder
+# default value:  com.xasecure.unixusersync.process.UnixUserGroupBuilder
+usergroupSync.source.impl.class =
+
+
+# ---------------------------------------------------------------
+# The following properties are relevant
+# only if value of usergroupSync.source.impl.class is
+# com.xasecure.unixusersync.process.LdapUserGroupBuilder
+# ---------------------------------------------------------------
+
+# URL of source ldap
+# a sample value would be:  ldap://ldap.example.com:389
+# Must specify a value if  value of usergroupSync.source.impl.class is
+# com.xasecure.unixusersync.process.LdapUserGroupBuilder
+ldapGroupSync.ldapUrl =
+
+# ldap bind dn used to connect to ldap and query for users and groups
+# a sample value would be cn=admin,ou=users,dc=hadoop,dc=apache,dc-org
+# must specify a value if  value of usergroupSync.source.impl.class is
+# com.xasecure.unixusersync.process.LdapUserGroupBuilder
+# Must specify a value if  value of usergroupSync.source.impl.class is
+# com.xasecure.unixusersync.process.LdapUserGroupBuilder
+ldapGroupSync.ldapBindDn =
+
+# ldap bind password for the bind dn specified above
+# please ensure read access to this file  is limited to root, to protect the password
+# Must specify a value if  value of usergroupSync.source.impl.class is
+# com.xasecure.unixusersync.process.LdapUserGroupBuilder
+# unless anonymous search is allowed by the directory on users and groups
+ldapGroupSync.ldapBindPassword =
+ldapGroupSync.ldapBindAlias =
+ldapGroupSync.ldapBindKeystore =
+# search base for users
+# sample value would be ou=users,dc=hadoop,dc=apache,dc=org
+# Must specify a value if  value of usergroupSync.source.impl.class is
+# com.xasecure.unixusersync.process.LdapUserGroupBuilder
+ldapGroupSync.userSearchBase =
+
+# search scope for the users, only base, one and sub are supported values
+# please customize the value to suit your deployment
+# default value: sub
+ldapGroupSync.userSearchScope =
+
+# objectclass to identify user entries
+# please customize the value to suit your deployment
+# default value: person
+ldapGroupSync.userObjectClass = person
+
+# optional additional filter constraining the users selected for syncing
+# a sample value would be (dept=eng)
+# please customize the value to suit your deployment
+# default value is empty
+ldapGroupSync.userSearchFilter =
+
+# attribute from user entry that would be treated as user name
+# please customize the value to suit your deployment
+# default value: cn
+ldapGroupSync.userNameAttribute = cn
+
+# attribute from user entry whose values would be treated as
+# group values to be pushed into Policy Manager database
+# You could provide multiple attribute names separated by comma
+# default value: memberof, ismemberof
+ldapGroupSync.userGroupNameAttribute =  memberof, ismemberof
+
+#
+# UserSync - Case Conversion Flags
+# possible values:  none, lower, upper
+ldapGroupSync.username.caseConversion=lower
+ldapGroupSync.groupname.caseConversion=lower
+#user sync log path
+logdir=/var/log/argus-usersync

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/conf/jaas.conf
----------------------------------------------------------------------
diff --git a/unixauthservice/conf/jaas.conf b/unixauthservice/conf/jaas.conf
deleted file mode 100644
index e0d70e6..0000000
--- a/unixauthservice/conf/jaas.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-PolicyManager {
-	com.xasecure.authentication.unix.jaas.RemoteUnixLoginModule REQUIRED  
-			authServiceHostName="192.168.22.88" authServicePort="5151" debug="true"
-			keyStore="keystore.jks" keyStorePassword="password"
-			trustStore="unixauthclient.jks" trustStorePassword="mEmePaS3w9rD" ;
-} ;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/conf/log4j.xml
----------------------------------------------------------------------
diff --git a/unixauthservice/conf/log4j.xml b/unixauthservice/conf/log4j.xml
deleted file mode 100644
index 4cd3808..0000000
--- a/unixauthservice/conf/log4j.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="true">
-
-   <appender name="logFile" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="file" value="${logdir}/unix-auth-sync.log" />
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-        <layout class="org.apache.log4j.PatternLayout">
-		<param name="ConversionPattern" value="%d{dd MMM yyyy HH:mm:ss} %5p %c{1} [%t] - %m%n"/>
-        </layout>
-   </appender>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender"> 
-    <param name="Target" value="System.out"/> 
-    <layout class="org.apache.log4j.PatternLayout"> 
-	<param name="ConversionPattern" value="%d{dd MMM yyyy HH:mm:ss} %5p %c{1} [%t] - %m%n"/>
-    </layout> 
-  </appender> 
-
-  <root> 
-    <priority value ="info" /> 
-    <appender-ref ref="logFile" /> 
-  </root>
-  
-</log4j:configuration>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/conf/unixauthservice.properties
----------------------------------------------------------------------
diff --git a/unixauthservice/conf/unixauthservice.properties b/unixauthservice/conf/unixauthservice.properties
deleted file mode 100644
index 7d583e7..0000000
--- a/unixauthservice/conf/unixauthservice.properties
+++ /dev/null
@@ -1,151 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-authServicePort = 5151
-
-useSSL = true
-
-#
-# SSL Parameters
-#
-
-keyStore 			= 	./cert/authserver.jks
-keyStorePassword	=	aNtHSrV086
-trustStore			=	./cert/mytruststore.jks
-trustStorePassword  =   changeit
-passwordValidatorPath = ./native/credValidator.uexe
-
-#
-# Admin Groups
-#
-#admin.users   = 
-
-#
-# Admin ROLE to be added
-#
-#admin.roleNames = ROLE_ADMIN
-
-#
-# User Group Synchronization
-#
-usergroupSync.enabled = true
-
-usergroupSync.source.impl.class=com.xasecure.unixusersync.process.UnixUserGroupBuilder
-
-usergroupSync.sink.impl.class=com.xasecure.unixusersync.process.PolicyMgrUserGroupBuilder
-
-
-#
-# UserGroupSink: policy manager
-#
-usergroupSync.policymanager.baseURL = 
-
-usergroupSync.policymanager.MaxRecordsPerAPICall = 1000
-
-usergroupSync.policymanager.mockRun = false
-
-#
-# Relevant only if sync source is unix
-usergroupSync.unix.minUserId = 500
-
-# sync interval in milli seconds
-# user, groups would be synced again at the end of each sync interval
-#
-# default value is 300000(5min)
-# if value of usergroupSync.source.impl.class is 
-# com.xasecure.unixusersync.process.UnixUserGroupBuilder
-#
-# default value is 21600000(360min)
-# if value of usergroupSync.source.impl.class is 
-# com.xasecure.unixusersync.process.LdapUserGroupBuilder
-usergroupSync.sleepTimeInMillisBetweenSyncCycle = 
-
-# sync source class
-# we provide 2 classes out of box
-# com.xasecure.unixusersync.process.UnixUserGroupBuilder
-# com.xasecure.ldapusersync.process.LdapUserGroupBuilder
-# default value:  com.xasecure.unixusersync.process.UnixUserGroupBuilder
-usergroupSync.source.impl.class =
-
-
-# ---------------------------------------------------------------
-# The following properties are relevant 
-# only if value of usergroupSync.source.impl.class is 
-# com.xasecure.unixusersync.process.LdapUserGroupBuilder
-# ---------------------------------------------------------------
-
-# URL of source ldap 
-# a sample value would be:  ldap://ldap.example.com:389
-# Must specify a value if  value of usergroupSync.source.impl.class is 
-# com.xasecure.unixusersync.process.LdapUserGroupBuilder
-ldapGroupSync.ldapUrl =
-
-# ldap bind dn used to connect to ldap and query for users and groups
-# a sample value would be cn=admin,ou=users,dc=hadoop,dc=apache,dc-org
-# must specify a value if  value of usergroupSync.source.impl.class is 
-# com.xasecure.unixusersync.process.LdapUserGroupBuilder
-# Must specify a value if  value of usergroupSync.source.impl.class is 
-# com.xasecure.unixusersync.process.LdapUserGroupBuilder
-ldapGroupSync.ldapBindDn =
-
-# ldap bind password for the bind dn specified above
-# please ensure read access to this file  is limited to root, to protect the password
-# Must specify a value if  value of usergroupSync.source.impl.class is 
-# com.xasecure.unixusersync.process.LdapUserGroupBuilder
-# unless anonymous search is allowed by the directory on users and groups
-ldapGroupSync.ldapBindPassword =
-ldapGroupSync.ldapBindAlias =
-ldapGroupSync.ldapBindKeystore =
-# search base for users
-# sample value would be ou=users,dc=hadoop,dc=apache,dc=org
-# Must specify a value if  value of usergroupSync.source.impl.class is 
-# com.xasecure.unixusersync.process.LdapUserGroupBuilder
-ldapGroupSync.userSearchBase =
-
-# search scope for the users, only base, one and sub are supported values
-# please customize the value to suit your deployment
-# default value: sub
-ldapGroupSync.userSearchScope =
-
-# objectclass to identify user entries
-# please customize the value to suit your deployment
-# default value: person
-ldapGroupSync.userObjectClass = person
-
-# optional additional filter constraining the users selected for syncing
-# a sample value would be (dept=eng)
-# please customize the value to suit your deployment
-# default value is empty
-ldapGroupSync.userSearchFilter =
-
-# attribute from user entry that would be treated as user name
-# please customize the value to suit your deployment
-# default value: cn
-ldapGroupSync.userNameAttribute = cn
-
-# attribute from user entry whose values would be treated as 
-# group values to be pushed into Policy Manager database
-# You could provide multiple attribute names separated by comma
-# default value: memberof, ismemberof
-ldapGroupSync.userGroupNameAttribute =  memberof, ismemberof
-
-#
-# UserSync - Case Conversion Flags
-# possible values:  none, lower, upper
-ldapGroupSync.username.caseConversion=lower
-ldapGroupSync.groupname.caseConversion=lower
-#user sync log path
-logdir=/var/log/argus-usersync

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/pom.xml
----------------------------------------------------------------------
diff --git a/unixauthservice/pom.xml b/unixauthservice/pom.xml
index a04d3d9..6e6ca97 100644
--- a/unixauthservice/pom.xml
+++ b/unixauthservice/pom.xml
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-      <groupId>org.apache.argus</groupId>
-      <artifactId>argus</artifactId>
+      <groupId>org.apache.ranger</groupId>
+      <artifactId>ranger</artifactId>
       <version>0.4.0</version>
       <relativePath>..</relativePath>
     </parent>
@@ -36,7 +36,7 @@
 
     <dependencies>
         <dependency>
-          <groupId>org.apache.argus</groupId>
+          <groupId>org.apache.ranger</groupId>
           <artifactId>unixusersync</artifactId>
           <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/scripts/initd
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/initd b/unixauthservice/scripts/initd
index 2f4caa0..7b0564c 100644
--- a/unixauthservice/scripts/initd
+++ b/unixauthservice/scripts/initd
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-INSTALL_BASE=/usr/lib
+INSTALL_BASE=/usr/bin
 
-MOD_NAME=argus-usersync
+MOD_NAME=ranger-usersync
 
 MOD_DIR=${INSTALL_BASE}/${MOD_NAME}
 

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/scripts/install.properties
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/install.properties b/unixauthservice/scripts/install.properties
index a32a1f8..63e4ffe 100644
--- a/unixauthservice/scripts/install.properties
+++ b/unixauthservice/scripts/install.properties
@@ -38,6 +38,10 @@ MIN_UNIX_USER_ID_TO_SYNC = 1000
 # defaults to 360 if SYNC_SOURCE is ldap
 SYNC_INTERVAL = 
 
+#User and group for the usersync process
+unix_user=ranger
+unix_group=ranger
+
 
 # ---------------------------------------------------------------
 # The following properties are relevant only if SYNC_SOURCE = ldap
@@ -96,4 +100,5 @@ SYNC_LDAP_USERNAME_CASE_CONVERSION=lower
 SYNC_LDAP_GROUPNAME_CASE_CONVERSION=lower
 
 #user sync log path
-logdir=/var/log/argus-usersync
+logdir=logs
+#/var/log/ranger/usersync

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/scripts/install.sh
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/install.sh b/unixauthservice/scripts/install.sh
deleted file mode 100755
index 6f647ed..0000000
--- a/unixauthservice/scripts/install.sh
+++ /dev/null
@@ -1,286 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-INSTALL_BASE=/usr/lib
-
-MOD_NAME="argus-usersync"
-
-INSTALL_DIR=${INSTALL_BASE}/${MOD_NAME}
-
-# Ensure that the user is root
-MY_ID=`id -u`
-if [ "${MY_ID}" -ne 0 ]
-then
-  echo "ERROR: You must run the installation as root user."
-  exit 1
-fi
-
-# Ensure JAVA_HOME is set
-if [ "${JAVA_HOME}" == "" ]
-then
-  echo "ERROR: JAVA_HOME environment property not defined, aborting installation"
-  exit 2
-fi
-
-
-# Grep configuration properties from install.properties
-cdir=`dirname $0`
-
-POLICY_MGR_URL=`grep '^[ \t]*POLICY_MGR_URL[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-MIN_UNIX_USER_ID_TO_SYNC=`grep '^[ \t]*MIN_UNIX_USER_ID_TO_SYNC[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-
-SYNC_SOURCE=`grep '^[ \t]*SYNC_SOURCE[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-
-SYNC_INTERVAL=`grep '^[ \t]*SYNC_INTERVAL[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-
-SYNC_LDAP_URL=`grep '^[ \t]*SYNC_LDAP_URL[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_URL[ \t]*=[ \t]*::'`
-
-SYNC_LDAP_BIND_DN=`grep '^[ \t]*SYNC_LDAP_BIND_DN[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_BIND_DN[ \t]*=[ \t]*::'`
-
-SYNC_LDAP_BIND_PASSWORD=`grep '^[ \t]*SYNC_LDAP_BIND_PASSWORD[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_BIND_PASSWORD[ \t]*=[ \t]*::'`
-
-SYNC_LDAP_USER_SEARCH_BASE=`grep '^[ \t]*SYNC_LDAP_USER_SEARCH_BASE[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_USER_SEARCH_BASE[ \t]*=[ \t]*::'`
-
-SYNC_LDAP_USER_SEARCH_SCOPE=`grep '^[ \t]*SYNC_LDAP_USER_SEARCH_SCOPE[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-
-SYNC_LDAP_USER_OBJECT_CLASS=`grep '^[ \t]*SYNC_LDAP_USER_OBJECT_CLASS[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-
-SYNC_LDAP_USER_SEARCH_FILTER=`grep '^[ \t]*SYNC_LDAP_USER_SEARCH_FILTER[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_USER_SEARCH_FILTER[ \t]*=[ \t]*::'`
-
-SYNC_LDAP_USER_NAME_ATTRIBUTE=`grep '^[ \t]*SYNC_LDAP_USER_NAME_ATTRIBUTE[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-
-SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE=`grep '^[ \t]*SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-
-SYNC_LDAP_USERNAME_CASE_CONVERSION=`grep '^[ \t]*SYNC_LDAP_USERNAME_CASE_CONVERSION[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-
-SYNC_LDAP_GROUPNAME_CASE_CONVERSION=`grep '^[ \t]*SYNC_LDAP_GROUPNAME_CASE_CONVERSION[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
-
-if [ "${SYNC_LDAP_USERNAME_CASE_CONVERSION}" == "" ]
-then
-    SYNC_LDAP_USERNAME_CASE_CONVERSION="none"
-fi
-
-if [ "${SYNC_LDAP_GROUPNAME_CASE_CONVERSION}" == "" ]
-then
-    SYNC_LDAP_GROUPNAME_CASE_CONVERSION="none"
-fi
-
-SYNC_LDAP_BIND_KEYSTOREPATH=`grep '^[ \t]*CRED_KEYSTORE_FILENAME[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*CRED_KEYSTORE_FILENAME[ \t]*=[ \t]*::'`
-
-SYNC_LDAP_BIND_ALIAS=ldap.bind.password
-
-if [ "${SYNC_INTERVAL}" != "" ]
-then 
-    SYNC_INTERVAL=$((${SYNC_INTERVAL}*60*1000))
-else
-    SYNC_INTERVAL=$((5*60*1000))
-fi
-
-if [ "${SYNC_SOURCE}" == "" ]
-then
-  SYNC_SOURCE="com.xasecure.unixusersync.process.UnixUserGroupBuilder"
-elif [ "${SYNC_SOURCE}" == "unix" ]
-then
-  SYNC_SOURCE="com.xasecure.unixusersync.process.UnixUserGroupBuilder"
-elif [ "${SYNC_SOURCE}" == "ldap" ]
-then
-  SYNC_SOURCE="com.xasecure.ldapusersync.process.LdapUserGroupBuilder"
-else
-  echo "Unsupported value for SYNC_SOURCE: ${SYNC_SOURCE}, supported values: ldap, unix, default: unix"
-  exit 3
-fi
-
-
-if [ "${SYNC_SOURCE}" == "com.xasecure.ldapusersync.process.LdapUserGroupBuilder" ]
-then
-
-  if [ "${SYNC_INTERVAL}" == "" ]
-  then
-    SYNC_INTERVAL=$((360*60*1000))
-  fi
-
-  if [ "${SYNC_LDAP_URL}" == "" ]
-  then
-    echo "SYNC_LDAP_URL must be specified when SYNC_SOURCE is ldap"
-    exit 4
-  fi
-
-  if [ "${SYNC_LDAP_BIND_DN}" == "" ]
-  then
-    echo "SYNC_LDAP_BIND_DN must be specified when SYNC_SOURCE is ldap"
-    exit 5
-  fi
-
-  if [ "${SYNC_LDAP_USER_SEARCH_BASE}" == "" ]
-  then
-    echo "SYNC_LDAP_USER_SEARCH_BASE must be specified when SYNC_SOURCE is ldap"
-    exit 6
-  fi
-
-  if [ "${SYNC_LDAP_USER_SEARCH_SCOPE}" == "" ]
-  then
-    SYNC_LDAP_USER_SEARCH_SCOPE="sub"
-  fi
-
-  if [ "${SYNC_LDAP_USER_SEARCH_SCOPE}" != "base" ] && [ "${SYNC_LDAP_USER_SEARCH_SCOPE}" != "one" ] && [ "${SYNC_LDAP_USER_SEARCH_SCOPE}" != "sub" ]
-  then
-    echo "Unsupported value for SYNC_LDAP_USER_SEARCH_SCOPE: ${SYNC_LDAP_USER_SEARCH_SCOPE}, supported values: base, one, sub"
-    exit 7
-  fi
-
-  if [ "${SYNC_LDAP_USER_OBJECT_CLASS}" == "" ]
-  then
-    SYNC_LDAP_USER_OBJECT_CLASS="person"
-  fi
-
-  if [ "${SYNC_LDAP_USER_NAME_ATTRIBUTE}" == "" ]
-  then
-    SYNC_LDAP_USER_NAME_ATTRIBUTE="cn"
-  fi
-
-  if [ "${SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE}" == "" ]
-  then
-    SYNC_LDAP_USER_NAME_ATTRIBUTE="memberof,ismemberof"
-  fi
-
-  # Store ldap bind password in credential store
-  if [[ "${SYNC_LDAP_BIND_ALIAS}" != ""  && "${SYNC_LDAP_BIND_KEYSTOREPATH}" != "" ]]
-  then
-    echo "Storing ldap bind password in credential store"
-   	mkdir -p `dirname "${SYNC_LDAP_BIND_KEYSTOREPATH}"`
-		java -cp "./lib/*" com.hortonworks.credentialapi.buildks create $SYNC_LDAP_BIND_ALIAS -value $SYNC_LDAP_BIND_PASSWORD -provider jceks://file$SYNC_LDAP_BIND_KEYSTOREPATH
-    SYNC_LDAP_BIND_PASSWORD="_"
-  fi
-
-fi
-# END Grep configuration properties from install.properties
-
-
-# Back up previously installed service folder and copy new service folder
-if [ "${cdir}" = "." ]
-then
-  cdir=`pwd`
-fi
-
-cdirname=`basename ${cdir}`
-
-if [ "${cdirname}" != "" ]
-then
-
-  #dstdir=${INSTALL_BASE}/${cdirname}
-
-  VERSION=`cat ${PWD}/version`
-
-  if [ "${VERSION}" != "" ]
-  then
-    dstdir=${INSTALL_BASE}/${MOD_NAME}-${VERSION}
-  else
-    dstdir=${INSTALL_BASE}/${MOD_NAME}-`date '+%Y%m%d%H%M%S'`
-  fi
-
-  if [ -d ${dstdir} ]
-  then
-    ctime=`date '+%s'`
-    archive_dir=${dstdir}-${ctime}
-    mkdir -p ${archive_dir}
-    mv ${dstdir} ${archive_dir}    
-  fi
-
-  mkdir ${dstdir}
-  
-  if [ -L ${INSTALL_DIR} ]
-    then
-        rm -f ${INSTALL_DIR}
-    fi
-
-  ln -s  ${dstdir} ${INSTALL_DIR}
-
-  (cd ${cdir} ; find . -print | cpio -pdm ${dstdir}) 
-  (cd ${cdir} ; cat start.sh | sed -e "s|[ \t]*JAVA_HOME=| JAVA_HOME=${JAVA_HOME}|" > ${dstdir}/start.sh)
-
-fi
-# END Back up previously installed service folder and copy new service folder
-
-# Create $INSTALL_DIR/conf/unixauthservice.properties
-CFG_FILE="${cdir}/conf/unixauthservice.properties"
-NEW_CFG_FILE=${dstdir}/conf/unixauthservice.properties
-
-if [ -f  ${CFG_FILE}  ]
-then
-  sed \
-    -e "s|^\( *usergroupSync.policymanager.baseURL *=\).*|\1 ${POLICY_MGR_URL}|" \
-    -e "s|^\( *usergroupSync.unix.minUserId *=\).*|\1 ${MIN_UNIX_USER_ID_TO_SYNC}|" \
-    -e "s|^\( *usergroupSync.sleepTimeInMillisBetweenSyncCycle *=\).*|\1 ${SYNC_INTERVAL}|" \
-    -e "s|^\( *usergroupSync.source.impl.class *=\).*|\1 ${SYNC_SOURCE}|" \
-    -e "s|^\( *ldapGroupSync.ldapUrl *=\).*|\1 ${SYNC_LDAP_URL}|" \
-    -e "s|^\( *ldapGroupSync.ldapBindDn *=\).*|\1 ${SYNC_LDAP_BIND_DN}|" \
-    -e "s|^\( *ldapGroupSync.ldapBindPassword *=\).*|\1 ${SYNC_LDAP_BIND_PASSWORD}|" \
-    -e "s|^\( *ldapGroupSync.ldapBindKeystore *=\).*|\1 ${SYNC_LDAP_BIND_KEYSTOREPATH}|" \
-    -e "s|^\( *ldapGroupSync.ldapBindAlias *=\).*|\1 ${SYNC_LDAP_BIND_ALIAS}|" \
-    -e "s|^\( *ldapGroupSync.userSearchBase *=\).*|\1 ${SYNC_LDAP_USER_SEARCH_BASE}|" \
-    -e "s|^\( *ldapGroupSync.userSearchScope *=\).*|\1 ${SYNC_LDAP_USER_SEARCH_SCOPE}|" \
-    -e "s|^\( *ldapGroupSync.userObjectClass *=\).*|\1 ${SYNC_LDAP_USER_OBJECT_CLASS}|" \
-    -e "s%^\( *ldapGroupSync.userSearchFilter *=\).*%\1 ${SYNC_LDAP_USER_SEARCH_FILTER}%" \
-    -e "s|^\( *ldapGroupSync.userNameAttribute *=\).*|\1 ${SYNC_LDAP_USER_NAME_ATTRIBUTE}|" \
-    -e "s|^\( *ldapGroupSync.userGroupNameAttribute *=\).*|\1 ${SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE}|" \
-    -e "s|^\( *ldapGroupSync.username.caseConversion *=\).*|\1 ${SYNC_LDAP_USERNAME_CASE_CONVERSION}|" \
-    -e "s|^\( *ldapGroupSync.groupname.caseConversion *=\).*|\1 ${SYNC_LDAP_GROUPNAME_CASE_CONVERSION}|" \
-    ${CFG_FILE} > ${NEW_CFG_FILE}
-else
-  echo "ERROR: Required file, not found: ${CFG_FILE}, Aborting installation"
-  exit 8
-fi
-#END Create $INSTALL_DIR/conf/unixauthservice.properties
-
-# Install the init.d process in /etc/init.d and create appropriate link to /etc/rc2.d folder
-if [ -d /etc/init.d ]
-then
-  cp ${cdir}/initd  /etc/init.d/${MOD_NAME}
-  chmod +x /etc/init.d/${MOD_NAME}
-  
-  if [ -d /etc/rc2.d ] 
-  then
-    echo "Creating boot script S99${MOD_NAME} in rc2.d directory .... "
-    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc2.d/S99${MOD_NAME}
-    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc2.d/K00${MOD_NAME}
-  fi
-  if [ -d /etc/rc3.d ]
-  then
-    echo "Creating boot script S99${MOD_NAME} in rc3.d directory .... "
-    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc3.d/S99${MOD_NAME}
-    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc3.d/K00${MOD_NAME}
-  fi
-
-  # SUSE has rc2.d and rc3.d under /etc/rc.d
-  if [ -d /etc/rc.d/rc2.d ] 
-  then
-    echo "Creating boot script S99${MOD_NAME} in rc2.d directory .... "
-    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc.d/rc2.d/S99${MOD_NAME}
-    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc.d/rc2.d/K00${MOD_NAME}
-  fi
-  if [ -d /etc/rc.d/rc3.d ]
-  then
-    echo "Creating boot script S99${MOD_NAME} in rc3.d directory .... "
-    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc.d/rc3.d/S99${MOD_NAME}
-    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc.d/rc3.d/K00${MOD_NAME}
-  fi
-
-fi
-
-# Start the service
-service ${MOD_NAME} start

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/scripts/set_globals.sh
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/set_globals.sh b/unixauthservice/scripts/set_globals.sh
new file mode 100755
index 0000000..6227575
--- /dev/null
+++ b/unixauthservice/scripts/set_globals.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#If it is a manual install, then it is recommended to run this for every install/upgrade, before the setup.sh is called
+#This script will create the appropriate soft links for folders and files
+#This script will not override existing configuration or log files.
+#This script creates the required folders in /etc/ranger, /var/log/ranger and other folders.
+#This will also create the ranger linux user and groups if required.
+
+#This script needs to be run as root
+if [ ! -w /etc/passwd ]; then
+	echo "ERROR: Please run this script as root"
+	exit 1
+fi
+
+#Go to the current build directory
+cd `dirname $0`
+if [ ! -d lib ]; then
+	echo "ERROR: The script needs to be in the installed directory for this version"
+	exit 1
+fi
+
+curDt=`date '+%Y%m%d%H%M%S'`
+LOGFILE=set_globals.log.$curDt
+
+log() {
+	local prefix="[$(date +%Y/%m/%d\ %H:%M:%S)]: "
+	echo "${prefix} $@" >> $LOGFILE
+	echo "${prefix} $@"
+}
+
+#Create the ranger users and groups (if needed)
+unix_user=ranger
+unix_group=ranger
+
+groupadd ${unix_group}
+ret=$?
+if [ $ret -ne 0 ] && [ $ret -ne 9 ]; then
+	echo "Error creating group $unix_group"
+	exit 1
+fi
+
+id -u ${unix_user} > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+    useradd ${unix_user} -g ${unix_group} -m
+else
+	usermod -g ${unix_group} ${unix_user}
+fi
+
+chown -R $unix_user *
+
+#Create etc conf folders
+if [ ! -d /etc/ranger/usersync/conf ]; then
+	#Create the conf file /etc and copy either from package conf or conf.dist
+	mkdir -p /etc/ranger/usersync/conf
+	if [ -d conf ]; then
+		#If conf already exists, then move it to /etc...
+		cp -r conf/* /etc/ranger/usersync/conf
+	else
+		cp -r conf.dist/* /etc/ranger/usersync/conf
+	fi
+	chmod 750 /etc/ranger/usersync/conf
+	chown -R $unix_user:$unix_group /etc/ranger/usersync/conf
+fi
+
+log "[I] Soft linking /etc/ranger/usersync/conf to ews/webapp/WEB-INF/classes/conf"
+mv -f conf conf.$curDt 2> /dev/null
+ln -sf /etc/ranger/usersync/conf conf
+
+#Create the log folder
+if [ ! -d /var/log/ranger/usersync ]; then
+	mkdir -p /var/log/ranger/usersync
+	if [ -d logs ]; then
+		cp -r logs/* /var/log/ranger/usersync
+	fi
+	chmod 755 /var/log/ranger/usersync
+	chown -R $unix_user:$unix_group /var/log/ranger
+fi
+mv -f logs logs.$curDt 2> /dev/null
+ln -sf /var/log/ranger/usersync logs

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/scripts/setup.sh
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/setup.sh b/unixauthservice/scripts/setup.sh
new file mode 100755
index 0000000..beeccc7
--- /dev/null
+++ b/unixauthservice/scripts/setup.sh
@@ -0,0 +1,331 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+INSTALL_BASE=$PWD
+
+MOD_NAME="ranger-usersync"
+unix_user=ranger
+unix_group=ranger
+
+INSTALL_DIR=${INSTALL_BASE}
+
+curDt=`date '+%Y%m%d%H%M%S'`
+LOGFILE=setup.log.$curDt
+
+log() {
+   local prefix="[$(date +%Y/%m/%d\ %H:%M:%S)]: "
+   echo "${prefix} $@" >> $LOGFILE
+   echo "${prefix} $@"
+}
+
+# Ensure that the user is root
+MY_ID=`id -u`
+if [ "${MY_ID}" -ne 0 ]
+then
+  echo "ERROR: You must run the installation as root user."
+  exit 1
+fi
+
+# Ensure JAVA_HOME is set
+if [ "${JAVA_HOME}" == "" ]
+then
+  echo "ERROR: JAVA_HOME environment property not defined, aborting installation"
+  exit 2
+fi
+
+
+# Grep configuration properties from install.properties
+cdir=`dirname $0`
+
+check_ret_status(){
+	if [ $1 -ne 0 ]; then
+		log "[E] $2";
+		exit 1;
+	fi
+}
+
+check_ret_status_for_groupadd(){
+# 9 is the response if the group exists
+    if [ $1 -ne 0 ] && [ $1 -ne 9 ]; then
+        log "[E] $2";
+        exit 1;
+    fi
+}
+
+setup_unix_user_group(){
+
+	log "[I] Setting up UNIX user : ${unix_user} and group: ${unix_group}";
+
+	groupadd ${unix_group}
+	check_ret_status_for_groupadd $? "Creating group ${unix_group} failed"
+
+	id -u ${unix_user} > /dev/null 2>&1
+
+	if [ $? -ne 0 ]
+	then
+	    log "[I] Creating new user and adding to group";
+        useradd ${unix_user} -g ${unix_group} -m
+		check_ret_status $? "useradd ${unix_user} failed"
+	else
+	    log "[I] User already exists, adding it to group";
+	    usermod -g ${unix_group} ${unix_user}
+	fi
+
+	log "[I] Setting up UNIX user : ${unix_user} and group: ${unix_group} DONE";
+}
+
+setup_unix_user_group
+
+POLICY_MGR_URL=`grep '^[ \t]*POLICY_MGR_URL[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+MIN_UNIX_USER_ID_TO_SYNC=`grep '^[ \t]*MIN_UNIX_USER_ID_TO_SYNC[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+logdir=`grep '^[ \t]*logdir[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+SYNC_SOURCE=`grep '^[ \t]*SYNC_SOURCE[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+SYNC_INTERVAL=`grep '^[ \t]*SYNC_INTERVAL[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+SYNC_LDAP_URL=`grep '^[ \t]*SYNC_LDAP_URL[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_URL[ \t]*=[ \t]*::'`
+
+SYNC_LDAP_BIND_DN=`grep '^[ \t]*SYNC_LDAP_BIND_DN[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_BIND_DN[ \t]*=[ \t]*::'`
+
+SYNC_LDAP_BIND_PASSWORD=`grep '^[ \t]*SYNC_LDAP_BIND_PASSWORD[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_BIND_PASSWORD[ \t]*=[ \t]*::'`
+
+SYNC_LDAP_USER_SEARCH_BASE=`grep '^[ \t]*SYNC_LDAP_USER_SEARCH_BASE[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_USER_SEARCH_BASE[ \t]*=[ \t]*::'`
+
+SYNC_LDAP_USER_SEARCH_SCOPE=`grep '^[ \t]*SYNC_LDAP_USER_SEARCH_SCOPE[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+SYNC_LDAP_USER_OBJECT_CLASS=`grep '^[ \t]*SYNC_LDAP_USER_OBJECT_CLASS[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+SYNC_LDAP_USER_SEARCH_FILTER=`grep '^[ \t]*SYNC_LDAP_USER_SEARCH_FILTER[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*SYNC_LDAP_USER_SEARCH_FILTER[ \t]*=[ \t]*::'`
+
+SYNC_LDAP_USER_NAME_ATTRIBUTE=`grep '^[ \t]*SYNC_LDAP_USER_NAME_ATTRIBUTE[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE=`grep '^[ \t]*SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+SYNC_LDAP_USERNAME_CASE_CONVERSION=`grep '^[ \t]*SYNC_LDAP_USERNAME_CASE_CONVERSION[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+SYNC_LDAP_GROUPNAME_CASE_CONVERSION=`grep '^[ \t]*SYNC_LDAP_GROUPNAME_CASE_CONVERSION[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
+
+if [ "${SYNC_LDAP_USERNAME_CASE_CONVERSION}" == "" ]
+then
+    SYNC_LDAP_USERNAME_CASE_CONVERSION="none"
+fi
+
+if [ "${SYNC_LDAP_GROUPNAME_CASE_CONVERSION}" == "" ]
+then
+    SYNC_LDAP_GROUPNAME_CASE_CONVERSION="none"
+fi
+
+SYNC_LDAP_BIND_KEYSTOREPATH=`grep '^[ \t]*CRED_KEYSTORE_FILENAME[ \t]*=' ${cdir}/install.properties | sed -e 's:^[ \t]*CRED_KEYSTORE_FILENAME[ \t]*=[ \t]*::'`
+
+SYNC_LDAP_BIND_ALIAS=ldap.bind.password
+
+if [ "${SYNC_INTERVAL}" != "" ]
+then
+    SYNC_INTERVAL=$((${SYNC_INTERVAL}*60*1000))
+else
+    SYNC_INTERVAL=$((5*60*1000))
+fi
+
+if [ "${SYNC_SOURCE}" == "" ]
+then
+  SYNC_SOURCE="com.xasecure.unixusersync.process.UnixUserGroupBuilder"
+elif [ "${SYNC_SOURCE}" == "unix" ]
+then
+  SYNC_SOURCE="com.xasecure.unixusersync.process.UnixUserGroupBuilder"
+elif [ "${SYNC_SOURCE}" == "ldap" ]
+then
+  SYNC_SOURCE="com.xasecure.ldapusersync.process.LdapUserGroupBuilder"
+else
+  echo "Unsupported value for SYNC_SOURCE: ${SYNC_SOURCE}, supported values: ldap, unix, default: unix"
+  exit 3
+fi
+
+
+if [ "${SYNC_SOURCE}" == "com.xasecure.ldapusersync.process.LdapUserGroupBuilder" ]
+then
+
+  if [ "${SYNC_INTERVAL}" == "" ]
+  then
+    SYNC_INTERVAL=$((360*60*1000))
+  fi
+
+  if [ "${SYNC_LDAP_URL}" == "" ]
+  then
+    echo "SYNC_LDAP_URL must be specified when SYNC_SOURCE is ldap"
+    exit 4
+  fi
+
+  if [ "${SYNC_LDAP_BIND_DN}" == "" ]
+  then
+    echo "SYNC_LDAP_BIND_DN must be specified when SYNC_SOURCE is ldap"
+    exit 5
+  fi
+
+  if [ "${SYNC_LDAP_USER_SEARCH_BASE}" == "" ]
+  then
+    echo "SYNC_LDAP_USER_SEARCH_BASE must be specified when SYNC_SOURCE is ldap"
+    exit 6
+  fi
+
+  if [ "${SYNC_LDAP_USER_SEARCH_SCOPE}" == "" ]
+  then
+    SYNC_LDAP_USER_SEARCH_SCOPE="sub"
+  fi
+
+  if [ "${SYNC_LDAP_USER_SEARCH_SCOPE}" != "base" ] && [ "${SYNC_LDAP_USER_SEARCH_SCOPE}" != "one" ] && [ "${SYNC_LDAP_USER_SEARCH_SCOPE}" != "sub" ]
+  then
+    echo "Unsupported value for SYNC_LDAP_USER_SEARCH_SCOPE: ${SYNC_LDAP_USER_SEARCH_SCOPE}, supported values: base, one, sub"
+    exit 7
+  fi
+
+  if [ "${SYNC_LDAP_USER_OBJECT_CLASS}" == "" ]
+  then
+    SYNC_LDAP_USER_OBJECT_CLASS="person"
+  fi
+
+  if [ "${SYNC_LDAP_USER_NAME_ATTRIBUTE}" == "" ]
+  then
+    SYNC_LDAP_USER_NAME_ATTRIBUTE="cn"
+  fi
+
+  if [ "${SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE}" == "" ]
+  then
+    SYNC_LDAP_USER_NAME_ATTRIBUTE="memberof,ismemberof"
+  fi
+
+  # Store ldap bind password in credential store
+  if [[ "${SYNC_LDAP_BIND_ALIAS}" != ""  && "${SYNC_LDAP_BIND_KEYSTOREPATH}" != "" ]]
+  then
+    echo "Storing ldap bind password in credential store"
+	mkdir -p `dirname "${SYNC_LDAP_BIND_KEYSTOREPATH}"`
+	chown ${unix_user}:${unix_group} `dirname "${SYNC_LDAP_BIND_KEYSTOREPATH}"`
+	java -cp "./lib/*" com.hortonworks.credentialapi.buildks create $SYNC_LDAP_BIND_ALIAS -value $SYNC_LDAP_BIND_PASSWORD -provider jceks://file$SYNC_LDAP_BIND_KEYSTOREPATH
+    SYNC_LDAP_BIND_PASSWORD="_"
+  fi
+
+fi
+# END Grep configuration properties from install.properties
+
+
+# Create $INSTALL_DIR/conf/unixauthservice.properties
+
+if [ ! -d conf ]; then
+    #Manual install
+    log "[I] Copying conf.dist conf"
+    mkdir conf
+    cp conf.dist/* conf
+	chown ${unix_user}:${unix_group} conf
+	chmod 750 conf
+fi
+
+echo "export JAVA_HOME=${JAVA_HOME}" > conf/java_home.sh
+chmod a+rx conf/java_home.sh
+
+if [ ! -d logs ]; then
+    #Manual install
+    log "[I] Creating logs folder"
+    mkdir logs
+    chown ${unix_user}:${unix_group} logs
+fi
+
+
+CFG_FILE="${cdir}/conf/unixauthservice.properties"
+NEW_CFG_FILE=${cdir}/conf/unixauthservice.properties.tmp
+
+if [ -f  ${CFG_FILE}  ]
+then
+    sed \
+	-e "s|^\( *usergroupSync.policymanager.baseURL *=\).*|\1 ${POLICY_MGR_URL}|" \
+	-e "s|^\( *usergroupSync.unix.minUserId *=\).*|\1 ${MIN_UNIX_USER_ID_TO_SYNC}|" \
+	-e "s|^\( *usergroupSync.sleepTimeInMillisBetweenSyncCycle *=\).*|\1 ${SYNC_INTERVAL}|" \
+	-e "s|^\( *usergroupSync.source.impl.class *=\).*|\1 ${SYNC_SOURCE}|" \
+	-e "s|^\( *ldapGroupSync.ldapUrl *=\).*|\1 ${SYNC_LDAP_URL}|" \
+	-e "s|^\( *ldapGroupSync.ldapBindDn *=\).*|\1 ${SYNC_LDAP_BIND_DN}|" \
+	-e "s|^\( *ldapGroupSync.ldapBindPassword *=\).*|\1 ${SYNC_LDAP_BIND_PASSWORD}|" \
+	-e "s|^\( *ldapGroupSync.ldapBindKeystore *=\).*|\1 ${SYNC_LDAP_BIND_KEYSTOREPATH}|" \
+	-e "s|^\( *ldapGroupSync.ldapBindAlias *=\).*|\1 ${SYNC_LDAP_BIND_ALIAS}|" \
+	-e "s|^\( *ldapGroupSync.userSearchBase *=\).*|\1 ${SYNC_LDAP_USER_SEARCH_BASE}|" \
+	-e "s|^\( *ldapGroupSync.userSearchScope *=\).*|\1 ${SYNC_LDAP_USER_SEARCH_SCOPE}|" \
+	-e "s|^\( *ldapGroupSync.userObjectClass *=\).*|\1 ${SYNC_LDAP_USER_OBJECT_CLASS}|" \
+	-e "s%^\( *ldapGroupSync.userSearchFilter *=\).*%\1 ${SYNC_LDAP_USER_SEARCH_FILTER}%" \
+	-e "s|^\( *ldapGroupSync.userNameAttribute *=\).*|\1 ${SYNC_LDAP_USER_NAME_ATTRIBUTE}|" \
+	-e "s|^\( *ldapGroupSync.userGroupNameAttribute *=\).*|\1 ${SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE}|" \
+	-e "s|^\( *ldapGroupSync.username.caseConversion *=\).*|\1 ${SYNC_LDAP_USERNAME_CASE_CONVERSION}|" \
+	-e "s|^\( *ldapGroupSync.groupname.caseConversion *=\).*|\1 ${SYNC_LDAP_GROUPNAME_CASE_CONVERSION}|" \
+	-e "s|^\( *logdir *=\).*|\1 ${logdir}|" \
+	${CFG_FILE} > ${NEW_CFG_FILE}
+
+    echo "<${logdir}> ${CFG_FILE} > ${NEW_CFG_FILE}"
+else
+    echo "ERROR: Required file, not found: ${CFG_FILE}, Aborting installation"
+    exit 8
+fi
+
+mv ${cdir}/conf/unixauthservice.properties ${cdir}/conf/unixauthservice.properties.${curDt}
+mv ${cdir}/conf/unixauthservice.properties.tmp ${cdir}/conf/unixauthservice.properties
+
+#END Create $INSTALL_DIR/conf/unixauthservice.properties
+
+#Update native exe
+#ranger-usersync/native/credValidator.uexe
+if [ -f ${cdir}/native/credValidator.uexe ]; then
+	chmod 750 ${cdir}/native/credValidator.uexe
+	chown root ${cdir}/native/credValidator.uexe
+	chgrp $unix_group ${cdir}/native/credValidator.uexe
+	chmod u+s ${cdir}/native/credValidator.uexe
+fi
+
+# Install the init.d process in /etc/init.d and create appropriate link to /etc/rc2.d folder
+if [ -d /etc/init.d ]
+then
+  cp ${cdir}/initd  /etc/init.d/${MOD_NAME}
+  chmod +x /etc/init.d/${MOD_NAME}
+
+  if [ -d /etc/rc2.d ]
+  then
+    echo "Creating boot script S99${MOD_NAME} in rc2.d directory .... "
+    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc2.d/S99${MOD_NAME}
+    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc2.d/K00${MOD_NAME}
+  fi
+  if [ -d /etc/rc3.d ]
+  then
+    echo "Creating boot script S99${MOD_NAME} in rc3.d directory .... "
+    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc3.d/S99${MOD_NAME}
+    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc3.d/K00${MOD_NAME}
+  fi
+
+  # SUSE has rc2.d and rc3.d under /etc/rc.d
+  if [ -d /etc/rc.d/rc2.d ]
+  then
+    echo "Creating boot script S99${MOD_NAME} in rc2.d directory .... "
+    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc.d/rc2.d/S99${MOD_NAME}
+    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc.d/rc2.d/K00${MOD_NAME}
+  fi
+  if [ -d /etc/rc.d/rc3.d ]
+  then
+    echo "Creating boot script S99${MOD_NAME} in rc3.d directory .... "
+    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc.d/rc3.d/S99${MOD_NAME}
+    ln -sf /etc/init.d/${MOD_NAME}  /etc/rc.d/rc3.d/K00${MOD_NAME}
+  fi
+
+fi
+
+# Start the service
+#service ${MOD_NAME} start

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/unixauthservice/scripts/start.sh
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/start.sh b/unixauthservice/scripts/start.sh
index 5e3ca5c..d75a8c3 100755
--- a/unixauthservice/scripts/start.sh
+++ b/unixauthservice/scripts/start.sh
@@ -15,11 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-echo "Starting UnixAuthenticationService"
-export JAVA_HOME=
-export PATH=$JAVA_HOME/bin:$PATH
-
 cdir=`dirname $0`
 
 if [ "${cdir}" = "." ]
@@ -27,20 +22,28 @@ then
 	cdir=`pwd`
 fi
 
+echo "Starting UnixAuthenticationService"
+#export JAVA_HOME=
+. ${cdir}/conf/java_home.sh
+
+if [ "$JAVA_HOME" != "" ]; then
+	export PATH=$JAVA_HOME/bin:$PATH
+fi
+
 pidf=${cdir}/.mypid
 
 #logdir=`grep '^[ \t]*logdir[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | sed -e 's:[ \t]*::g'`
 logdir=`grep -P '^[ \t]*logdir[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }' | tr '\t' ' ' | sed -e 's:[ ]::g'`
 if [ ! -d ${logdir} ]
 then
-	logdir=/var/log/argus-usersync
+	logdir=/var/log/ranger-usersync
 fi
 cp="${cdir}/dist/*:${cdir}/lib/*:${cdir}/conf"
 [ ! -d ${logdir} ] && mkdir -p ${logdir}
 ${cdir}/stop.sh
 cd ${cdir}
 umask 0077
-nohup java -Dlogdir="${logdir}" -cp "${cp}" com.xasecure.authentication.UnixAuthenticationService > ${logdir}/auth.log 2>&1 &
+nohup java -Dproc_rangerusersync -Dlogdir="${logdir}" -cp "${cp}" com.xasecure.authentication.UnixAuthenticationService > ${logdir}/auth.log 2>&1 &
 echo $! >  ${pidf}
 sleep 5
 port=`grep  '^[ ]*authServicePort' ${cdir}/conf/unixauthservice.properties | awk -F= '{ print $2 }' | awk '{ print $1 }'`

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/winpkg/pom.xml
----------------------------------------------------------------------
diff --git a/winpkg/pom.xml b/winpkg/pom.xml
new file mode 100644
index 0000000..a6253c8
--- /dev/null
+++ b/winpkg/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+		<groupId>org.apache.ranger</groupId>
+		<artifactId>ranger</artifactId>
+		<version>0.4.0</version>
+		<relativePath>..</relativePath>
+    </parent>
+    <groupId>com.hortonworks.hadoop.security</groupId>
+    <artifactId>ranger-winpkg</artifactId>
+    <description>Ranger WinPkg</description>
+    <name>Ranger WinPkg</name>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <finalName>ranger</finalName>
+                    <descriptors>
+                        <descriptor>/src/main/assemblies/winpkg.xml</descriptor>
+                    </descriptors>
+                </configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludeSubProjects>false</excludeSubProjects>
+					<!--numUnapprovedLicenses>100</numUnapprovedLicenses-->
+                    <excludes>
+                        <exclude>.git/**</exclude>
+                        <exclude>.gitignore/**</exclude>
+                        <exclude>.svn/**</exclude>
+                        <exclude>.idea/**</exclude>
+                        <exclude>**/.gitignore/**</exclude>
+                        <exclude>**/.project/**</exclude>
+                        <exclude>**/.settings/**</exclude>
+                        <exclude>**/.classpath/**</exclude>
+                        <exclude>**/*.iml</exclude>
+                        <exclude>**/target/**</exclude>
+                        <exclude>**/install/**</exclude>
+                        <exclude>**/candidate/**</exclude>
+                        <exclude>**/patch/**</exclude>
+                        <exclude>**/patchprocess/**</exclude>
+                        <exclude>**/test/resources/**</exclude>
+                        <exclude>**/main/resources/**/*.json</exclude>
+                        <exclude>*.patch</exclude>
+                        <exclude>README.txt</exclude>
+                        <exclude>HDP-CHANGES.txt</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>


Mime
View raw message