Author: vgritsenko
Date: Thu Apr 26 17:15:56 2007
New Revision: 532918
URL: http://svn.apache.org/viewvc?view=rev&rev=532918
Log:
more jdk 1.3 support, create log directory, tweaks
Modified:
xml/xindice/trunk/bin/xindice_rebuild
xml/xindice/trunk/bin/xindice_rebuild.bat
xml/xindice/trunk/xindiced
Modified: xml/xindice/trunk/bin/xindice_rebuild
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/bin/xindice_rebuild?view=diff&rev=532918&r1=532917&r2=532918
==============================================================================
--- xml/xindice/trunk/bin/xindice_rebuild (original)
+++ xml/xindice/trunk/bin/xindice_rebuild Thu Apr 26 17:15:56 2007
@@ -41,6 +41,10 @@
exit 1
fi
+if [ "$JAVA_OPTIONS" = "" ] ; then
+ JAVA_OPTIONS="-Xms64m -Xmx128m"
+fi
+
if [ "$XINDICE_HOME" = "" ] ; then
XINDICE_HOME=`dirname $0`/..
if [ ! -f $XINDICE_HOME/xindice-1*.jar ] ; then
@@ -53,10 +57,17 @@
if [ "$LOGGER" = "" ] ; then LOGGER=org.apache.commons.logging.impl.SimpleLog
; fi
if [ "$LOGLEVEL" = "" ] ; then LOGLEVEL=INFO ; fi
+if [ ! -d $XINDICE_HOME/logs ]
+then
+ echo Creating the logs directory under $XINDICE_HOME
+ mkdir -p $XINDICE_HOME/logs
+fi
+
# ----- Set Classpath
----------------------------------------------------------
CP=
+for i in `ls $XINDICE_HOME/lib/endorsed/*.jar` ; do CP=$CP:$i ; done
for i in `ls $XINDICE_HOME/lib/*.jar` ; do CP=$CP:$i ; done
for i in `ls $XINDICE_HOME/xindice*.jar` ; do CP=$CP:$i ; done
@@ -81,4 +92,4 @@
XINDICE_HOME=`cygpath --path --windows "$XINDICE_HOME"`
fi
-$JAVACMD -Xms16m -Xmx128m -Dorg.apache.commons.logging.Log="$LOGGER"
-Dorg.apache.commons.logging.simplelog.defaultlog="$LOGLEVEL" -classpath "$CP"
org.apache.xindice.tools.DatabaseRebuild $* 2>>"$XINDICE_HOME"/logs/rebuild.log
+$JAVACMD $JAVA_OPTIONS -Dorg.apache.commons.logging.Log="$LOGGER"
-Dorg.apache.commons.logging.simplelog.defaultlog="$LOGLEVEL" -classpath "$CP"
org.apache.xindice.tools.DatabaseRebuild $* 2>>"$XINDICE_HOME"/logs/rebuild.log
Modified: xml/xindice/trunk/bin/xindice_rebuild.bat
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/bin/xindice_rebuild.bat?view=diff&rev=532918&r1=532917&r2=532918
==============================================================================
--- xml/xindice/trunk/bin/xindice_rebuild.bat (original)
+++ xml/xindice/trunk/bin/xindice_rebuild.bat Thu Apr 26 17:15:56 2007
@@ -61,6 +61,7 @@
:: ----- Set Up The Classpath
--------------------------------------------------
set LOCALCLASSPATH=
+for %%i in ("%_XINDICE_HOME%\lib\endorsed\*.jar") do call
"%_XINDICE_HOME%\bin\lcp.bat" %%i
for %%i in ("%_XINDICE_HOME%\lib\*.jar") do call "%_XINDICE_HOME%\bin\lcp.bat"
%%i
for %%i in ("%_XINDICE_HOME%\xindice*.jar") do call
"%_XINDICE_HOME%\bin\lcp.bat" %%i
Modified: xml/xindice/trunk/xindiced
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/xindiced?view=diff&rev=532918&r1=532917&r2=532918
==============================================================================
--- xml/xindice/trunk/xindiced (original)
+++ xml/xindice/trunk/xindiced Thu Apr 26 17:15:56 2007
@@ -37,11 +37,13 @@
usage()
{
- echo "Usage: $0 (action)"
- echo "actions:"
+ echo "Xindice Server Startup Script"
+ echo "Usage:"
+ echo " $0 <action>"
+ echo "Actions:"
echo " start Start Xindice server"
echo " stop Stop Xindice server"
- echo " debug Start Xindice server turning on remote debugging"
+ echo " debug Start Xindice server with remote debugging on"
exit 1
}
@@ -154,7 +156,7 @@
fi
echo
- echo "Starting Xindice - Log files are under $XINDICE_HOME/logs"
+ echo "Starting Xindice. Log files are under $XINDICE_HOME/logs"
echo
nohup "$JAVACMD" $JAVA_OPTIONS -classpath "$CP"
-Djava.endorsed.dirs=lib/endorsed -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"
-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
&
@@ -171,7 +173,7 @@
if [ -f $XINDICE_PID ]
then
echo
- echo "Shutting down Xindice"
+ echo "Shutting down Xindice running with PID `cat $XINDICE_PID`"
echo
kill `cat $XINDICE_PID`
rm $XINDICE_PID
@@ -188,4 +190,3 @@
esac
exit 0
-
