vgritsenko 2004/01/16 05:38:33
Modified: . xindice.bat xindice.sh
Log:
Fix discrepancy in comments and code (JAVA_OPTIONS vs JAVA_OPT)
Revision Changes Path
1.13 +18 -4 xml-xindice/xindice.bat
Index: xindice.bat
===================================================================
RCS file: /home/cvs/xml-xindice/xindice.bat,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xindice.bat 14 Jan 2004 14:06:09 -0000 1.12
+++ xindice.bat 16 Jan 2004 13:38:33 -0000 1.13
@@ -6,6 +6,20 @@
:: $Id$
::
-----------------------------------------------------------------------------
+:: Configuration variables
+::
+:: XINDICE_HOME
+:: Home of Xindice program and data.
+::
+:: JAVA_HOME
+:: Home of Java installation.
+::
+:: JAVA_OPTIONS
+:: Extra options to pass to the JVM
+::
+:: JETTY_PORT
+:: Override the default port for Jetty
+
:: ----- Verify and Set Required Environment Variables
-------------------------
if not "%JAVA_HOME%" == "" goto gotJavaHome
@@ -75,19 +89,19 @@
:: ----- Start Servlet
---------------------------------------------------------
:doStart
-%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=build\endorsed -Dxindice.home="%XINDICE_HOME%"
-Dxindice.db.home="%XINDICE_HOME%" -Dwebapp=%JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT%
org.mortbay.jetty.Server tools\jetty\conf\main.xml
+%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=build\endorsed -Dxindice.home="%XINDICE_HOME%"
-Dxindice.db.home="%XINDICE_HOME%" -Dwebapp=%JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT%
org.mortbay.jetty.Server tools\jetty\conf\main.xml
goto end
:: ----- Run Servlet
-----------------------------------------------------------
:doRun
-%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=build\endorsed -Dxindice.home="%XINDICE_HOME%"
-Dxindice.db.home="%XINDICE_HOME%" -Dwebapp=%JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT%
org.mortbay.jetty.Server tools\jetty\conf\main.xml
+%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=build\endorsed -Dxindice.home="%XINDICE_HOME%"
-Dxindice.db.home="%XINDICE_HOME%" -Dwebapp=%JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT%
org.mortbay.jetty.Server tools\jetty\conf\main.xml
goto end
:: ----- Servlet Debug
---------------------------------------------------------
:doDebug
-%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -Xdebug
-Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n
-classpath %LOCALCLASSPATH%
-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-Dorg.apache.commons.logging.simplelog.defaultlog=debug
-Djava.endorsed.dirs=build\endorsed -Dxindice.home="%XINDICE_HOME%"
-Dxindice.db.home="%XINDICE_HOME%" -Dwebapp=%JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT%
org.mortbay.jetty.Server tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
+%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -Xdebug
-Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n
-classpath %LOCALCLASSPATH%
-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-Dorg.apache.commons.logging.simplelog.defaultlog=debug
-Djava.endorsed.dirs=build\endorsed -Dxindice.home="%XINDICE_HOME%"
-Dxindice.db.home="%XINDICE_HOME%" -Dwebapp=%JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT%
org.mortbay.jetty.Server tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
goto end
1.10 +8 -4 xml-xindice/xindice.sh
Index: xindice.sh
===================================================================
RCS file: /home/cvs/xml-xindice/xindice.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xindice.sh 1 Jan 2004 21:46:41 -0000 1.9
+++ xindice.sh 16 Jan 2004 13:38:33 -0000 1.10
@@ -37,6 +37,7 @@
# ----- OS specific support
----------------------------------------------------
+
cygwin=false;
darwin=false;
case "`uname`" in
@@ -50,6 +51,7 @@
# ----- 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
@@ -58,7 +60,7 @@
if [ "$XINDICE_HOME" = "" ] ; then
echo
echo "WARNING: The environment variable XINDICE_HOME is not set."
- echo " defaulting to `pwd`."
+ echo " Defaulting to `pwd`"
XINDICE_HOME=`pwd`
fi
@@ -91,11 +93,13 @@
# ----- Set Classpath
----------------------------------------------------------
+
for i in `ls $XINDICE_HOME/java/lib/*.jar` ; do CP=$CP:$i ; done
for i in `ls $XINDICE_HOME/tools/jetty/lib/*.jar` ; do CP=$CP:$i ; done
# ----- Do the action
----------------------------------------------------------
+
JAVACMD=$JAVA_HOME/bin/java
JETTY_CONFIG="$XINDICE_HOME/tools/jetty/conf/main.xml"
# For Cygwin, switch paths to Windows format before running java
@@ -123,14 +127,14 @@
echo "Starting Xindice - Log files are under $XINDICE_HOME/logs"
echo
- nohup sh -c "$JAVA_HOME/bin/java $JAVA_OPT -classpath \"$CP\"
-Djava.endorsed.dirs=build/endorsed -Dxindice.home=\"$XINDICE_HOME\"
-Dxindice.db.home=\"$XINDICE_HOME\" -Dwebapp=\"$JETTY_WEBAPP\"
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT
org.mortbay.jetty.Server \"$JETTY_CONFIG\"" >> $XINDICE_HOME/logs/xindice.out
2>&1 &
+ nohup sh -c "$JAVA_HOME/bin/java $JAVA_OPTIONS -classpath \"$CP\"
-Djava.endorsed.dirs=build/endorsed -Dxindice.home=\"$XINDICE_HOME\"
-Dxindice.db.home=\"$XINDICE_HOME\" -Dwebapp=\"$JETTY_WEBAPP\"
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT
org.mortbay.jetty.Server \"$JETTY_CONFIG\"" >> $XINDICE_HOME/logs/xindice.out
2>&1 &
echo $! > $XINDICE_PID
echo "Xindice is running with PID `cat $XINDICE_PID`"
;;
debug)
- $JAVACMD $JAVA_OPT -Xdebug
-Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n
-classpath "$CP" -Djava.endorsed.dirs=build/endorsed
-Dxindice.home="$XINDICE_HOME" -Dxindice.db.home="$XINDICE_HOME"
-Dwebapp="$JETTY_WEBAPP"
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT
org.mortbay.jetty.Server "$JETTY_CONFIG"
"$XINDICE_HOME/tools/jetty/conf/admin.xml" >> $XINDICE_HOME/logs/xindice.out
2>&1
+ $JAVACMD $JAVA_OPTIONS -Xdebug
-Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n
-classpath "$CP" -Djava.endorsed.dirs=build/endorsed
-Dxindice.home="$XINDICE_HOME" -Dxindice.db.home="$XINDICE_HOME"
-Dwebapp="$JETTY_WEBAPP"
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT
org.mortbay.jetty.Server "$JETTY_CONFIG"
"$XINDICE_HOME/tools/jetty/conf/admin.xml" >> $XINDICE_HOME/logs/xindice.out
2>&1
;;
stop)
