You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2014/08/18 08:36:40 UTC

[1/4] git commit: ARGUS-2 - Eclipse setting updates

Repository: incubator-argus
Updated Branches:
  refs/heads/master 8908fb8c2 -> 466f72fb4


ARGUS-2 - Eclipse setting updates

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

Branch: refs/heads/master
Commit: 3495911bd721aa6f66958e9c914716ece3b512d6
Parents: cb7363d
Author: sneethiraj <sn...@apache.org>
Authored: Sun Aug 17 15:36:45 2014 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Sun Aug 17 15:36:45 2014 -0400

----------------------------------------------------------------------
 .gitignore                                         |  1 +
 .project                                           | 17 +++++++++++++++++
 .settings/org.eclipse.core.resources.prefs         |  2 ++
 .settings/org.eclipse.m2e.core.prefs               |  4 ++++
 .../.settings/org.eclipse.core.resources.prefs     |  1 +
 .../.settings/org.eclipse.core.resources.prefs     |  1 +
 .../.settings/org.eclipse.wst.common.component     |  4 ++--
 unixauthclient/.project                            |  4 ++--
 .../.settings/org.eclipse.wst.validation.prefs     |  2 ++
 9 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3495911b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target/

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3495911b/.project
----------------------------------------------------------------------
diff --git a/.project b/.project
new file mode 100644
index 0000000..9681850
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>argus</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3495911b/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3495911b/.settings/org.eclipse.m2e.core.prefs
----------------------------------------------------------------------
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3495911b/agents-impl/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/agents-impl/.settings/org.eclipse.core.resources.prefs b/agents-impl/.settings/org.eclipse.core.resources.prefs
index abdea9a..839d647 100644
--- a/agents-impl/.settings/org.eclipse.core.resources.prefs
+++ b/agents-impl/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3495911b/security-admin/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/security-admin/.settings/org.eclipse.core.resources.prefs b/security-admin/.settings/org.eclipse.core.resources.prefs
index abdea9a..839d647 100644
--- a/security-admin/.settings/org.eclipse.core.resources.prefs
+++ b/security-admin/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3495911b/security-admin/.settings/org.eclipse.wst.common.component
----------------------------------------------------------------------
diff --git a/security-admin/.settings/org.eclipse.wst.common.component b/security-admin/.settings/org.eclipse.wst.common.component
index 5fd2c2d..ba98c1a 100644
--- a/security-admin/.settings/org.eclipse.wst.common.component
+++ b/security-admin/.settings/org.eclipse.wst.common.component
@@ -4,10 +4,10 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="lookup-client-3.5.000.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lookup-client/lookup-client">
+        <dependent-module archiveName="lookup-client-3.6.000.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lookup-client/lookup-client">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="unixauthclient-3.5.000.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/unixauthclient/unixauthclient">
+        <dependent-module archiveName="unixauthclient-3.6.000.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/unixauthclient/unixauthclient">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="context-root" value="security-admin-web"/>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3495911b/unixauthclient/.project
----------------------------------------------------------------------
diff --git a/unixauthclient/.project b/unixauthclient/.project
index d875091..33b3cd9 100644
--- a/unixauthclient/.project
+++ b/unixauthclient/.project
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/3495911b/unixauthclient/.settings/org.eclipse.wst.validation.prefs
----------------------------------------------------------------------
diff --git a/unixauthclient/.settings/org.eclipse.wst.validation.prefs b/unixauthclient/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/unixauthclient/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1


[4/4] git commit: ARGUS-6-parameter-handling-code-for-case-conversion

Posted by sn...@apache.org.
ARGUS-6-parameter-handling-code-for-case-conversion

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

Branch: refs/heads/master
Commit: 466f72fb4a20a1a133065d9d029f50af9d53d130
Parents: bce5a1c
Author: sneethiraj <sn...@apache.org>
Authored: Mon Aug 18 01:33:54 2014 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Mon Aug 18 01:33:54 2014 -0400

----------------------------------------------------------------------
 .../process/LdapUserGroupBuilder.java           | 49 +++++++++++++++++++-
 unixauthservice/conf/unixauthservice.properties |  5 ++
 2 files changed, 53 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/466f72fb/ugsync/src/main/java/com/xasecure/ldapusersync/process/LdapUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/com/xasecure/ldapusersync/process/LdapUserGroupBuilder.java b/ugsync/src/main/java/com/xasecure/ldapusersync/process/LdapUserGroupBuilder.java
index 34bf538..5bc502b 100644
--- a/ugsync/src/main/java/com/xasecure/ldapusersync/process/LdapUserGroupBuilder.java
+++ b/ugsync/src/main/java/com/xasecure/ldapusersync/process/LdapUserGroupBuilder.java
@@ -36,6 +36,12 @@ public class LdapUserGroupBuilder implements UserGroupSource {
 	private DirContext dirContext;
 	private SearchControls searchControls;
 	
+	private boolean userNameCaseConversionFlag = false ;
+	private boolean groupNameCaseConversionFlag = false ;
+	private boolean userNameLowerCaseFlag = false ;
+	private boolean groupNameLowerCaseFlag = false ;
+
+	
 	public static void main(String[] args) throws Throwable {
 		LdapUserGroupBuilder  ugBuilder = new LdapUserGroupBuilder();
 		ugBuilder.init();
@@ -43,6 +49,27 @@ public class LdapUserGroupBuilder implements UserGroupSource {
 	
 	public LdapUserGroupBuilder() {
 		LOG.info("LdapUserGroupBuilder created") ;
+		
+		String userNameCaseConversion = config.getUserNameCaseConversion() ;
+		
+		if (UserGroupSyncConfig.UGSYNC_NONE_CASE_CONVERSION_VALUE.equalsIgnoreCase(userNameCaseConversion)) {
+		    userNameCaseConversionFlag = false ;
+		}
+		else {
+		    userNameCaseConversionFlag = true ;
+		    userNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(userNameCaseConversion) ;
+		}
+		
+		String groupNameCaseConversion = config.getGroupNameCaseConversion() ;
+		
+		if (UserGroupSyncConfig.UGSYNC_NONE_CASE_CONVERSION_VALUE.equalsIgnoreCase(groupNameCaseConversion)) {
+		    groupNameCaseConversionFlag = false ;
+		}
+		else {
+		    groupNameCaseConversionFlag = true ;
+		    groupNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(groupNameCaseConversion) ;
+		}
+		
 	}
 
 	@Override
@@ -140,6 +167,17 @@ public class LdapUserGroupBuilder implements UserGroupSource {
 				final SearchResult userEntry = searchResultEnum.next();
 				String userName = (String) userEntry.getAttributes()
 						.get(userNameAttribute).get();
+				
+				
+				if (userNameCaseConversionFlag) {
+					if (userNameLowerCaseFlag) {
+						userName = userName.toLowerCase() ;
+					}
+					else {
+						userName = userName.toUpperCase() ;
+					}
+				}
+				
 				Set<String> groups = new HashSet<String>();
 				Set<String> userGroupNameAttributeSet = config.getUserGroupNameAttributeSet();
 				for (String useGroupNameAttribute : userGroupNameAttributeSet) {
@@ -147,7 +185,16 @@ public class LdapUserGroupBuilder implements UserGroupSource {
 					if(userGroupfAttribute != null) {
 						NamingEnumeration<?> groupEnum = userGroupfAttribute.getAll();
 						while (groupEnum.hasMore()) {
-							groups.add(getShortGroupName((String) groupEnum.next()));
+							String gName = getShortGroupName((String) groupEnum
+									.next());
+							if (groupNameCaseConversionFlag) {
+								if (groupNameLowerCaseFlag) {
+									gName = gName.toLowerCase();
+								} else {
+									gName = gName.toUpperCase();
+								}
+							}
+							groups.add(gName);
 						}
 					}
 				}

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/466f72fb/unixauthservice/conf/unixauthservice.properties
----------------------------------------------------------------------
diff --git a/unixauthservice/conf/unixauthservice.properties b/unixauthservice/conf/unixauthservice.properties
index d37c340..f0c9406 100644
--- a/unixauthservice/conf/unixauthservice.properties
+++ b/unixauthservice/conf/unixauthservice.properties
@@ -127,3 +127,8 @@ ldapGroupSync.userNameAttribute = cn
 # 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


[2/4] git commit: ARGUS-6 - Modified usersync to import username/group in a mixed (no case) or a specific case (lower, upper)

Posted by sn...@apache.org.
ARGUS-6 - Modified usersync to import username/group in a mixed (no
case) or a specific case (lower,upper)

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

Branch: refs/heads/master
Commit: 2e06b5998f891f09d76d7048bf08d9d72e628766
Parents: 3495911
Author: sneethiraj <sn...@apache.org>
Authored: Sun Aug 17 18:39:59 2014 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Sun Aug 17 18:39:59 2014 -0400

----------------------------------------------------------------------
 .../config/UserGroupSyncConfig.java             | 27 ++++++++++++++++
 unixauthservice/scripts/initd                   |  4 ++-
 unixauthservice/scripts/install.properties      |  5 +++
 unixauthservice/scripts/install.sh              | 33 ++++++++++++++++----
 4 files changed, 62 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/2e06b599/ugsync/src/main/java/com/xasecure/unixusersync/config/UserGroupSyncConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/com/xasecure/unixusersync/config/UserGroupSyncConfig.java b/ugsync/src/main/java/com/xasecure/unixusersync/config/UserGroupSyncConfig.java
index 7a5938b..497959c 100644
--- a/ugsync/src/main/java/com/xasecure/unixusersync/config/UserGroupSyncConfig.java
+++ b/ugsync/src/main/java/com/xasecure/unixusersync/config/UserGroupSyncConfig.java
@@ -79,6 +79,16 @@ public class UserGroupSyncConfig  {
 	
 	private static final String DEFAULT_USER_NAME_ATTRIBUTE = "cn";
 	
+	public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none" ;
+	public static final String UGSYNC_LOWER_CASE_CONVERSION_VALUE = "lower" ;
+	public static final String UGSYNC_UPPER_CASE_CONVERSION_VALUE = "upper" ;
+	 
+	private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ldapGroupSync.username.caseConversion" ;
+	private static final String UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM = "ldapGroupSync.groupname.caseConversion" ;
+	 
+	private static final String DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE = UGSYNC_LOWER_CASE_CONVERSION_VALUE  ;
+	private static final String DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE = UGSYNC_LOWER_CASE_CONVERSION_VALUE ;
+	
 	private static final String DEFAULT_USER_GROUP_NAME_ATTRIBUTE = "memberof,ismemberof";
 
 	private Properties prop = new Properties() ;
@@ -349,5 +359,22 @@ public class UserGroupSyncConfig  {
 		return userGroupNameAttributeSet;
 	}
 	
+	public String getUserNameCaseConversion() {
+ 		String ret = prop.getProperty(UGSYNC_USERNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE) ;
+ 		return ret.trim().toLowerCase() ;
+ 	}
+ 
+ 	public String getGroupNameCaseConversion() {
+ 		String ret = prop.getProperty(UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE) ;
+ 		return ret.trim().toLowerCase() ;
+ 	}
+ 
+ 	public String getProperty(String aPropertyName) {
+ 		return prop.getProperty(aPropertyName) ;
+ 	}
+ 
+ 	public String getProperty(String aPropertyName, String aDefaultValue) {
+ 		return prop.getProperty(aPropertyName, aDefaultValue) ;
+ 	}
 	
 }

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/2e06b599/unixauthservice/scripts/initd
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/initd b/unixauthservice/scripts/initd
index 11f6c36..b874c06 100644
--- a/unixauthservice/scripts/initd
+++ b/unixauthservice/scripts/initd
@@ -1,8 +1,10 @@
 #!/bin/bash
 
+INSTALL_BASE=/usr/lib
+
 MOD_NAME=uxugsync
 
-MOD_DIR=/etc/${MOD_NAME}
+MOD_DIR=${INSTALL_BASE}/${MOD_NAME}
 
 if [ -L ${MOD_DIR} ]
 then

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/2e06b599/unixauthservice/scripts/install.properties
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/install.properties b/unixauthservice/scripts/install.properties
index 5c361c7..4331fd2 100644
--- a/unixauthservice/scripts/install.properties
+++ b/unixauthservice/scripts/install.properties
@@ -74,4 +74,9 @@ SYNC_LDAP_USER_NAME_ATTRIBUTE = cn
 # You could provide multiple attribute names separated by comma
 # default value: memberof, ismemberof
 SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE = memberof,ismemberof
+#
+# UserSync - Case Conversion Flags
+# possible values:  none, lower, upper
+SYNC_LDAP_USERNAME_CASE_CONVERSION=lower
+SYNC_LDAP_GROUPNAME_CASE_CONVERSION=lower
 

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/2e06b599/unixauthservice/scripts/install.sh
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/install.sh b/unixauthservice/scripts/install.sh
index 6e11afc..7b783fe 100755
--- a/unixauthservice/scripts/install.sh
+++ b/unixauthservice/scripts/install.sh
@@ -4,6 +4,8 @@
 # Ensure that the user is root
 #
 
+INSTALL_BASE=/usr/lib
+
 MOD_NAME="uxugsync"
 
 MY_ID=`id -u`
@@ -20,6 +22,7 @@ then
 	exit 1
 fi
 
+INSTALL_DIR=${INSTALL_BASE}/${MOD_NAME}
 
 #
 # Embed the configuration from install.properties to conf/unixauthservice.properties
@@ -52,7 +55,22 @@ SYNC_LDAP_USER_NAME_ATTRIBUTE=`grep '^[ \t]*SYNC_LDAP_USER_NAME_ATTRIBUTE[ \t]*=
 
 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}" != "" ]
@@ -162,6 +180,8 @@ then
     -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}
 	mv ${CFG_FILE}  ${CFG_FILE}_archive_`date '+%s'`
 	mv ${NEW_CFG_FILE}  ${CFG_FILE}
@@ -181,23 +201,24 @@ cdirname=`basename ${cdir}`
 if [ "${cdirname}" != "" ]
 then
 
-	dstdir=/etc/${cdirname}
+	dstdir=${INSTALL_BASE}/${cdirname}
 
 	if [ -d ${dstdir} ]
 	then
 		ctime=`date '+%s'`
-		mkdir -p /etc/xasecure/archive/${ctime}
-		mv ${dstdir} /etc/xasecure/archive/${ctime}/
+        archive_dir=${dstdir}-${ctime}
+        mkdir -p ${archive_dir}
+        mv ${dstdir} ${archive_dir}		
 	fi
 
 	mkdir ${dstdir}
 	
-	if [ -L /etc/${MOD_NAME} ]
+	if [ -L ${INSTALL_DIR} ]
     then
-        rm -f /etc/${MOD_NAME}
+        rm -f ${INSTALL_DIR}
     fi
 
-	ln -s  ${dstdir} /etc/${MOD_NAME}
+	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)


[3/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus

Posted by sn...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus


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

Branch: refs/heads/master
Commit: bce5a1c85d50dd41fe26dc93eae7511482f66562
Parents: 2e06b59 8908fb8
Author: sneethiraj <sn...@apache.org>
Authored: Sun Aug 17 21:47:04 2014 -0700
Committer: sneethiraj <sn...@apache.org>
Committed: Sun Aug 17 21:47:04 2014 -0700

----------------------------------------------------------------------
 .../authorization/hive/XaHiveAccessContext.java | 15 ++--
 .../hive/authorizer/XaSecureHiveAuthorizer.java | 85 +++++++++++++++++---
 2 files changed, 86 insertions(+), 14 deletions(-)
----------------------------------------------------------------------