You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 10:22:30 UTC
svn commit: r1132003 - in /incubator/mesos/trunk/frameworks/hadoop-0.20.2:
bin/hadoop hadoop-mesos.patch src/contrib/mesos/build.xml
Author: benh
Date: Sun Jun 5 08:22:30 2011
New Revision: 1132003
URL: http://svn.apache.org/viewvc?rev=1132003&view=rev
Log:
Fixed Hadoop port to work with new MESOS_HOME structure
Modified:
incubator/mesos/trunk/frameworks/hadoop-0.20.2/bin/hadoop
incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch
incubator/mesos/trunk/frameworks/hadoop-0.20.2/src/contrib/mesos/build.xml
Modified: incubator/mesos/trunk/frameworks/hadoop-0.20.2/bin/hadoop
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.2/bin/hadoop?rev=1132003&r1=1132002&r2=1132003&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.2/bin/hadoop (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.2/bin/hadoop Sun Jun 5 08:22:30 2011
@@ -284,7 +284,7 @@ if [ "x$MESOS_HOME" == "x" ] ; then
fi
fi
if [ "x$MESOS_HOME" != "x" ] ; then
- CLASSPATH="$CLASSPATH:$MESOS_HOME/src/swig/java"
+ CLASSPATH="$CLASSPATH:$MESOS_HOME/lib/java/mesos.jar"
fi
CLASSPATH="$CLASSPATH:$HADOOP_HOME/build/contrib/mesos/classes"
@@ -316,9 +316,9 @@ fi
# add Mesos to Java library path
if [ "x$MESOS_HOME" != "x" ] ; then
if [ "x$JAVA_LIBRARY_PATH" == "x" ] ; then
- JAVA_LIBRARY_PATH="$MESOS_HOME/src/swig/java"
+ JAVA_LIBRARY_PATH="$MESOS_HOME/lib/java"
else
- JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:$MESOS_HOME/src/swig/java"
+ JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:$MESOS_HOME/lib/java"
fi
fi
Modified: incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch?rev=1132003&r1=1132002&r2=1132003&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch Sun Jun 5 08:22:30 2011
@@ -1467,10 +1467,10 @@ Index: src/contrib/mesos/build.xml
+
+ <!-- locate Mesos home -->
+ <property environment="env" />
-+ <condition property="mesos.home" value="${env.MESOS_HOME}" else="${basedir}/../../../../../src">
++ <condition property="mesos.home" value="${env.MESOS_HOME}" else="${basedir}/../../../../..">
+ <isset property="env.MESOS_HOME" />
+ </condition>
-+ <property name="mesos.jar" value="${mesos.home}/swig/java/mesos.jar" />
++ <property name="mesos.jar" value="${mesos.home}/lib/java/mesos.jar" />
+ <echo>Mesos jar: ${mesos.jar}</echo>
+
+ <!-- add it to our Classpath -->
@@ -1850,11 +1850,11 @@ Index: bin/hadoop
+# add Mesos to classpath
+if [ "x$MESOS_HOME" == "x" ] ; then
+ if [ -d "$HADOOP_HOME/../../src/swig/java" ] ; then
-+ MESOS_HOME=`cd "$HADOOP_HOME/../../src"; pwd`
++ MESOS_HOME=`cd "$HADOOP_HOME/../../"; pwd`
+ fi
+fi
+if [ "x$MESOS_HOME" != "x" ] ; then
-+ CLASSPATH="$CLASSPATH:$MESOS_HOME/swig/java"
++ CLASSPATH="$CLASSPATH:$MESOS_HOME/lib/java/mesos.jar"
+fi
+CLASSPATH="$CLASSPATH:$HADOOP_HOME/build/contrib/mesos/classes"
+
Modified: incubator/mesos/trunk/frameworks/hadoop-0.20.2/src/contrib/mesos/build.xml
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.2/src/contrib/mesos/build.xml?rev=1132003&r1=1132002&r2=1132003&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.2/src/contrib/mesos/build.xml (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.2/src/contrib/mesos/build.xml Sun Jun 5 08:22:30 2011
@@ -28,7 +28,7 @@ to call at top-level: ant deploy-contrib
<condition property="mesos.home" value="${env.MESOS_HOME}" else="${basedir}/../../../../..">
<isset property="env.MESOS_HOME" />
</condition>
- <property name="mesos.jar" value="${mesos.home}/src/swig/java/mesos.jar" />
+ <property name="mesos.jar" value="${mesos.home}/lib/java/mesos.jar" />
<echo>Mesos jar: ${mesos.jar}</echo>
<!-- add it to our Classpath -->