[Sprint 45] XD-2837 Admin scripts to include hadoop classpath

scripts/xd/xd-admin

@@ -67,17 +67,42 @@ cd "$SAVED" >&-
 
 APP_HOME_LIB=$APP_HOME/lib
 CLASSPATH=$APP_HOME/modules/processor/scripts:$APP_HOME/config:$APP_HOME
-if [ -d "$APP_HOME_LIB" ]; then
-    for i in "$APP_HOME_LIB"/*.jar; do
-        CLASSPATH="$CLASSPATH":"$i"
-    done
-    HADOOP_LIB=$APP_HOME/lib/hadoop26
-    if [ -d "$HADOOP_LIB" ]; then
-        for j in "$HADOOP_LIB"/spring-data-hadoop-*.jar; do
-            CLASSPATH="$CLASSPATH":"$j"
+HADOOP_DISTRO="${HADOOP_DISTRO:-hadoop26}"
+x=0
+args=("$@")
+for arg in "${args[@]}" ; do
+    if [ "$arg" = "--hadoopDistro" ] ; then
+        if [ "${args[x+1]}" = "hadoop25" ] || [ "${args[x+1]}" = "hadoop26" ] || [ "${args[x+1]}" = "cdh5" ] || [ "${args[x+1]}" = "hdp22" ] || [ "${args[x+1]}" = "phd21" ] ; then
+          HADOOP_DISTRO="${args[x+1]}"
+          unset args[x+1]
+          unset args[x]
+        else
+          echo "ERROR: '${args[x+1]}' is not a valid Hadoop distro - valid distros are hadoop25, hadoop26, cdh5, hdp22 and phd21"
+          exit
+        fi
+    fi
+    x=$((x+1))
+done
+
+addJarsToClassPath( ) {
+    if [ -d $1 ]; then
+        for jar in "$1"/*.jar; do
+            CLASSPATH="$CLASSPATH":"$jar"
         done
     fi
+}
+
+CLASSPATH="$APP_HOME/config"
+APP_HOME_LIB=$APP_HOME/lib
+XD_LIB=$APP_HOME/../xd/lib
+addJarsToClassPath $APP_HOME_LIB
+if [ -d $XD_LIB ]; then
+    addJarsToClassPath $XD_LIB
+    HADOOP_LIB=$XD_LIB/$HADOOP_DISTRO
+else
+    HADOOP_LIB=$APP_HOME_LIB/$HADOOP_DISTRO
 fi
+addJarsToClassPath $HADOOP_LIB
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then

scripts/xd/xd-admin.bat

@@ -70,15 +70,45 @@ set CMD_LINE_ARGS=%$
 @rem Setup the command line
 
 @echo off
+set HADOOP_DISTRO=hadoop26
+set found=0
+set NEW_CMD_LINE_ARGS=
+for %%a in (%CMD_LINE_ARGS%) do (
+    setLocal EnableDelayedExpansion
+    if "%%a"=="--hadoopDistro" (
+        set found=1
+    ) else (
+        if !found!==1 (
+            if not "%%a"=="hadoop25" if not "%%a"=="hadoop26" if not "%%a"=="cdh5" if not "%%a"=="hdp22" if not "%%a"=="phd21" (
+                echo ERROR: %%a is not a valid Hadoop distro - valid distros are hadoop25, hadoop26, cdh5, hdp22 and phd21
+                goto fail
+            )
+            set HADOOP_DISTRO=%%a
+            set found=0
+        ) else (
+            set NEW_CMD_LINE_ARGS=!NEW_CMD_LINE_ARGS! %%a
+        )
+    )
+)
+set CMD_LINE_ARGS=!NEW_CMD_LINE_ARGS!
 set APP_HOME_LIB=%APP_HOME%\lib
+
 if exist "%APP_HOME_LIB%" (
     setLocal EnableDelayedExpansion
     set CLASSPATH=%APP_HOME%\modules\processor\scripts;%APP_HOME%\config;%APP_HOME%
     set CLASSPATH=!CLASSPATH!;%APP_HOME_LIB%\*
-    set HADOOP_LIB=%APP_HOME%\lib\hadoop26
-    if exist "!HADOOP_LIB!" (
-        set CLASSPATH=!CLASSPATH!;!HADOOP_LIB!\spring-data-hadoop-*
-    )
+)
+
+@rem add xd/lib lib/hadoop libs to CLASSPATH
+set XD_LIB=%APP_HOME%\..\xd\lib
+if exist "%XD_LIB%" (
+    set CLASSPATH=!CLASSPATH!;%XD_LIB%\*
+    set HADOOP_LIB=%XD_LIB%\!HADOOP_DISTRO!
+) else (
+    set HADOOP_LIB=%APP_HOME_LIB%\!HADOOP_DISTRO!
+)
+if exist "!HADOOP_LIB!" (
+    set CLASSPATH=!CLASSPATH!;!HADOOP_LIB!\*
 )
 
 @rem Set XD_HOME to APP_HOME if XD_HOME is not defined yet