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 2012/03/24 22:10:23 UTC
svn commit: r1304921 - in /incubator/mesos/trunk/src/examples/java:
test-exception-framework.in test-executor.in test-framework.in
test-multiple-executors-framework.in
Author: benh
Date: Sat Mar 24 21:10:22 2012
New Revision: 1304921
URL: http://svn.apache.org/viewvc?rev=1304921&view=rev
Log:
Use JAVA_HOME to find java for java example frameworks (contributed by Charles Reiss).
Modified:
incubator/mesos/trunk/src/examples/java/test-exception-framework.in
incubator/mesos/trunk/src/examples/java/test-executor.in
incubator/mesos/trunk/src/examples/java/test-framework.in
incubator/mesos/trunk/src/examples/java/test-multiple-executors-framework.in
Modified: incubator/mesos/trunk/src/examples/java/test-exception-framework.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/test-exception-framework.in?rev=1304921&r1=1304920&r2=1304921&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/test-exception-framework.in (original)
+++ incubator/mesos/trunk/src/examples/java/test-exception-framework.in Sat Mar 24 21:10:22 2012
@@ -5,6 +5,10 @@
MESOS_SOURCE_DIR=@abs_top_srcdir@
MESOS_BUILD_DIR=@abs_top_builddir@
+# Locate Java from environment or use configure discovered location.
+JAVA_HOME=${JAVA_HOME-@JAVA_HOME@}
+JAVA=${JAVA-${JAVA_HOME}/bin/java}
+
# Use colors for errors.
. ${MESOS_SOURCE_DIR}/support/colors.sh
@@ -30,6 +34,6 @@ test ! -e ${EXAMPLES_JAR} && \
# framework is able to find the executor.
cd `dirname ${0}`
-exec java -cp ${PROTOBUF_JAR}:${MESOS_JAR}:${EXAMPLES_JAR} \
+exec ${JAVA} -cp ${PROTOBUF_JAR}:${MESOS_JAR}:${EXAMPLES_JAR} \
-Djava.library.path=${MESOS_BUILD_DIR}/src/.libs \
TestExceptionFramework "${@}"
Modified: incubator/mesos/trunk/src/examples/java/test-executor.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/test-executor.in?rev=1304921&r1=1304920&r2=1304921&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/test-executor.in (original)
+++ incubator/mesos/trunk/src/examples/java/test-executor.in Sat Mar 24 21:10:22 2012
@@ -5,6 +5,10 @@
MESOS_SOURCE_DIR=@abs_top_srcdir@
MESOS_BUILD_DIR=@abs_top_builddir@
+# Locate Java from environment or use configure discovered location.
+JAVA_HOME=${JAVA_HOME-@JAVA_HOME@}
+JAVA=${JAVA-${JAVA_HOME}/bin/java}
+
# Use colors for errors.
. ${MESOS_SOURCE_DIR}/support/colors.sh
@@ -26,6 +30,6 @@ test ! -e ${EXAMPLES_JAR} && \
echo "${RED}Failed to find ${EXAMPLES_JAR}${NORMAL}" && \
exit 1
-exec java -cp ${PROTOBUF_JAR}:${MESOS_JAR}:${EXAMPLES_JAR} \
+exec ${JAVA} -cp ${PROTOBUF_JAR}:${MESOS_JAR}:${EXAMPLES_JAR} \
-Djava.library.path=${MESOS_BUILD_DIR}/src/.libs \
TestExecutor "${@}"
Modified: incubator/mesos/trunk/src/examples/java/test-framework.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/test-framework.in?rev=1304921&r1=1304920&r2=1304921&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/test-framework.in (original)
+++ incubator/mesos/trunk/src/examples/java/test-framework.in Sat Mar 24 21:10:22 2012
@@ -5,6 +5,10 @@
MESOS_SOURCE_DIR=@abs_top_srcdir@
MESOS_BUILD_DIR=@abs_top_builddir@
+# Locate Java from environment or use configure discovered location.
+JAVA_HOME=${JAVA_HOME-@JAVA_HOME@}
+JAVA=${JAVA-${JAVA_HOME}/bin/java}
+
# Use colors for errors.
. ${MESOS_SOURCE_DIR}/support/colors.sh
@@ -30,6 +34,6 @@ test ! -e ${EXAMPLES_JAR} && \
# framework is able to find the executor.
cd `dirname ${0}`
-exec java -cp ${PROTOBUF_JAR}:${MESOS_JAR}:${EXAMPLES_JAR} \
+exec ${JAVA} -cp ${PROTOBUF_JAR}:${MESOS_JAR}:${EXAMPLES_JAR} \
-Djava.library.path=${MESOS_BUILD_DIR}/src/.libs \
TestFramework "${@}"
Modified: incubator/mesos/trunk/src/examples/java/test-multiple-executors-framework.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/test-multiple-executors-framework.in?rev=1304921&r1=1304920&r2=1304921&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/test-multiple-executors-framework.in (original)
+++ incubator/mesos/trunk/src/examples/java/test-multiple-executors-framework.in Sat Mar 24 21:10:22 2012
@@ -5,6 +5,10 @@
MESOS_SOURCE_DIR=@abs_top_srcdir@
MESOS_BUILD_DIR=@abs_top_builddir@
+# Locate Java from environment or use configure discovered location.
+JAVA_HOME=${JAVA_HOME-@JAVA_HOME@}
+JAVA=${JAVA-${JAVA_HOME}/bin/java}
+
# Use colors for errors.
. ${MESOS_SOURCE_DIR}/support/colors.sh
@@ -30,6 +34,6 @@ test ! -e ${EXAMPLES_JAR} && \
# framework is able to find the executor.
cd `dirname ${0}`
-exec java -cp ${PROTOBUF_JAR}:${MESOS_JAR}:${EXAMPLES_JAR} \
+exec ${JAVA} -cp ${PROTOBUF_JAR}:${MESOS_JAR}:${EXAMPLES_JAR} \
-Djava.library.path=${MESOS_BUILD_DIR}/src/.libs \
TestMultipleExecutorsFramework "${@}"