Merge pull request #20 from bbockelm/osg-sysconfig

Include OSG's sysconfig patch.

Author: bbockelm

conf/gridftp-hdfs-environment

@@ -4,14 +4,27 @@
 
 HADOOP_CONF_DIR=/etc/hadoop-0.20/conf
 HADOOP_HOME=/usr/lib/hadoop-0.20
+HADOOP_HDFS_HOME=$HADOOP_HOME
+HADOOP_COMMON_HOME=$HADOOP_HOME
+export GRIDFTP_HDFS_REPLICAS=2
 
-source $HADOOP_CONF_DIR/hadoop-env.sh
+#update for hadoop 2.0.0
+if [ -d "/etc/hadoop/conf" ]; then
+    HADOOP_CONF_DIR=/etc/hadoop/conf
+fi
+if [ -d "/usr/lib/hadoop" ]; then
+    HADOOP_HOME=/usr/lib/hadoop
+fi
+
+if [ -e "$HADOOP_CONF_DIR/hadoop-env.sh" ]; then
+    source $HADOOP_CONF_DIR/hadoop-env.sh
+fi
 
 if [ "x$JAVA_HOME" = "x" ]; then
 JAVA_HOME=/usr/lib/jvm/java
 fi
 # Often, libjvm gets hidden off the path.
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$JAVA_HOME/jre/lib/i386:$JAVA_HOME/jre/lib/i386/server:$JAVA_HOME/jre/lib/amd64:$JAVA_HOME/jre/lib/amd64/server
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$JAVA_HOME/jre/lib/i386:$JAVA_HOME/jre/lib/i386/server:$JAVA_HOME/jre/lib/amd64:$JAVA_HOME/jre/lib/amd64/server:/usr/lib/hadoop/lib/native
 
 # The following is the CLASSPATH building logic from the hadoop script:
 # CLASSPATH initially contains $HADOOP_CONF_DIR
@@ -39,10 +52,16 @@ IFS=
 if [ -d "$HADOOP_HOME/webapps" ]; then
   CLASSPATH=${CLASSPATH}:$HADOOP_HOME
 fi
-for f in $HADOOP_HOME/hadoop-*-core.jar; do
+for f in $HADOOP_HOME/hadoop-*.jar; do
   CLASSPATH=${CLASSPATH}:$f;
 done
 
+if [ -d "$HADOOP_HOME/client" ]; then
+for f in $HADOOP_HOME/client/*.jar; do
+  CLASSPATH=${CLASSPATH}:$f;
+done
+fi
+
 # add libs to CLASSPATH
 for f in $HADOOP_HOME/lib/*.jar; do
   CLASSPATH=${CLASSPATH}:$f;
@@ -69,7 +88,7 @@ unset IFS
 
 # New gridftp.conf override in GT 5.2
 #export GRIDFTP_CONF=/etc/gridftp-hdfs/gridftp.conf
-export conf=/etc/gridftp-hdfs/gridftp.conf
+#export conf=/etc/gridftp-hdfs/gridftp.conf
 
 # Allow non-java-based signal handling
 export LD_PRELOAD=libjsig.so