vgritsenko 2004/01/28 06:26:10
Modified: . xindice.bat
Log:
win16 support
Revision Changes Path
1.15 +55 -26 xml-xindice/xindice.bat
Index: xindice.bat
===================================================================
RCS file: /home/cvs/xml-xindice/xindice.bat,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xindice.bat 16 Jan 2004 13:42:59 -0000 1.14
+++ xindice.bat 28 Jan 2004 14:26:10 -0000 1.15
@@ -1,7 +1,9 @@
@echo off
[EMAIL PROTECTED]
+if not "%OS%"=="Windows_NT" goto start
[EMAIL PROTECTED]
+:start
::
-----------------------------------------------------------------------------
-:: Xindice Win32 Shell Script
+:: Xindice Win32/Win16 Shell Script
::
:: $Id$
::
-----------------------------------------------------------------------------
@@ -28,52 +30,64 @@
goto end
:gotJavaHome
-if not "%XINDICE_HOME%" == "" goto gotXindiceHome
+set _XINDICE_HOME=%XINDICE_HOME%
+if not "%_XINDICE_HOME%" == "" goto gotXindiceHome
:: ----- Use the location of this script
-set XINDICE_HOME=%~dp0.
-if not exist "%XINDICE_HOME%\dist" goto noXindiceHome
+set _XINDICE_HOME=%~dp0.
+if not exist "%_XINDICE_HOME%\dist\xindice*.jar" goto noXindiceHome
echo WARNING: The environment variable XINDICE_HOME is not set.
-echo defaulting to %XINDICE_HOME%
+echo Defaulting to %_XINDICE_HOME%
goto gotXindiceHome
:noXindiceHome
echo ERROR: You must set XINDICE_HOME to point at your
-echo Xindice installation directory
+echo Xindice WEB-INF directory.
goto end
:gotXindiceHome
-echo Using Xindice home: %XINDICE_HOME%
+
+set _XINDICE_DB_HOME=%XINDICE_DB_HOME%
+if "%_XINDICE_DB_HOME%" == "" set _XINDICE_DB_HOME=%_XINDICE_HOME%
+set _XINDICE_CONFIG=%XINDICE_CONFIG%
+if "%_XINDICE_CONFIG%" == "" set
_XINDICE_CONFIG=%_XINDICE_HOME%\config\system.xml
+set _JAVACMD=%JAVACMD%
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
:: ----- Set Up The Classpath
--------------------------------------------------
set LOCALCLASSPATH=
-for %%i in ("%XINDICE_HOME%\java\lib\*.jar") do call
%XINDICE_HOME%\bin\lcp.bat %%i
-for %%i in ("%XINDICE_HOME%\tools\jetty\lib\*.jar") do call
%XINDICE_HOME%\bin\lcp.bat %%i
+for %%i in ("%_XINDICE_HOME%\java\lib\*.jar") do call
"%_XINDICE_HOME%\bin\lcp.bat" %%i
+for %%i in ("%_XINDICE_HOME%\tools\jetty\lib\*.jar") do call
"%_XINDICE_HOME%\bin\lcp.bat" %%i
:: ----- Check System Properties
-----------------------------------------------
-set EXEC=start "Xindice" /D. /MAX
+set _EXEC=start "Xindice" /D. /MAX
-if not "%JAVA_OPTIONS%" == "" goto gotOptions
-set JAVA_OPTIONS=-Xms64m -Xmx128m
+set _JAVA_OPTIONS=%JAVA_OPTIONS%
+if not "%_JAVA_OPTIONS%" == "" goto gotOptions
+set _JAVA_OPTIONS=-Xms64m -Xmx128m
:gotOptions
-if not "%JETTY_PORT%" == "" goto gotPort
-set JETTY_PORT=8888
+set _JETTY_PORT=%JETTY_PORT%
+if not "%_JETTY_PORT%" == "" goto gotPort
+set _JETTY_PORT=8888
:gotPort
-if not "%JETTY_ADMIN_PORT%" == "" goto gotAdminPort
-set JETTY_ADMIN_PORT=8889
+set _JETTY_ADMIN_PORT=%JETTY_ADMIN_PORT%
+if not "%_JETTY_ADMIN_PORT%" == "" goto gotAdminPort
+set _JETTY_ADMIN_PORT=8889
:gotAdminPort
-if not "%JETTY_WEBAPP%" == "" goto gotWebapp
-set JETTY_WEBAPP=%XINDICE_HOME%\dist\xindice-1.1b4-dev.war
+set _JETTY_WEBAPP=%JETTY_WEBAPP%
+if not "%_JETTY_WEBAPP%" == "" goto gotWebapp
+set _JETTY_WEBAPP=%_XINDICE_HOME%\dist\xindice-1.1b4-dev.war
:gotWebapp
-if not "%JAVA_DEBUG_PORT%" == "" goto gotDebugPort
-set JAVA_DEBUG_PORT=8000
+set _JAVA_DEBUG_PORT=%JAVA_DEBUG_PORT%
+if not "%_JAVA_DEBUG_PORT%" == "" goto gotDebugPort
+set _JAVA_DEBUG_PORT=8000
:gotDebugPort
@@ -93,23 +107,38 @@
:: ----- Start Servlet
---------------------------------------------------------
:doStart
-%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
+%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=build\endorsed -Dxindice.home="%_XINDICE_HOME%"
-Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%"
-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_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
+%_JAVACMD% %_JAVA_OPTIONS% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=build\endorsed -Dxindice.home="%_XINDICE_HOME%"
-Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%"
-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_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
+%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -Xdebug
-Xrunjdwp:transport=dt_socket,address=%_JAVA_DEBUG_PORT%,server=y,suspend=n
-classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=build\endorsed
-Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%"
-Dxindice.configuration="%_XINDICE_CONFIG%" -Dwebapp=%_JETTY_WEBAPP%
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT%
-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-Dorg.apache.commons.logging.simplelog.defaultlog=DEBUG
org.mortbay.jetty.Server tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
goto end
:: ----- End
-------------------------------------------------------------------
:end
[EMAIL PROTECTED]
+if not "%OS%"=="Windows_NT" goto win16
[EMAIL PROTECTED]
+goto mainEnd
+:win16
+set _XINDICE_HOME=
+set _XINDICE_DB_HOME=
+set _XINDICE_CONFIG=
+set _JAVACMD=
+set _EXEC=
+set _JAVA_OPTIONS=
+set _JETTY_PORT=
+set _JETTY_ADMIN_PORT=
+set _JETTY_WEBAPP=
+set _JAVA_DEBUG_PORT=
+set LOCALCLASSPATH=
+:mainEnd
