[HUE-354] beeswax_server.sh should put HADOOP_EXTRA_CLASSPATH_STRING on the Beeswax server's classpath

apps/beeswax/beeswax_server.sh

@@ -36,7 +36,12 @@ BEESWAX_HIVE_LIB=$BEESWAX_ROOT/hive/lib
 
 echo \$HADOOP_HOME=$HADOOP_HOME
 
-export HADOOP_CLASSPATH=$(find $BEESWAX_HIVE_LIB -name "*.jar" | tr "\n" :):$HIVE_CONF_DIR:$BEESWAX_ROOT/../../desktop/libs/hadoop/static-group-mapping/java-lib/static-group-mapping-1.1.0.jar
+export HADOOP_CLASSPATH=$(find $BEESWAX_HIVE_LIB -name "*.jar" | tr "\n" :):$HIVE_CONF_DIR
+
+if [ -n "$HADOOP_EXTRA_CLASSPATH_STRING" ]; then
+  export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$HADOOP_EXTRA_CLASSPATH_STRING
+fi
+
 export HADOOP_OPTS="-Dlog4j.configuration=log4j.properties"
 echo \$HADOOP_CLASSPATH=$HADOOP_CLASSPATH
 echo \$HADOOP_OPTS=$HADOOP_OPTS

apps/beeswax/src/beeswax/test_base.py

@@ -69,6 +69,7 @@ def _start_server(cluster):
     'HADOOP_HOME': hadoop.conf.HADOOP_HOME.get(),
     'HADOOP_CONF_DIR': cluster.config_dir,
     'HIVE_CONF_DIR': beeswax.conf.BEESWAX_HIVE_CONF_DIR.get(),
+    'HADOOP_EXTRA_CLASSPATH_STRING': hadoop.conf.HADOOP_EXTRA_CLASSPATH_STRING.get()
   }
   if os.getenv("JAVA_HOME"):
     env["JAVA_HOME"] = os.getenv("JAVA_HOME")