vgritsenko 2003/12/25 11:15:01
Modified: . xindice.bat xindice.sh
Log:
bat: Use current working directory if XINDICE_HOME is not present
sh: Add cygwin support
Revision Changes Path
1.9 +7 -2 xml-xindice/xindice.bat
Index: xindice.bat
===================================================================
RCS file: /home/cvs/xml-xindice/xindice.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xindice.bat 22 Dec 2003 13:44:49 -0000 1.8
+++ xindice.bat 25 Dec 2003 19:15:01 -0000 1.9
@@ -16,7 +16,12 @@
if not "%XINDICE_HOME%" == "" goto gotXindiceHome
:: ----- Use the location of this script
set XINDICE_HOME=%~dp0.
-if exist "%XINDICE_HOME%\dist" goto gotXindiceHome
+if not exist "%XINDICE_HOME%\dist" goto noXindiceHome
+echo WARNING: The environment variable XINDICE_HOME is not set.
+echo defaulting to %XINDICE_HOME%.
+goto gotXindiceHome
+
+:noXindiceHome
echo You must set XINDICE_HOME to point at your Xindice installation
goto cleanup
:gotXindiceHome
1.7 +31 -10 xml-xindice/xindice.sh
Index: xindice.sh
===================================================================
RCS file: /home/cvs/xml-xindice/xindice.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xindice.sh 12 Dec 2003 15:39:40 -0000 1.6
+++ xindice.sh 25 Dec 2003 19:15:01 -0000 1.7
@@ -35,8 +35,21 @@
shift
ARGS="$*"
-# ----- Verify and Set Required Environment Variables
-------------------------
+# ----- 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
+
+
+# ----- 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
@@ -76,12 +89,23 @@
fi
fi
+
# ----- Set Classpath
----------------------------------------------------------
-for i in `ls $XINDICE_HOME/java/lib/*.jar` ; do CP=$CP:$i ; export CP ; done
-for i in `ls $XINDICE_HOME/tools/jetty/lib/*.jar` ; do CP=$CP:$i ; export CP
; done
+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
+if $cygwin; then
+ JAVACMD=`cygpath --path --windows "$JAVACMD"`
+ CP=`cygpath --path --windows "$CP"`
+ JETTY_CONFIG=`cygpath --path --windows "$JETTY_CONFIG"`
+ JETTY_WEBAPP=`cygpath --path --windows "$JETTY_WEBAPP"`
+ XINDICE_HOME=`cygpath --path --windows "$XINDICE_HOME"`
+fi
case "$ACTION" in
start)
@@ -99,15 +123,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 $XINDICE_HOME/tools/jetty/conf/main.xml" >>
$XINDICE_HOME/logs/xindice.out 2>&1 &
-
-
+ 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 &
+
echo $! > $XINDICE_PID
echo "Xindice is running with PID `cat $XINDICE_PID`"
;;
debug)
- $JAVA_HOME/bin/java $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 $XINDICE_HOME/tools/jetty/conf/main.xml
$XINDICE_HOME/tools/jetty/conf/admin.xml >> $XINDICE_HOME/logs/xindice.out 2>&1
+ $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
;;
stop)
@@ -125,12 +148,10 @@
fi
;;
-
*)
usage
;;
esac
exit 0
-
