[MOBY-guts] biomoby commit

[Martin Senger]

senger
Sun Mar  2 07:45:25 EST 2008
Update of /home/repository/moby/moby-live/Java/src/config
In directory dev.open-bio.org:/tmp/cvs-serv32345/src/config

Modified Files:
	run-any-client run-dashboard run-dashboard.bat 
Log Message:
Too Many Changes - see docs/ChangeLog

moby-live/Java/src/config run-any-client,1.9,1.10 run-dashboard,1.8,1.9 run-dashboard.bat,1.7,1.8
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/config/run-any-client,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- /home/repository/moby/moby-live/Java/src/config/run-any-client	2008/02/14 06:13:36	1.9
+++ /home/repository/moby/moby-live/Java/src/config/run-any-client	2008/03/02 12:45:25	1.10
@@ -7,14 +7,29 @@
 #  $Id$
 # ----------------------------------------------------
 
+# --- setup JAVA_HOME (needed to get to the tools.jar)
+if [ -z "$JAVA_HOME" ] ; then
+  JAVA=`which java`
+  if [ -z "$JAVA" ] ; then
+    echo "Cannot find JAVA. Please set your PATH."
+    exit 1
+  else
+      JAVA_BIN=`dirname $JAVA`
+      JAVA_HOME=$JAVA_BIN/..
+      export JAVA_HOME
+  fi
+fi
+
 PROJECT_HOME=@PROJECT_HOME@
 LIBS_PATH=@PROJECT_DEPS@
 
 CLASSPATH=$LIBS_PATH
+CLASSPATH=${JAVA_HOME}/lib/tools.jar:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/others/datatypes:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/others/skeletons:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/others/samples:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/classes:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/Clients:$CLASSPATH
 
-exec java -cp $CLASSPATH @LOG4J@ "$@"
+JAVA=$JAVA_HOME/bin/java
+exec $JAVA -cp $CLASSPATH @LOG4J@ "$@"

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/config/run-dashboard,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- /home/repository/moby/moby-live/Java/src/config/run-dashboard	2008/02/22 00:54:30	1.8
+++ /home/repository/moby/moby-live/Java/src/config/run-dashboard	2008/03/02 12:45:25	1.9
@@ -4,10 +4,25 @@
 #
 #  $Id$
 # ----------------------------------------------------
+
+# --- setup JAVA_HOME (needed to get to the tools.jar for compilation)
+if [ -z "$JAVA_HOME" ] ; then
+  JAVA=`which java`
+  if [ -z "$JAVA" ] ; then
+    echo "Cannot find JAVA. Please set your PATH."
+    exit 1
+  else
+      JAVA_BIN=`dirname $JAVA`
+      JAVA_HOME=$JAVA_BIN/..
+      export JAVA_HOME
+  fi
+fi
+
 PROJECT_HOME=@PROJECT_HOME@
 LIBS_PATH=@PROJECT_DEPS@
 
 CLASSPATH=$LIBS_PATH
+CLASSPATH=${JAVA_HOME}/lib/tools.jar:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/others/datatypes:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/others/skeletons:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/others/samples:$CLASSPATH
@@ -15,4 +30,5 @@
 CLASSPATH=${PROJECT_HOME}/build/classes:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/Clients:$CLASSPATH
 
-exec java -Xms32m -Xmx256m -cp $CLASSPATH @LOG4J@ org.biomoby.service.dashboard.Dashboard "$@"
+JAVA=$JAVA_HOME/bin/java
+exec $JAVA -Xms32m -Xmx256m -cp $CLASSPATH @LOG4J@ org.biomoby.service.dashboard.Dashboard "$@"

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/config/run-dashboard.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- /home/repository/moby/moby-live/Java/src/config/run-dashboard.bat	2008/02/14 06:13:36	1.7
+++ /home/repository/moby/moby-live/Java/src/config/run-dashboard.bat	2008/03/02 12:45:25	1.8
@@ -1,10 +1,20 @@
 @echo off
 
+if NOT "%JAVA_HOME%"=="" goto javadone
+echo =======================================================
+echo Setup the JAVA_HOME environment variable.
+echo Hint (for XP): Click Start -- Control Panel -- System.
+echo Then click Advanced, then click "Environment Variables".
+echo ========================================================
+goto end
+:javadone
+
 set "PROJECT_HOME=@PROJECT_HOME@"
 set "PROJECT_DEPS=@PROJECT_DEPS@"
 cd "%PROJECT_HOME%"
 set CP=
 set CP=%PROJECT_DEPS%;%CP%
+set "CP=%JAVA_HOME%\lib\tools.jar;%CP%"
 set CP=build\classes;%CP%
 set CP=build\Clients;%CP%
 set CP=build\others\datatypes;%CP%
@@ -12,4 +22,7 @@
 set CP=build\others\samples;%CP%
 set CP=build\lib\dashboard-config.jar;%CP%
 
-java -classpath "%CP%" @LOG4J@ org.biomoby.service.dashboard.Dashboard  %*
+set "JAVA=%JAVA_HOME%\bin\java"
+"%JAVA%" -classpath "%CP%" @LOG4J@ org.biomoby.service.dashboard.Dashboard  %*
+
+java -Xms32m -Xmx256m -classpath "%CP%" @LOG4J@ org.biomoby.service.dashboard.Dashboard  %*