vgritsenko 2004/01/16 05:46:47
Modified: bin xindice.war.bat xindice.war.sh Log: Add XINDICE_CONFIG parameter Revision Changes Path 1.2 +3 -7 xml-xindice/bin/xindice.war.bat Index: xindice.war.bat =================================================================== RCS file: /home/cvs/xml-xindice/bin/xindice.war.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xindice.war.bat 15 Jan 2004 13:32:18 -0000 1.1 +++ xindice.war.bat 16 Jan 2004 13:46:47 -0000 1.2 @@ -31,6 +31,7 @@ echo Using Xindice home: %XINDICE_HOME% if "%XINDICE_DB_HOME%" == "" set XINDICE_DB_HOME=%XINDICE_HOME% +if "%XINDICE_CONFIG%" == "" set XINDICE_CONFIG=%XINDICE_HOME%\system.xml if "%LOGGER%" == "" set LOGGER=org.apache.commons.logging.impl.SimpleLog if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java @@ -47,20 +48,15 @@ set CL= :LOOP if "%1"=="" goto DONE -if "%1"=="-v" goto VERBOSE set CL=%CL% %1 shift goto LOOP -:VERBOSE -set LOGLEVEL=DEBUG -shift -goto LOOP :DONE :: ----- Start Command Line Tool ----------------------------------------------- -%JAVACMD% -Xms16m -Xmx128m -Djava.endorsed.dirs=%XINDICE_HOME%\lib -Dxindice.home=%XINDICE_HOME% -Dxindice.db.home=%XINDICE_DB_HOME% -Dorg.apache.commons.logging.Log=%LOGGER% -Dorg.apache.commons.logging.simplelog.defaultlog=%LOGLEVEL% -Dcmd.home=%XINDICE_HOME% -classpath %LOCALCLASSPATH% org.apache.xindice.tools.XMLTools %CL% +%JAVACMD% -Xms16m -Xmx128m -Djava.endorsed.dirs=%XINDICE_HOME%\lib -Dxindice.home=%XINDICE_HOME% -Dxindice.db.home=%XINDICE_DB_HOME% -Dxindice.configuration=%XINDICE_CONFIG% -Dorg.apache.commons.logging.Log=%LOGGER% -Dorg.apache.commons.logging.simplelog.defaultlog=%LOGLEVEL% -Dcmd.home=%XINDICE_HOME% -classpath %LOCALCLASSPATH% org.apache.xindice.tools.XMLTools %CL% :: ----- End ------------------------------------------------------------------- 1.2 +47 -39 xml-xindice/bin/xindice.war.sh Index: xindice.war.sh =================================================================== RCS file: /home/cvs/xml-xindice/bin/xindice.war.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xindice.war.sh 15 Jan 2004 13:32:18 -0000 1.1 +++ xindice.war.sh 16 Jan 2004 13:46:47 -0000 1.2 @@ -1,50 +1,58 @@ #!/bin/sh +# ----------------------------------------------------------------------------- +# Xindice Command Line Tool Unix Shell Script for WAR distribution +# +# $Id$ +# ----------------------------------------------------------------------------- + +# ----- OS specific support ---------------------------------------------------- + +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) cygwin=true ;; + Darwin*) darwin=true + if [ -z "$JAVA_HOME" ] ; then + JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home + fi + ;; +esac + -if test -z "$JAVA_HOME"; then - echo "\$JAVA_HOME Is Not Set" - exit +# ----- Verify and Set Required Environment Variables ------------------------- + +if [ "$JAVA_HOME" = "" ] ; then + echo You must set JAVA_HOME to point at your Java Development Kit installation + exit 1 fi -if test -z "$XINDICE_HOME"; then - echo "\$XINDICE_HOME Is Not Set" - exit +if [ "$XINDICE_HOME" = "" ] ; then + XINDICE_HOME=`dirname $0` + echo "WARNING: The environment variable XINDICE_HOME is not set." + echo " Defaulting to $XINDICE_HOME" fi -CMD_HOME=`dirname $0` -CMD_NAME=`basename $0` +if [ "$XINDICE_DB_HOME" = "" ] ; then XINDICE_DB_HOME=$XINDICE_HOME ; fi +if [ "$XINDICE_CONFIG" = "" ] ; then XINDICE_CONFIG=$XINDICE_HOME/system.xml ; fi +if [ "$LOGGER" = "" ] ; then LOGGER=org.apache.commons.logging.impl.SimpleLog ; fi +if [ "$LOGLEVEL" = "" ] ; then LOGLEVEL=INFO ; fi -CLASSPATH=$XINDICE_HOME/classgen:$XINDICE_HOME/config:$CLASSPATH -# Read in the list of Xindice Jars to include in the CLASSPATH -JAR_LIST="" -JARS=`ls -1 $XINDICE_HOME/java/lib/*.jar` -for jar in $JARS ; do - JAR_LIST="$JAR_LIST `basename $jar`" - CLASSPATH=$jar:$CLASSPATH ; -done -JARS=`ls -1 $XINDICE_HOME/dist/xindice*.jar` -for jar in $JARS ; do - JAR_LIST="$JAR_LIST `basename $jar`" - CLASSPATH=$jar:$CLASSPATH ; -done - -# Read in the extra VM paramters for starting the program -VMPROPS="" -if test -f $XINDICE_HOME/config/vm.cfg; then - PROPS="`cat $XINDICE_HOME/config/vm.cfg`" - for prop in $PROPS - do - VMPROPS="$VMPROPS $prop" - done -fi +# ----- Set Classpath ---------------------------------------------------------- + +CP=$XINDICE_HOME/classes +for i in `ls $XINDICE_HOME/lib/*.jar` ; do CP=$CP:$i ; done -case $CMD_NAME in - xindice) CLASS_NAME="org.apache.xindice.tools.XMLTools" ;; - *) echo "Error mapping command link to Java class" - exit 1 ;; -esac -LOGGER=org.apache.commons.logging.impl.SimpleLog -LOGLEVEL=debug +# ----- Run Tools -------------------------------------------------------------- + +JAVACMD=$JAVA_HOME/bin/java +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + CP=`cygpath --path --windows "$CP"` + XINDICE_HOME=`cygpath --path --windows "$XINDICE_HOME"` + XINDICE_DB_HOME=`cygpath --path --windows "$XINDICE_DB_HOME"` + XINDICE_CONFIG=`cygpath --path --windows "$XINDICE_CONFIG"` +fi -$JAVA_HOME/bin/java -Xms16m -Xmx128m -Dxindice.home="$XINDICE_HOME" -Dorg.apache.commons.logging.Log="$LOGGER" -Dorg.apache.commons.logging.simplelog.defaultlog="$LOGLEVEL" -Dcmd.home="$CMD_HOME" $VMPROPS -classpath "$CLASSPATH" $CLASS_NAME $* +$JAVACMD -Xms16m -Xmx128m -Djava.endorsed.dirs="$XINDICE_HOME/lib" -Dxindice.home="$XINDICE_HOME" -Dxindice.db.home="$XINDICE_DB_HOME" -Dxindice.configuration="$XINDICE_CONFIG" -Dorg.apache.commons.logging.Log="$LOGGER" -Dorg.apache.commons.logging.simplelog.defaultlog="$LOGLEVEL" -Dcmd.home="$XINDICE_HOME" -classpath "$CP" org.apache.xindice.tools.XMLTools $*
