[MOBY-guts] biomoby commit

[Martin Senger]

senger
Mon Nov 21 12:17:27 EST 2005
Update of /home/repository/moby/moby-live/Java/src/config
In directory pub.open-bio.org:/tmp/cvs-serv9749/src/config

Modified Files:
	log4j.properties run-any-client run-any-client.bat 
	run-dashboard run-dashboard.bat 
Log Message:


moby-live/Java/src/config log4j.properties,1.2,1.3 run-any-client,1.5,1.6 run-any-client.bat,1.6,1.7 run-dashboard,1.3,1.4 run-dashboard.bat,1.4,1.5
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/config/log4j.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/src/config/log4j.properties	2005/11/20 17:38:39	1.2
+++ /home/repository/moby/moby-live/Java/src/config/log4j.properties	2005/11/21 17:17:27	1.3
@@ -28,7 +28,7 @@
 # -----------------------------
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 #log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.file=./jMoby-debug.log
+#log4j.appender.A1.file=./jMoby-debug.log
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{1} %x - %m%n
 

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/config/run-any-client,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/src/config/run-any-client	2005/11/15 03:25:51	1.5
+++ /home/repository/moby/moby-live/Java/src/config/run-any-client	2005/11/21 17:17:27	1.6
@@ -14,6 +14,7 @@
 CLASSPATH=${PROJECT_HOME}/build/others/datatypes:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/others/skeletons:$CLASSPATH
 CLASSPATH=${PROJECT_HOME}/build/others/samples:$CLASSPATH
+CLASSPATH=${JAVA_HOME}/lib/tools.jar:$CLASSPATH
 CLASSPATH=`echo ${PROJECT_HOME}/lib/*.jar | tr ' ' ':'`:$CLASSPATH
 CLASSPATH=`echo ${PROJECT_HOME}/lib/ant_home/lib/*.jar | tr ' ' ':'`:$CLASSPATH
 

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/config/run-any-client.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/config/run-any-client.bat	2005/11/20 12:30:51	1.6
+++ /home/repository/moby/moby-live/Java/src/config/run-any-client.bat	2005/11/21 17:17:27	1.7
@@ -5,6 +5,7 @@
 set CP=
 for %%i in (lib\*.jar) do call cp.bat %%i
 for %%i in (lib\ant_home\lib\*.jar) do call cp.bat %%i
+set "CP=%JAVA_HOME%\lib\tools.jar;%CP%"
 set CP=build\classes;%CP%
 set CP=build\Clients;%CP%
 set CP=build\others\datatypes;%CP%

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/config/run-dashboard,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/src/config/run-dashboard	2005/11/20 12:30:51	1.3
+++ /home/repository/moby/moby-live/Java/src/config/run-dashboard	2005/11/21 17:17:27	1.4
@@ -5,6 +5,19 @@
 #  $Id$
 # ----------------------------------------------------
 
+# --- setup JAVA_HOME
+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@
 
 CLASSPATH=${PROJECT_HOME}/build/classes
@@ -15,5 +28,7 @@
 CLASSPATH=${PROJECT_HOME}/build/lib/dashboard-config.jar:$CLASSPATH
 CLASSPATH=`echo ${PROJECT_HOME}/lib/*.jar | tr ' ' ':'`:$CLASSPATH
 CLASSPATH=`echo ${PROJECT_HOME}/lib/ant_home/lib/*.jar | tr ' ' ':'`:$CLASSPATH
+CLASSPATH=${JAVA_HOME}/lib/tools.jar:$CLASSPATH
 
-exec java -cp $CLASSPATH org.biomoby.service.dashboard.Dashboard "$@"
+JAVA=$JAVA_HOME/bin/java
+exec $JAVA -cp $CLASSPATH org.biomoby.service.dashboard.Dashboard "$@"

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/config/run-dashboard.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/moby-live/Java/src/config/run-dashboard.bat	2005/11/20 12:30:51	1.4
+++ /home/repository/moby/moby-live/Java/src/config/run-dashboard.bat	2005/11/21 17:17:27	1.5
@@ -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@"
 cd "%PROJECT_HOME%"
 set CP=
 for %%i in (lib\*.jar) do call cp.bat %%i
 for %%i in (lib\ant_home\lib\*.jar) do call cp.bat %%i
+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%" org.biomoby.service.dashboard.Dashboard  %*
+set "JAVA=%JAVA_HOME%\bin\java"
+"%JAVA%" -classpath "%CP%" org.biomoby.service.dashboard.Dashboard  %*
+
+:end