You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xindice-dev@xml.apache.org by vg...@apache.org on 2004/02/23 03:23:52 UTC
cvs commit: xml-xindice build.sh xindice.sh
vgritsenko 2004/02/22 18:23:52
Modified: . build.sh xindice.sh
Log:
minor fixes
Revision Changes Path
1.9 +5 -9 xml-xindice/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xindice/build.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.sh 31 Dec 2003 02:23:11 -0000 1.8
+++ build.sh 23 Feb 2004 02:23:52 -0000 1.9
@@ -3,7 +3,7 @@
echo
echo "Apache Xindice Build System"
-echo "--------------------------"
+echo "---------------------------"
if [ ! -d build ]
then
@@ -25,15 +25,11 @@
chmod u+x ./tools/bin/ant
unset ANT_HOME
-
-CP=$CLASSPATH
-export CP
+CP=$CLASSPATH; export CP
unset CLASSPATH
-ANT_OPTS=-Djava.endorsed.dirs=build/endorsed
-export ANT_OPTS
+ANT_OPTS="-Djava.endorsed.dirs=build/endorsed -Djava.awt.headless=true"; export ANT_OPTS
$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger $@
-CLASSPATH=$CP
-export CLASSPATH
+CLASSPATH=$CP; export CLASSPATH
1.13 +3 -3 xml-xindice/xindice.sh
Index: xindice.sh
===================================================================
RCS file: /home/cvs/xml-xindice/xindice.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xindice.sh 8 Feb 2004 04:06:00 -0000 1.12
+++ xindice.sh 23 Feb 2004 02:23:52 -0000 1.13
@@ -57,7 +57,7 @@
exit 1
fi
-if [ "$JAVA_OPTIONS" == "" ] ; then
+if [ "$JAVA_OPTIONS" = "" ] ; then
JAVA_OPTIONS="-Xms64m -Xmx128m"
fi
@@ -131,7 +131,7 @@
echo "Starting Xindice - Log files are under $XINDICE_HOME/logs"
echo
- 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 &
+ nohup "$JAVACMD" $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`"