From be49051c4c742e6126931ac3981e0923df363391 Mon Sep 17 00:00:00 2001
From: Huamin Chen <hchen@redhat.com>
Date: Sep 08 2014 20:02:28 +0000
Subject: fix log4j path; fix additional tachyon -> tachyon.sh conversion


Signed-off-by: Huamin Chen <hchen@redhat.com>

---

diff --git a/tachyon-0.5.0-defaults.patch b/tachyon-0.5.0-defaults.patch
index ad54cc9..548fc3e 100644
--- a/tachyon-0.5.0-defaults.patch
+++ b/tachyon-0.5.0-defaults.patch
@@ -63,4 +63,20 @@ index e40214b..bdf92c0 100755
    done
  
    exit 0
+diff --git a/bin/tachyon-stop.sh b/bin/tachyon-stop.sh
+index d4e5c8f..24878a9 100755
+--- a/bin/tachyon-stop.sh
++++ b/bin/tachyon-stop.sh
+@@ -26,7 +26,7 @@ fi
+ 
+ bin=`cd "$( dirname "$0" )"; pwd`
+ 
+-$bin/tachyon killAll tachyon.master.TachyonMaster
+-$bin/tachyon killAll tachyon.worker.TachyonWorker
++$bin/tachyon.sh killAll tachyon.master.TachyonMaster
++$bin/tachyon.sh killAll tachyon.worker.TachyonWorker
+ 
+-$bin/tachyon-slaves.sh $bin/tachyon killAll tachyon.worker.TachyonWorker
+\ No newline at end of file
++$bin/tachyon-slaves.sh $bin/tachyon.sh killAll tachyon.worker.TachyonWorker
 
diff --git a/tachyon-layout.sh b/tachyon-layout.sh
index 707ef3b..2888921 100755
--- a/tachyon-layout.sh
+++ b/tachyon-layout.sh
@@ -8,10 +8,10 @@ export TACHYON_LOGS_DIR="/var/log/tachyon"
 export TACHYON_DATA_DIR="/var/run/tachyon"
 
 #generated via python /usr/share/java-utils/mvn_build.py dependency:build-classpath
-export TACHYON_JAR="/usr/share/java/hadoop/hadoop-hdfs.jar:/usr/share/java/zookeeper/zookeeper-test.jar:/usr/share/java/netty.jar:/usr/share/java/mockito.jar:/usr/share/java/objenesis/objenesis.jar:/usr/share/java/cglib.jar:/usr/share/java/checkstyle.jar:/usr/share/java/antlr-2.7.7.jar:/usr/share/java/apache-commons-beanutils.jar:/usr/share/java/guava.jar:/usr/share/java/guava.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jersey/jersey-core.jar:/usr/share/java/jersey/jersey-server.jar:/usr/share/java/jsr-311.jar:/usr/share/java/objectweb-asm/asm.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-codec.jar:/usr/share/java/apache-commons-lang.jar:/usr/share/java/commons-logging.jar:/usr/share/java/avalon-framework-api.jar:/usr/share/java/avalon-logkit.jar:/usr/share/java/javamail/javax.mail.jar:/usr/share/java/geronimo-jms.jar:/usr/share/java/apache-commons-daemon.jar:/usr/share/java/protobuf.jar:/usr/share/java/jackson/jackson-core-asl.jar:/usr/share/java/jackson/jackson-mapper-asl.jar:/usr/share/java/xmlenc.jar:/usr/share/java/../hadoop/common/hadoop-common.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/jline.jar:/usr/share/java/hadoop/hadoop-annotations.jar:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.3.0.fc20.x86_64/lib/tools.jar:/usr/share/java/commons-math3.jar:/usr/share/java/jakarta-commons-httpclient.jar:/usr/share/java/commons-net.jar:/usr/share/java/commons-collections.jar:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jersey/jersey-json.jar:/usr/share/java/jettison.jar:/usr/share/java/glassfish-jaxb/jaxb-impl.jar:/usr/share/java/isorelax.jar:/usr/share/java/msv-msv.jar:/usr/share/java/relaxngDatatype.jar:/usr/share/java/istack-commons-runtime.jar:/usr/share/java/txw2.jar:/usr/share/java/jackson/jackson-jaxrs.jar:/usr/share/java/jackson/jackson-xc.jar:/usr/share/java/jersey/jersey-servlet.jar:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/tomcat-el-api.jar:/usr/share/java/commons-el.jar:/usr/share/java/jets3t/jets3t.jar:/usr/share/java/java-xmlbuilder.jar:/usr/share/java/java-base64.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/avro/avro.jar:/usr/share/java/paranamer/paranamer.jar:/usr/share/java/snappy-java.jar:/usr/share/java/hadoop/hadoop-auth.jar:/usr/share/java/jsch.jar:/usr/share/java/jsr-305.jar:/usr/share/java/apache-commons-compress.jar:/usr/share/java/xz-java.jar:/usr/share/java/glassfish-jsp/javax.servlet.jsp.jar:/usr/share/java/glassfish-jsp-api/javax.servlet.jsp-api.jar:/usr/share/java/hadoop/hadoop-mapreduce-client-core.jar:/usr/share/java/hadoop/hadoop-yarn-common.jar:/usr/share/java/hadoop/hadoop-yarn-api.jar:/usr/share/java/google-guice.jar:/usr/share/java/atinject.jar:/usr/share/java/aopalliance.jar:/usr/share/java/jersey/jersey-test-framework-grizzly2.jar:/usr/share/java/jersey/jersey-test-framework.jar:/usr/share/java/jboss-servlet-3.0-api/jboss-servlet-api_3.0_spec.jar:/usr/share/java/jersey/jersey-client.jar:/usr/share/java/jersey/jersey-grizzly2-servlet.jar:/usr/share/java/grizzly/grizzly-http-servlet.jar:/usr/share/java/grizzly/grizzly-http-server.jar:/usr/share/java/jersey/jersey-grizzly2.jar:/usr/share/java/grizzly/grizzly-http.jar:/usr/share/java/grizzly/grizzly-framework.jar:/usr/share/java/jersey/jersey-guice.jar:/usr/share/java/guice/guice-servlet.jar:/usr/share/java/google-guice.jar:/usr/share/java/netty.jar:/usr/share/java/jzlib.jar:/usr/share/java/ant/ant.jar:/usr/share/java/ant/ant-launcher.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/junit.jar:/usr/share/java/hamcrest/core.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/log4j.jar:/usr/share/java/commons-io.jar:/usr/share/java/libthrift.jar:/usr/share/java/httpcomponents/httpclient.jar:/usr/share/java/httpcomponents/httpcore.jar:/usr/share/java/apache-commons-lang3.jar:/usr/share/java/curator/curator-recipes.jar:/usr/share/java/curator/curator-framework.jar:/usr/share/java/curator/curator-client.jar:/usr/share/java/curator/curator-test.jar:/usr/share/java/javassist.jar:/usr/share/java/tachyon.jar"
+export TACHYON_JAR="/usr/share/java/hadoop/hadoop-hdfs.jar:/usr/share/java/zookeeper/zookeeper-test.jar:/usr/share/java/netty.jar:/usr/share/java/mockito.jar:/usr/share/java/objenesis/objenesis.jar:/usr/share/java/cglib.jar:/usr/share/java/checkstyle.jar:/usr/share/java/antlr-2.7.7.jar:/usr/share/java/apache-commons-beanutils.jar:/usr/share/java/guava.jar:/usr/share/java/guava.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jersey/jersey-core.jar:/usr/share/java/jersey/jersey-server.jar:/usr/share/java/jsr-311.jar:/usr/share/java/objectweb-asm/asm.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-codec.jar:/usr/share/java/apache-commons-lang.jar:/usr/share/java/commons-logging.jar:/usr/share/java/avalon-framework-api.jar:/usr/share/java/avalon-logkit.jar:/usr/share/java/javamail/javax.mail.jar:/usr/share/java/geronimo-jms.jar:/usr/share/java/apache-commons-daemon.jar:/usr/share/java/protobuf.jar:/usr/share/java/jackson/jackson-core-asl.jar:/usr/share/java/jackson/jackson-mapper-asl.jar:/usr/share/java/xmlenc.jar:/usr/share/java/../hadoop/common/hadoop-common.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/jline.jar:/usr/share/java/hadoop/hadoop-annotations.jar:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.3.0.fc20.x86_64/lib/tools.jar:/usr/share/java/commons-math3.jar:/usr/share/java/jakarta-commons-httpclient.jar:/usr/share/java/commons-net.jar:/usr/share/java/commons-collections.jar:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jersey/jersey-json.jar:/usr/share/java/jettison.jar:/usr/share/java/glassfish-jaxb/jaxb-impl.jar:/usr/share/java/isorelax.jar:/usr/share/java/msv-msv.jar:/usr/share/java/relaxngDatatype.jar:/usr/share/java/istack-commons-runtime.jar:/usr/share/java/txw2.jar:/usr/share/java/jackson/jackson-jaxrs.jar:/usr/share/java/jackson/jackson-xc.jar:/usr/share/java/jersey/jersey-servlet.jar:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/tomcat-el-api.jar:/usr/share/java/commons-el.jar:/usr/share/java/jets3t/jets3t.jar:/usr/share/java/java-xmlbuilder.jar:/usr/share/java/java-base64.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/avro/avro.jar:/usr/share/java/paranamer/paranamer.jar:/usr/share/java/snappy-java.jar:/usr/share/java/hadoop/hadoop-auth.jar:/usr/share/java/jsch.jar:/usr/share/java/jsr-305.jar:/usr/share/java/apache-commons-compress.jar:/usr/share/java/xz-java.jar:/usr/share/java/glassfish-jsp/javax.servlet.jsp.jar:/usr/share/java/glassfish-jsp-api/javax.servlet.jsp-api.jar:/usr/share/java/hadoop/hadoop-mapreduce-client-core.jar:/usr/share/java/hadoop/hadoop-yarn-common.jar:/usr/share/java/hadoop/hadoop-yarn-api.jar:/usr/share/java/google-guice.jar:/usr/share/java/atinject.jar:/usr/share/java/aopalliance.jar:/usr/share/java/jersey/jersey-test-framework-grizzly2.jar:/usr/share/java/jersey/jersey-test-framework.jar:/usr/share/java/jboss-servlet-3.0-api/jboss-servlet-api_3.0_spec.jar:/usr/share/java/jersey/jersey-client.jar:/usr/share/java/jersey/jersey-grizzly2-servlet.jar:/usr/share/java/grizzly/grizzly-http-servlet.jar:/usr/share/java/grizzly/grizzly-http-server.jar:/usr/share/java/jersey/jersey-grizzly2.jar:/usr/share/java/grizzly/grizzly-http.jar:/usr/share/java/grizzly/grizzly-framework.jar:/usr/share/java/jersey/jersey-guice.jar:/usr/share/java/guice/guice-servlet.jar:/usr/share/java/google-guice.jar:/usr/share/java/netty.jar:/usr/share/java/jzlib.jar:/usr/share/java/ant/ant.jar:/usr/share/java/ant/ant-launcher.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/junit.jar:/usr/share/java/hamcrest/core.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/log4j12-1.2.17.jar:/usr/share/java/commons-io.jar:/usr/share/java/libthrift.jar:/usr/share/java/httpcomponents/httpclient.jar:/usr/share/java/httpcomponents/httpcore.jar:/usr/share/java/apache-commons-lang3.jar:/usr/share/java/curator/curator-recipes.jar:/usr/share/java/curator/curator-framework.jar:/usr/share/java/curator/curator-client.jar:/usr/share/java/curator/curator-test.jar:/usr/share/java/javassist.jar:/usr/share/java/tachyon.jar"
 
 if [ -z "JAVA_HOME" ]; then
   export JAVA="/usr/bin/java"
 else
   export JAVA="$JAVA_HOME/bin/java"
-fi
\ No newline at end of file
+fi