ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sneet...@apache.org
Subject [09/15] git commit: ARGUS-137 Rename Apache Argus to Apache Ranger on the codebase/config
Date Fri, 31 Oct 2014 21:03:47 GMT
ARGUS-137 Rename Apache Argus to Apache Ranger on the codebase/config

Signed-off-by: sneethiraj <sneethir@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/6af44c4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/6af44c4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/6af44c4f

Branch: refs/heads/master
Commit: 6af44c4f4f75bdc52039d829f5fb9d3ccbecfb81
Parents: a519885
Author: Don Bosco Durai <bosco@apache.org>
Authored: Wed Oct 29 17:50:37 2014 -0700
Committer: sneethiraj <sneethir@apache.org>
Committed: Wed Oct 29 19:09:28 2014 -0700

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 README.txt                                      |   26 +-
 .../.settings/org.eclipse.jdt.core.prefs        |    4 +
 agents-audit/pom.xml                            |   12 +-
 agents-common/pom.xml                           |   16 +-
 agents-common/scripts/enable-agent.sh           |   24 +-
 agents-cred/pom.xml                             |   10 +-
 agents-impl/pom.xml                             |   38 +-
 agents-installer/pom.xml                        |   10 +-
 credentialbuilder/pom.xml                       |    4 +-
 .../conf/ranger_webserver.properties            |   45 +
 embededwebserver/conf/xapolicymgr.properties    |   44 -
 embededwebserver/pom.xml                        |    4 +-
 embededwebserver/scripts/ranger-admin           |   37 +
 embededwebserver/scripts/start-ranger-admin.sh  |   43 +
 embededwebserver/scripts/startpolicymgr.sh      |   30 -
 embededwebserver/scripts/stop-ranger-admin.sh   |   43 +
 embededwebserver/scripts/stoppolicymgr.sh       |   27 -
 embededwebserver/scripts/xapolicymgr            |   35 -
 .../xasecure/server/tomcat/EmbededServer.java   |    2 +-
 hbase-agent/pom.xml                             |   16 +-
 hdfs-agent/conf/xasecure-hadoop-env.sh          |    6 +-
 hdfs-agent/pom.xml                              |   20 +-
 hive-agent/pom.xml                              |   16 +-
 knox-agent/pom.xml                              |   20 +-
 lookup-client/pom.xml                           |    4 +-
 pom.xml                                         |   82 +-
 security-admin/pom.xml                          |   10 +-
 security-admin/scripts/install.properties       |   18 +-
 security-admin/scripts/install.sh               | 1374 --------------
 security-admin/scripts/set_globals.sh           |   95 +
 security-admin/scripts/setup.sh                 | 1332 +++++++++++++
 security-admin/scripts/setup_authentication.sh  |   26 +-
 security-admin/src/bin/install.properties       |  126 ++
 security-admin/src/bin/ranger_install.py        | 1057 +++++++++++
 security-admin/src/bin/ranger_usersync.py       |  109 ++
 security-admin/src/bin/service_start.py         |   74 +
 .../conf.dist/security-applicationContext.xml   |  173 ++
 .../main/resources/conf.dist/xa_ldap.properties |   26 +
 .../resources/conf.dist/xa_system.properties    |   58 +
 .../src/main/resources/xa_default.properties    |    5 +-
 .../src/main/resources/xa_ldap.properties       |   26 -
 .../src/main/resources/xa_system.properties     |   65 -
 .../src/main/webapp/META-INF/context.xml        |   20 +
 .../META-INF/security-applicationContext.xml    |  173 --
 .../src/main/webapp/WEB-INF/log4j.dev.xml       |  104 +
 .../src/main/webapp/WEB-INF/log4j.xml           |   59 +-
 .../src/main/webapp/WEB-INF/log4j.xml.prod      |   87 -
 security-admin/src/main/webapp/WEB-INF/web.xml  |    2 +-
 src/main/assembly/admin-web.xml                 |   33 +-
 src/main/assembly/hbase-agent.xml               |   26 +-
 src/main/assembly/hdfs-agent.xml                |   28 +-
 src/main/assembly/hive-agent.xml                |   24 +-
 src/main/assembly/knox-agent.xml                |   26 +-
 src/main/assembly/ranger-src.xml                |   60 +
 src/main/assembly/storm-agent.xml               |   30 +-
 src/main/assembly/usersync.xml                  |   17 +-
 storm-agent/pom.xml                             |   22 +-
 ugsync/pom.xml                                  |    6 +-
 unixauthclient/pom.xml                          |    4 +-
 unixauthnative/pom.xml                          |    4 +-
 unixauthservice/conf.dist/jaas.conf             |    6 +
 unixauthservice/conf.dist/log4j.xml             |   42 +
 .../conf.dist/unixauthservice.properties        |  151 ++
 unixauthservice/conf/jaas.conf                  |    6 -
 unixauthservice/conf/log4j.xml                  |   42 -
 unixauthservice/conf/unixauthservice.properties |  151 --
 unixauthservice/pom.xml                         |    6 +-
 unixauthservice/scripts/initd                   |    4 +-
 unixauthservice/scripts/install.properties      |    7 +-
 unixauthservice/scripts/install.sh              |  286 ---
 unixauthservice/scripts/set_globals.sh          |   93 +
 unixauthservice/scripts/setup.sh                |  331 ++++
 unixauthservice/scripts/start.sh                |   17 +-
 winpkg/pom.xml                                  |   94 +
 winpkg/src/main/assemblies/winpkg.xml           |   63 +
 winpkg/src/resources/servicehost.exe            |  Bin 0 -> 13824 bytes
 winpkg/src/resources/winpkg.cmd                 |   18 +
 winpkg/src/resources/winpkg.ps1                 |  575 ++++++
 winpkg/src/resources/winpkg.utils.psm1          |  310 +++
 winpkg/src/scripts/InstallApi.psm1              | 1787 ++++++++++++++++++
 winpkg/src/scripts/install.cmd                  |   18 +
 winpkg/src/scripts/install.ps1                  |  486 +++++
 winpkg/src/scripts/uninstall.cmd                |   18 +
 winpkg/src/scripts/uninstall.ps1                |   42 +
 winpkg/src/template/bin/hiveserver2-argus.cmd   |   91 +
 winpkg/src/template/bin/xasecure-hadoop-env.cmd |   24 +
 87 files changed, 7906 insertions(+), 2680 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0d6d502..f665a6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .classpath
 .project
 /target/
+winpkg/target

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index ba63e47..8f7ce00 100644
--- a/README.txt
+++ b/README.txt
@@ -10,13 +10,13 @@ Build Process
 
 3. After the above build command execution, you should see the following TAR files in the target folder:
 
-	argus-<version-number>-admin.tar
-	argus-<version-number>-usersync.tar
-	argus-<version-number>-hdfs-agent.tar
-	argus-<version-number>-hive-agent.tar
-	argus-<version-number>-hbase-agent.tar
-	argus-<version-number>-knox-agent.tar
-	argus-<version-number>-storm-agent.tar
+	ranger-<version-number>-admin.tar
+	ranger-<version-number>-usersync.tar
+	ranger-<version-number>-hdfs-plugin.tar
+	ranger-<version-number>-hive-plugin.tar
+	ranger-<version-number>-hbase-plugin.tar
+	ranger-<version-number>-knox-plugin.tar
+	ranger-<version-number>-storm-plugin.tar
 
 Importing Argus Project into Eclipse
 ====================================
@@ -31,9 +31,9 @@ Deployment Process
 
 Installation Host Information
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1.	Argus Admin Tool Component  (argus-<version-number>-admin.tar) should be installed on a host where Policy Admin Tool web application runs on port 6080 (default).
-2.  Argus User Synchronization Component (argus-<version-number>-usersync.tar) should be installed on a host to synchronize the external user/group information into Argus database via Argus Admin Tool.
-3.  Argus Component Agents (plugin) should be installed on the component boxes:
+1.	Ranger Admin Tool Component  (ranger-<version-number>-admin.tar) should be installed on a host where Policy Admin Tool web application runs on port 6080 (default).
+2.  Ranger User Synchronization Component (ranger-<version-number>-usersync.tar) should be installed on a host to synchronize the external user/group information into Ranger database via Ranger Admin Tool.
+3.  Ranger Component Agents (plugin) should be installed on the component boxes:
 	(a)  HDFS Agent needs to be installed on Name Node hosts
 	(b)  Hive Agent needs to be installed on HiveServer2 hosts
 	(c)  HBase Agent needs to be installed on both Master and Regional Server nodes.
@@ -45,9 +45,9 @@ Installation Process
 
 1. Download the tar file into a temporary folder in the box where it needs to be installed.
 
-2. Expand the tar file into /usr/lib/argus/ folder
+2. Expand the tar file into /usr/lib/ranger/ folder
 
-3. Go to the component name under the expanded folder (e.g. /usr/lib/argus/argus-<version-number>-admin/) 
+3. Go to the component name under the expanded folder (e.g. /usr/lib/ranger/ranger-<version-number>-admin/)
 
 4. Modify the install.properties file with appropriate variables
 
@@ -55,5 +55,5 @@ Installation Process
 	Execute ./install.sh
 
    If the install.sh file does not exists, 
-	Execute ./enable-<component>-agent.sh
+	Execute ./enable-<component>-plugin.sh
 

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/agents-audit/.settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/agents-audit/.settings/org.eclipse.jdt.core.prefs b/agents-audit/.settings/org.eclipse.jdt.core.prefs
index 69c31cd..107056a 100644
--- a/agents-audit/.settings/org.eclipse.jdt.core.prefs
+++ b/agents-audit/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/agents-audit/pom.xml
----------------------------------------------------------------------
diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml
index bc29a36..b437bc1 100644
--- a/agents-audit/pom.xml
+++ b/agents-audit/pom.xml
@@ -17,8 +17,8 @@
 -->
 <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.agents-audit</groupId>
-  <artifactId>agents-audit</artifactId>
+  <groupId>security_plugins.ranger-plugins-audit</groupId>
+  <artifactId>ranger-plugins-audit</artifactId>
   <name>Audit Component</name>
   <description>Auth Audit</description>
   <packaging>jar</packaging>
@@ -26,15 +26,15 @@
     <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>
   <dependencies>
     <dependency>
-	<groupId>security_agents.agents-cred</groupId>
-	<artifactId>agents-cred</artifactId>
+	<groupId>security_plugins.ranger-plugins-cred</groupId>
+	<artifactId>ranger-plugins-cred</artifactId>
         <version>${project.version}</version>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/agents-common/pom.xml
----------------------------------------------------------------------
diff --git a/agents-common/pom.xml b/agents-common/pom.xml
index 7c73be4..a26f45d 100644
--- a/agents-common/pom.xml
+++ b/agents-common/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.agents-common</groupId>
-  <artifactId>agents-common</artifactId>
-  <name>Common library for Agents</name>
-  <description>Agent Common</description>
+  <groupId>security_plugins.ranger-plugins-common</groupId>
+  <artifactId>ranger-plugins-common</artifactId>
+  <name>Common library for Plugins</name>
+  <description>Plugins Common</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>
@@ -53,8 +53,8 @@
         <version>${log4j.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>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/agents-common/scripts/enable-agent.sh
----------------------------------------------------------------------
diff --git a/agents-common/scripts/enable-agent.sh b/agents-common/scripts/enable-agent.sh
index 2617582..37ee161 100755
--- a/agents-common/scripts/enable-agent.sh
+++ b/agents-common/scripts/enable-agent.sh
@@ -20,7 +20,7 @@
 # Base env variable for ARGUS related files/directories
 #
 
-PROJ_NAME=argus
+PROJ_NAME=ranger
 BASE_CONF_DIR=/etc/${PROJ_NAME}
 
 #
@@ -52,15 +52,15 @@ fi
 
 COMPONENT_NAME=`basename $0 | cut -d. -f1 | sed -e 's:^disable-::' | sed -e 's:^enable-::'`
 
-echo "${COMPONENT_NAME}" | grep 'agent' > /dev/null 2>&1
+echo "${COMPONENT_NAME}" | grep 'plugin' > /dev/null 2>&1
 
 if [ $? -ne 0 ]
 then
-	echo "$0 : is not applicable for component [${COMPONENT_NAME}]. It is applicable only for argus agent component; Exiting ..."
+	echo "$0 : is not applicable for component [${COMPONENT_NAME}]. It is applicable only for ranger plugin component; Exiting ..."
 	exit 0 
 fi
 
-HCOMPONENT_NAME=`echo ${COMPONENT_NAME} | sed -e 's:-agent::'`
+HCOMPONENT_NAME=`echo ${COMPONENT_NAME} | sed -e 's:-plugin::'`
 
 CFG_OWNER_INF="${HCOMPONENT_NAME}:${HCOMPONENT_NAME}"
 
@@ -96,7 +96,7 @@ PROJ_INSTALL_LIB_DIR="${PROJ_INSTALL_DIR}/install/lib"
 INSTALL_ARGS="${PROJ_INSTALL_DIR}/install.properties"
 JAVA=java
 
-hdir=${PROJ_INSTALL_DIR}/../../${HCOMPONENT_NAME}
+hdir=${PROJ_INSTALL_DIR}/../${HCOMPONENT_NAME}
 
 #
 # TEST - START
@@ -171,7 +171,7 @@ create_jceks() {
 	if [ $? -ne 0 ]
 	then
 		echo "Unable to store password in non-plain text format. Error: [`cat ${tempFile}`]"
-		echo "Exiting agent installation"
+		echo "Exiting plugin installation"
 		rm -f ${tempFile}
 		exit 0
 	fi
@@ -180,7 +180,7 @@ create_jceks() {
 }
 
 #
-# If there is a set-argus-${COMPONENT}-env.sh, install it
+# If there is a set-ranger-${COMPONENT}-env.sh, install it
 #
 dt=`date '+%Y%m%d-%H%M%S'`
 
@@ -254,9 +254,9 @@ then
 	INSTALL_CP="${PROJ_INSTALL_LIB_DIR}/*" 
 	if [ "${action}" = "enable" ]
 	then
-		echo "<argus>\n<enabled>`date`</enabled>\n</argus>" > ${HCOMPONENT_CONF_DIR}/argus-security.xml
-		chown ${CFG_OWNER_INF} ${HCOMPONENT_CONF_DIR}/argus-security.xml
-		chmod a+r ${HCOMPONENT_CONF_DIR}/argus-security.xml
+		echo "<ranger>\n<enabled>`date`</enabled>\n</ranger>" > ${HCOMPONENT_CONF_DIR}/ranger-security.xml
+		chown ${CFG_OWNER_INF} ${HCOMPONENT_CONF_DIR}/ranger-security.xml
+		chmod a+r ${HCOMPONENT_CONF_DIR}/ranger-security.xml
 		for cf in ${PROJ_INSTALL_DIR}/install/conf.templates/${action}/*.xml
 		do
 			cfb=`basename ${cf}`
@@ -270,9 +270,9 @@ then
 			chmod a+r ${HCOMPONENT_CONF_DIR}/${cfb}
 		done
     else
-		if [ -f ${HCOMPONENT_CONF_DIR}/argus-security.xml ]
+		if [ -f ${HCOMPONENT_CONF_DIR}/ranger-security.xml ]
 		then
-			mv ${HCOMPONENT_CONF_DIR}/argus-security.xml ${HCOMPONENT_CONF_DIR}/.argus-security.xml.`date '+%Y%m%d%H%M%S'`
+			mv ${HCOMPONENT_CONF_DIR}/ranger-security.xml ${HCOMPONENT_CONF_DIR}/.ranger-security.xml.`date '+%Y%m%d%H%M%S'`
 		fi
 	fi
 

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/agents-cred/pom.xml
----------------------------------------------------------------------
diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml
index df22270..13108ee 100644
--- a/agents-cred/pom.xml
+++ b/agents-cred/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.agents-cred</groupId>
-  <artifactId>agents-cred</artifactId>
+  <groupId>security_plugins.ranger-plugins-cred</groupId>
+  <artifactId>ranger-plugins-cred</artifactId>
   <name>Credential Support</name>
-  <description>Agent Common</description>
+  <description>Plugins Common</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>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/agents-impl/pom.xml
----------------------------------------------------------------------
diff --git a/agents-impl/pom.xml b/agents-impl/pom.xml
index 6f9fda6..a5bded8 100644
--- a/agents-impl/pom.xml
+++ b/agents-impl/pom.xml
@@ -17,14 +17,14 @@
 -->
 <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.agents-impl</groupId>
-  <artifactId>agents-impl</artifactId>
+  <groupId>security_plugins.ranger-plugins-impl</groupId>
+  <artifactId>ranger-plugins-impl</artifactId>
   <name>Agent Implementation Libary</name>
-  <description>Security Agents Implementation</description>
+  <description>Security Plugins Implementation</description>
   <packaging>jar</packaging>
   <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>
@@ -80,38 +80,38 @@
       <systemPath>${local.lib.dir}/hive-0.14.0-SNAPSHOT/hive-metastore-0.14.0-SNAPSHOT.jar</systemPath>
     </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>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.hdfs-agent</groupId>
-      <artifactId>hdfs-agent</artifactId>
+      <groupId>security_plugins.ranger-hdfs-plugin</groupId>
+      <artifactId>ranger-hdfs-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>security_agents.hive-agent</groupId>
-      <artifactId>hive-agent</artifactId>
+      <groupId>security_plugins.ranger-hive-plugin</groupId>
+      <artifactId>ranger-hive-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>security_agents.hbase-agent</groupId>
-      <artifactId>hbase-agent</artifactId>
+      <groupId>security_plugins.ranger-hbase-plugin</groupId>
+      <artifactId>ranger-hbase-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>security_agents.knox-agent</groupId>
-      <artifactId>knox-agent</artifactId>
+      <groupId>security_plugins.ranger-knox-plugin</groupId>
+      <artifactId>ranger-knox-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>security_agents.storm-agent</groupId>
-      <artifactId>storm-agent</artifactId>
+      <groupId>security_plugins.ranger-storm-plugin</groupId>
+      <artifactId>ranger-storm-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/agents-installer/pom.xml
----------------------------------------------------------------------
diff --git a/agents-installer/pom.xml b/agents-installer/pom.xml
index 7efa39b..1c3d1b8 100644
--- a/agents-installer/pom.xml
+++ b/agents-installer/pom.xml
@@ -17,14 +17,14 @@
 -->
 <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.agents-installer</groupId>
-  <artifactId>agents-installer</artifactId>
+  <groupId>security_plugins.ranger-plugins-installer</groupId>
+  <artifactId>ranger-plugins-installer</artifactId>
   <name>Installer Support Component</name>
-  <description>Security Agents Installer</description>
+  <description>Security Plugins Installer</description>
   <packaging>jar</packaging>
   <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/credentialbuilder/pom.xml
----------------------------------------------------------------------
diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml
index ec35be8..a360bfc 100644
--- a/credentialbuilder/pom.xml
+++ b/credentialbuilder/pom.xml
@@ -23,8 +23,8 @@
   <description>Credential Builder for non-hadoop java codebase</description>
   <packaging>jar</packaging>
   <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/embededwebserver/conf/ranger_webserver.properties
----------------------------------------------------------------------
diff --git a/embededwebserver/conf/ranger_webserver.properties b/embededwebserver/conf/ranger_webserver.properties
new file mode 100644
index 0000000..6051093
--- /dev/null
+++ b/embededwebserver/conf/ranger_webserver.properties
@@ -0,0 +1,45 @@
+# 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.
+
+#
+# Service Information
+#
+service.host=localhost
+http.service.port=6080
+service.shutdownPort=6085
+service.shutdownCommand=SHUTDOWN
+
+#
+# SSL Connector Information
+#
+#https.service.port=6182
+https.attrib.SSLEnabled=true
+https.attrib.sslProtocol=TLS
+https.attrib.clientAuth=false
+https.attrib.keyAlias=myKey
+https.attrib.keystorePass=xasecure
+https.attrib.keystoreFile=/etc/ranger/admin/keys/server.jks
+
+#
+# Access Log Information
+#
+accesslog.dateformat=yyyy-MM-dd
+accesslog.pattern=%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"
+
+#
+# Root Context Application
+#
+#TODO: Need to update this to reflect apache path
+xa.webapp.dir=/usr/hdp/current/ranger-admin/ews/webapp

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/embededwebserver/conf/xapolicymgr.properties
----------------------------------------------------------------------
diff --git a/embededwebserver/conf/xapolicymgr.properties b/embededwebserver/conf/xapolicymgr.properties
deleted file mode 100644
index b43ec8d..0000000
--- a/embededwebserver/conf/xapolicymgr.properties
+++ /dev/null
@@ -1,44 +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.
-
-#
-# Service Information
-#
-service.host=localhost
-http.service.port=6080
-service.shutdownPort=6085
-service.shutdownCommand=SHUTDOWN
-
-#
-# SSL Connector Information
-#
-#https.service.port=6182
-https.attrib.SSLEnabled=true
-https.attrib.sslProtocol=TLS
-https.attrib.clientAuth=false
-https.attrib.keyAlias=myKey
-https.attrib.keystorePass=xasecure
-https.attrib.keystoreFile=/usr/lib/xapolicymgr/ews/keys/server.jks 
-
-#
-# Access Log Information
-#
-accesslog.dateformat=yyyy-MM-dd
-accesslog.pattern=%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"
-
-#
-# Root Context Application
-#
-xa.webapp.dir=/usr/lib/xapolicymgr/ews/webapp

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/embededwebserver/pom.xml
----------------------------------------------------------------------
diff --git a/embededwebserver/pom.xml b/embededwebserver/pom.xml
index fb403f5..f686372 100644
--- a/embededwebserver/pom.xml
+++ b/embededwebserver/pom.xml
@@ -23,8 +23,8 @@
   <description>Embeded Web Server Invoker</description>
   <packaging>jar</packaging>
   <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/embededwebserver/scripts/ranger-admin
----------------------------------------------------------------------
diff --git a/embededwebserver/scripts/ranger-admin b/embededwebserver/scripts/ranger-admin
new file mode 100755
index 0000000..3258692
--- /dev/null
+++ b/embededwebserver/scripts/ranger-admin
@@ -0,0 +1,37 @@
+#!/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.
+
+
+LINUX_USER=ranger
+BIN_PATH=/usr/bin
+
+case $1 in
+start)
+	/bin/su --login  $LINUX_USER "${BIN_PATH}/start-ranger-admin"
+	;;
+stop)
+	/bin/su --login  $LINUX_USER "${BIN_PATH}/stop-ranger-admin"
+    ;;
+restart)
+	/bin/su --login  $LINUX_USER "${BIN_PATH}/stop-ranger-admin.sh"  && sleep 30
+	/bin/su --login  $LINUX_USER "${BIN_PATH}/start-ranger-admin.sh"
+
+	;;
+*)
+	echo "Invalid argument [$1]; Only start|stop|restart are supported."
+    exit 1
+esac

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/embededwebserver/scripts/start-ranger-admin.sh
----------------------------------------------------------------------
diff --git a/embededwebserver/scripts/start-ranger-admin.sh b/embededwebserver/scripts/start-ranger-admin.sh
new file mode 100755
index 0000000..fb6ad2e
--- /dev/null
+++ b/embededwebserver/scripts/start-ranger-admin.sh
@@ -0,0 +1,43 @@
+#!/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.
+
+cd `dirname $0`
+XAPOLICYMGR_DIR=`pwd`
+
+XAPOLICYMGR_EWS_DIR=${XAPOLICYMGR_DIR}/ews
+RANGER_JAAS_LIB_DIR="${XAPOLICYMGR_EWS_DIR}/ranger_jaas"
+RANGER_JAAS_CONF_DIR="${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf/ranger_jaas"
+
+if [ -f ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ranger_admin_env.sh ]; then
+	. ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ranger_admin_env.sh
+fi
+
+#export JAVA_HOME=
+if [ -f ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh ]; then
+	. ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh
+fi
+if [ "$JAVA_HOME" != "" ]; then
+	export PATH=$JAVA_HOME/bin:$PATH
+fi
+
+cd ${XAPOLICYMGR_EWS_DIR}
+if [ ! -d logs ]
+then
+	mkdir logs
+fi
+java -Dproc_rangeradmin -Xmx1024m -Xms1024m -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*" com.xasecure.server.tomcat.EmbededServer > logs/catalina.out 2>&1 &
+echo "Apache Ranger Admin has started"

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/embededwebserver/scripts/startpolicymgr.sh
----------------------------------------------------------------------
diff --git a/embededwebserver/scripts/startpolicymgr.sh b/embededwebserver/scripts/startpolicymgr.sh
deleted file mode 100755
index 42eadc1..0000000
--- a/embededwebserver/scripts/startpolicymgr.sh
+++ /dev/null
@@ -1,30 +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.
-
-
-export JAVA_HOME=
-export PATH=$JAVA_HOME/bin:$PATH
-
-XAPOLICYMGR_DIR=/usr/lib/xapolicymgr
-XAPOLICYMGR_EWS_DIR=${XAPOLICYMGR_DIR}/ews
-cd ${XAPOLICYMGR_EWS_DIR}
-if [ ! -d logs ]
-then
-	mkdir logs
-fi
-java -Xmx1024m -Xms1024m -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/lib/*:${XAPOLICYMGR_DIR}/xasecure_jaas/*:${XAPOLICYMGR_DIR}/xasecure_jaas:${JAVA_HOME}/lib/*" com.xasecure.server.tomcat.EmbededServer > logs/catalina.out 2>&1 &
-echo "XAPolicyManager has started successfully."

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/embededwebserver/scripts/stop-ranger-admin.sh
----------------------------------------------------------------------
diff --git a/embededwebserver/scripts/stop-ranger-admin.sh b/embededwebserver/scripts/stop-ranger-admin.sh
new file mode 100755
index 0000000..97179cf
--- /dev/null
+++ b/embededwebserver/scripts/stop-ranger-admin.sh
@@ -0,0 +1,43 @@
+#!/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.
+
+cd `dirname $0`
+XAPOLICYMGR_DIR=`pwd`
+
+XAPOLICYMGR_EWS_DIR=${XAPOLICYMGR_DIR}/ews
+RANGER_JAAS_LIB_DIR="${XAPOLICYMGR_EWS_DIR}/ranger_jaas"
+RANGER_JAAS_CONF_DIR="${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf/ranger_jaas"
+
+if [ -f ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ranger_admin_env.sh ]; then
+	. ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ranger_admin_env.sh
+fi
+
+#export JAVA_HOME=
+if [ -f ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh ]; then
+	. ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh
+fi
+if [ "$JAVA_HOME" != "" ]; then
+	export PATH=$JAVA_HOME/bin:$PATH
+fi
+
+cd ${XAPOLICYMGR_EWS_DIR}
+if [ ! -d logs ]
+then
+	mkdir logs
+fi
+java -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}" com.xasecure.server.tomcat.StopEmbededServer > logs/catalina.out 2>&1
+echo "Apache Ranger Admin has been stopped."

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/embededwebserver/scripts/stoppolicymgr.sh
----------------------------------------------------------------------
diff --git a/embededwebserver/scripts/stoppolicymgr.sh b/embededwebserver/scripts/stoppolicymgr.sh
deleted file mode 100755
index cb31902..0000000
--- a/embededwebserver/scripts/stoppolicymgr.sh
+++ /dev/null
@@ -1,27 +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.
-
-XAPOLICYMGR_DIR=/usr/lib/xapolicymgr
-XAPOLICYMGR_EWS_DIR=${XAPOLICYMGR_DIR}/ews
-cd ${XAPOLICYMGR_EWS_DIR}
-if [ ! -d logs ]
-then
-	mkdir logs
-fi
-java -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/lib/*:${XAPOLICYMGR_DIR}/xasecure_jaas/*" com.xasecure.server.tomcat.StopEmbededServer > logs/catalina.out 2>&1
-echo "XAPolicyManager has been stopped."
-

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/embededwebserver/scripts/xapolicymgr
----------------------------------------------------------------------
diff --git a/embededwebserver/scripts/xapolicymgr b/embededwebserver/scripts/xapolicymgr
deleted file mode 100644
index 821d22e..0000000
--- a/embededwebserver/scripts/xapolicymgr
+++ /dev/null
@@ -1,35 +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.
-
-POLICYMGR_HOME=/usr/lib/xapolicymgr
-export POLICYMGR_HOME
-
-case $1 in
-start)
-	/bin/su --login  xasecure "${POLICYMGR_HOME}/startpolicymgr.sh"
-	;;
-stop)
-	/bin/su --login  xasecure "${POLICYMGR_HOME}/stoppolicymgr.sh"
-    ;;
-restart)
-	/bin/su --login  xasecure "${POLICYMGR_HOME}/stoppolicymgr.sh"  && sleep 30
-	/bin/su --login  xasecure "${POLICYMGR_HOME}/startpolicymgr.sh"
-
-	;;
-*)
-	echo "Invalid argument [$1]; Only start|stop|restart are supported."
-    exit 1
-esac

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/embededwebserver/src/main/java/com/xasecure/server/tomcat/EmbededServer.java
----------------------------------------------------------------------
diff --git a/embededwebserver/src/main/java/com/xasecure/server/tomcat/EmbededServer.java b/embededwebserver/src/main/java/com/xasecure/server/tomcat/EmbededServer.java
index 1b3373b..ca26852 100644
--- a/embededwebserver/src/main/java/com/xasecure/server/tomcat/EmbededServer.java
+++ b/embededwebserver/src/main/java/com/xasecure/server/tomcat/EmbededServer.java
@@ -40,7 +40,7 @@ public class EmbededServer {
 	
 	private static final Logger LOG = Logger.getLogger(EmbededServer.class.getName()) ;
 	
-	private static final String DEFAULT_CONFIG_FILENAME = "xapolicymgr.properties" ;
+	private static final String DEFAULT_CONFIG_FILENAME = "ranger_webserver.properties" ;
 	
 	private static String configFile = DEFAULT_CONFIG_FILENAME ;
 	

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/hbase-agent/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml
index eda66fe..b309222 100644
--- a/hbase-agent/pom.xml
+++ b/hbase-agent/pom.xml
@@ -17,8 +17,8 @@
 -->
 <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.hbase-agent</groupId>
-  <artifactId>hbase-agent</artifactId>
+  <groupId>security_plugins.ranger-hbase-plugin</groupId>
+  <artifactId>ranger-hbase-plugin</artifactId>
   <name>HBaseSecurityAgents</name>
   <description>HBase Security Agents</description>
   <packaging>jar</packaging>
@@ -26,8 +26,8 @@
     <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>
@@ -43,13 +43,13 @@
 	<version>${hadoop.version}</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>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/hdfs-agent/conf/xasecure-hadoop-env.sh
----------------------------------------------------------------------
diff --git a/hdfs-agent/conf/xasecure-hadoop-env.sh b/hdfs-agent/conf/xasecure-hadoop-env.sh
index a77c617..4e3e78e 100644
--- a/hdfs-agent/conf/xasecure-hadoop-env.sh
+++ b/hdfs-agent/conf/xasecure-hadoop-env.sh
@@ -16,12 +16,12 @@
 # limitations under the License.
 
 
-if [ -f ${HADOOP_HOME}/conf/argus-security.xml ]
+if [ -f ${HADOOP_HOME}/conf/ranger-security.xml ]
 then
 	echo "$0" | grep -q beeswax_server.sh > /dev/null 2>&1
 	if [ $? -ne 0 ]
-	then 
-		XASECURE_AGENT_PATH="`ls -1 ${HADOOP_HOME}/lib/hdfs-agent-*.jar 2> /dev/null | head -1`"
+	then
+		XASECURE_AGENT_PATH="`ls -1 ${HADOOP_HOME}/lib/ranger-hdfs-plugin-*.jar 2> /dev/null | head -1`"
 		if [ -f "${XASECURE_AGENT_PATH}" ]
 		then
 	    	if [ "${XASECURE_INIT}" != "0" ]

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/hdfs-agent/pom.xml
----------------------------------------------------------------------
diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml
index 7520b33..d7d3b62 100644
--- a/hdfs-agent/pom.xml
+++ b/hdfs-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.hdfs-agent</groupId>
-  <artifactId>hdfs-agent</artifactId>
-  <name>Hdfs Security Agent</name>
-  <description>Hdfs Security Agents</description>
+  <groupId>security_plugins.ranger-hdfs-plugin</groupId>
+  <artifactId>ranger-hdfs-plugin</artifactId>
+  <name>Hdfs Security Plugin</name>
+  <description>Hdfs 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>
@@ -58,13 +58,13 @@
 	<version>${javassist.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>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>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/hive-agent/pom.xml
----------------------------------------------------------------------
diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml
index 7cd9fa9..86abfa8 100644
--- a/hive-agent/pom.xml
+++ b/hive-agent/pom.xml
@@ -17,8 +17,8 @@
 -->
 <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.hive-agent</groupId>
-  <artifactId>hive-agent</artifactId>
+  <groupId>security_plugins.ranger-hive-plugin</groupId>
+  <artifactId>ranger-hive-plugin</artifactId>
   <name>Hive Security Agent</name>
   <description>Hive Security Agents</description>
   <packaging>jar</packaging>
@@ -26,8 +26,8 @@
     <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>
@@ -66,13 +66,13 @@
 	  <version>${hadoop.version}</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>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/knox-agent/pom.xml
----------------------------------------------------------------------
diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml
index 50ec3e1..aae7877 100644
--- a/knox-agent/pom.xml
+++ b/knox-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.knox-agent</groupId>
-  <artifactId>knox-agent</artifactId>
-  <name>Knox Security Agent</name>
-  <description>Knox Security Agents</description>
+  <groupId>security_plugins.ranger-knox-plugin</groupId>
+  <artifactId>ranger-knox-plugin</artifactId>
+  <name>Knox Security Plugin</name>
+  <description>Knox 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>
@@ -52,13 +52,13 @@
 	<version>${javax.servlet.version}</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>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/lookup-client/pom.xml
----------------------------------------------------------------------
diff --git a/lookup-client/pom.xml b/lookup-client/pom.xml
index 54eb621..3892f64 100644
--- a/lookup-client/pom.xml
+++ b/lookup-client/pom.xml
@@ -23,8 +23,8 @@
   <description>Resource Lookup API Implementation</description>
   <packaging>jar</packaging>
   <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/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 05f9236..0b3483d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,12 +22,12 @@
         <artifactId>apache</artifactId>
         <version>10</version>
   </parent>
-  <groupId>org.apache.argus</groupId>
-  <artifactId>argus</artifactId>
+  <groupId>org.apache.ranger</groupId>
+  <artifactId>ranger</artifactId>
   <version>0.4.0</version>
   <description>Security for Enforcing Enterprise Policies</description>
   <packaging>pom</packaging>
-  <name>argus</name>
+  <name>ranger</name>
   <prerequisites>
 	<maven>2.2.1</maven>
   </prerequisites>
@@ -48,13 +48,7 @@
   <module>security-admin</module>
   <module>ugsync</module>
   <module>unixauthclient</module>
-  <!--
-  <module>unixauthnative</module>
-  -->
   <module>unixauthservice</module>
-  <!--
-  <module>winpkg</module>
-  -->
   </modules>
   <properties>
 		<antlr.version>3.5.2</antlr.version>
@@ -103,12 +97,12 @@
 		<mysql-connector-java.version>5.1.31</mysql-connector-java.version>
 		<owasp-java-html-sanitizer.version>r239</owasp-java-html-sanitizer.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<security-agent-install-dir>hadoop-security/agents</security-agent-install-dir>
+		<security-agent-install-dir>hadoop-security/plugins</security-agent-install-dir>
 		<slf4j-api.version>1.7.5</slf4j-api.version>
-<!--
 		<springframework.spring.version>2.5.6</springframework.spring.version>
--->
+		<!--
 		<springframework.spring.version>3.1.3.RELEASE</springframework.spring.version>
+		-->
 		<springframework.security.version>3.1.3.RELEASE</springframework.security.version>
 		<springframework.test.version>3.1.3.RELEASE</springframework.test.version>
 		<springframework.version>3.1.3.RELEASE</springframework.version>
@@ -125,6 +119,39 @@
         <skipTests>true</skipTests>
   </properties>
   <profiles>
+        <profile>
+        <id>windows</id>
+        <modules>
+              <module>winpkg</module>
+        </modules>
+        <build>
+            <plugins>
+                <plugin>
+                    <groupId>com.google.code.maven-replacer-plugin</groupId>
+                    <artifactId>replacer</artifactId>
+                    <version>1.5.2</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>replace</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <includes>
+                            <include>winpkg/src/scripts/*</include>
+                        </includes>
+                    <replacements>
+                        <replacement>
+                            <token>@ranger.version@</token>
+                            <value>${project.version}</value>
+                        </replacement>
+                    </replacements>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
      <profile>
           <id>linux</id>
           <activation>
@@ -137,13 +164,13 @@
           </modules>
       </profile>
   </profiles>
- <distributionManagement>
+  <distributionManagement>
         <repository>
             <id>${distMgmtStagingId}</id>
             <name>${distMgmtStagingName}</name>
             <url>${distMgmtStagingUrl}</url>
         </repository>
-   </distributionManagement>
+  </distributionManagement>
   <repositories>
           <repository>
             <id>apache.snapshots.https</id>
@@ -189,32 +216,6 @@
           <skipTests>${skipTests}</skipTests>
         </configuration>
       </plugin>
-<!--
-      <plugin>
-        <groupId>com.google.code.maven-replacer-plugin</groupId>
-            <artifactId>maven-replacer-plugin</artifactId>
-            <version>1.4.0</version>
-            <executions>
-                <execution>
-                    <phase>process-sources</phase>
-                    <goals>
-                        <goal>replace</goal>
-                    </goals>
-                </execution>
-            </executions>
-            <configuration>
-                <file>${project.basedir}/templates/version</file>
-                <ignoreMissingFile>true</ignoreMissingFile>
-                <outputFile>${project.build.outputDirectory}/version</outputFile>
-                <replacements>
-                    <replacement>
-                        <token>@build.version@</token>
-                        <value>${project.version}</value>
-                    </replacement>
-                </replacements>
-            </configuration>
-      </plugin>
--->
       <plugin>
          <artifactId>maven-assembly-plugin</artifactId>
          <version>2.2-beta-5</version>
@@ -227,6 +228,7 @@
              <descriptor>src/main/assembly/storm-agent.xml</descriptor>
              <descriptor>src/main/assembly/admin-web.xml</descriptor>
              <descriptor>src/main/assembly/usersync.xml</descriptor>
+             <descriptor>src/main/assembly/ranger-src.xml</descriptor>
            </descriptors>
          </configuration>
       </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/security-admin/pom.xml
----------------------------------------------------------------------
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index e5aa85d..a692f48 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -23,8 +23,8 @@
   <description>security-admin-tool java web application</description>
   <packaging>war</packaging>
   <parent>
-  	<groupId>org.apache.argus</groupId>
-  	<artifactId>argus</artifactId>
+	<groupId>org.apache.ranger</groupId>
+	<artifactId>ranger</artifactId>
   	<version>0.4.0</version>
   </parent>
   <dependencies>
@@ -218,13 +218,11 @@
 		    <artifactId>spring-web</artifactId>
 		    <version>${springframework.version}</version>
 		</dependency>
-<!--
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring</artifactId>
 			<version>${springframework.spring.version}</version>
 		</dependency>
--->
 		<dependency>
 		    <groupId>com.sun.jersey</groupId>
 		    <artifactId>jersey-bundle</artifactId>
@@ -327,7 +325,7 @@
     		<version>${codehaus.jackson.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.apache.argus</groupId>
+		<groupId>org.apache.ranger</groupId>
     		<artifactId>lookup-client</artifactId>
     		<version>${project.version}</version>
            <exclusions>
@@ -401,7 +399,7 @@
         	</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.argus</groupId>
+			<groupId>org.apache.ranger</groupId>
 			<artifactId>unixauthclient</artifactId>
 			<version>${project.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6af44c4f/security-admin/scripts/install.properties
----------------------------------------------------------------------
diff --git a/security-admin/scripts/install.properties b/security-admin/scripts/install.properties
index 3807088..4f9fff8 100644
--- a/security-admin/scripts/install.properties
+++ b/security-admin/scripts/install.properties
@@ -53,8 +53,8 @@ db_host=localhost
 #
 # DB UserId used for the XASecure schema
 # 
-db_name=xasecure
-db_user=xaadmin
+db_name=ranger
+db_user=rangeradmin
 db_password=
 
 #
@@ -64,8 +64,8 @@ db_password=
 # * audit_db must exists in the same ${db_host} as xaserver database ${db_name} 
 # * audit_user must be a different user than db_user (as audit user has access to only audit tables)
 #
-audit_db_name=xasecure
-audit_db_user=xalogger
+audit_db_name=ranger
+audit_db_user=rangerlogger
 audit_db_password=
 
 #------------------------- DB CONFIG - END ----------------------------------
@@ -85,8 +85,8 @@ policymgr_http_enabled=true
 #
 # ------- UNIX User CONFIG ----------------
 #
-unix_user=xasecure
-unix_group=xasecure
+unix_user=ranger
+unix_group=ranger
 
 #
 # ------- UNIX User CONFIG  - END ----------------
@@ -142,8 +142,8 @@ xa_ldap_ad_url=
 #
 ################################################################################
 
-app_home=$PWD/app
-war_file=${PWD}/war/security-admin-web-*.war
+XAPOLICYMGR_DIR=$PWD
+app_home=$PWD/ews/webapp
 TMPFILE=$PWD/.fi_tmp
 LOGFILE=$PWD/logfile
 LOGFILES="$LOGFILE"
@@ -163,4 +163,4 @@ oracle_audit_file=${PWD}/db/oracle/xa_audit_db_oracle.sql
 #oracle_asset_file=${PWD}/db/oracle/reset_asset_oracle.sql
 #
 
-cred_keystore_filename=/usr/lib/xapolicymgr/.jceks/xapolicymgr.jceks
+cred_keystore_filename=$app_home/WEB-INF/classes/conf/.jceks/rangeradmin.jceks


Mime
View raw message