vgritsenko 2004/01/22 12:54:09
Modified: bin lcp.bat xindice.war.bat xindice.bat
Log:
Rewrite bin/xindice.bat. Add Win16 support to bin/xindice.war.bat.
Thanks to Neil Cook for the provided patch.
Revision Changes Path
1.4 +1 -1 xml-xindice/bin/lcp.bat
Index: lcp.bat
===================================================================
RCS file: /home/cvs/xml-xindice/bin/lcp.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lcp.bat 17 Jun 2003 03:26:36 -0000 1.3
+++ lcp.bat 22 Jan 2004 20:54:09 -0000 1.4
@@ -13,4 +13,4 @@
:gotAllArgs
set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
-
+set _CLASSPATHCOMPONENT=
1.3 +34 -16 xml-xindice/bin/xindice.war.bat
Index: xindice.war.bat
===================================================================
RCS file: /home/cvs/xml-xindice/bin/xindice.war.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xindice.war.bat 16 Jan 2004 13:46:47 -0000 1.2
+++ xindice.war.bat 22 Jan 2004 20:54:09 -0000 1.3
@@ -1,7 +1,9 @@
@echo off
-@setLocal
+if not "%OS%"=="Windows_NT" goto start
+@setlocal
+:start
::
-----------------------------------------------------------------------------
-:: Xindice Command Line Tool Win32 Shell Script for WAR distribution
+:: Xindice Command Line Tool Win32/Win16 Script for WAR distribution
::
:: $Id$
::
-----------------------------------------------------------------------------
@@ -14,12 +16,13 @@
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%\system.xml" 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
@@ -28,27 +31,31 @@
goto end
:gotXindiceHome
-echo Using Xindice home: %XINDICE_HOME%
+echo Using Xindice home: %_XINDICE_HOME%
-if "%XINDICE_DB_HOME%" == "" set XINDICE_DB_HOME=%XINDICE_HOME%
-if "%XINDICE_CONFIG%" == "" set XINDICE_CONFIG=%XINDICE_HOME%\system.xml
-if "%LOGGER%" == "" set LOGGER=org.apache.commons.logging.impl.SimpleLog
-if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
+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%\system.xml
+set _LOGGER=%LOGGER%
+if "%_LOGGER%" == "" set _LOGGER=org.apache.commons.logging.impl.SimpleLog
+set _JAVACMD=%JAVACMD%
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
:: ----- Set Up The Classpath
--------------------------------------------------
set LOCALCLASSPATH=%XINDICE_HOME%\classes
-for %%i in (%XINDICE_HOME%\lib\*.jar) do call %XINDICE_HOME%\lcp.bat %%i
+for %%i in (%_XINDICE_HOME%\lib\*.jar) do call %_XINDICE_HOME%\lcp.bat %%i
:: ----- Check Command Line Arguments
------------------------------------------
:runXindice
-set CL=
+set _CL=
:LOOP
if "%1"=="" goto DONE
-set CL=%CL% %1
+set _CL=%_CL% %1
shift
goto LOOP
:DONE
@@ -56,10 +63,21 @@
:: ----- Start Command Line Tool
-----------------------------------------------
-%JAVACMD% -Xms16m -Xmx128m -Djava.endorsed.dirs=%XINDICE_HOME%\lib
-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%
-Dcmd.home=%XINDICE_HOME% -classpath %LOCALCLASSPATH%
org.apache.xindice.tools.XMLTools %CL%
+%_JAVACMD% -Xms16m -Xmx128m -Djava.endorsed.dirs=%_XINDICE_HOME%\lib
-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%
-Dcmd.home=%_XINDICE_HOME% -classpath %LOCALCLASSPATH%
org.apache.xindice.tools.XMLTools %_CL%
:: ----- End
-------------------------------------------------------------------
:end
+if not "%OS%"=="Windows_NT" goto win16
@endlocal
+goto mainEnd
+:win16
+set _XINDICE_HOME=
+set _XINDICE_DB_HOME=
+set _XINDICE_CONFIG=
+set _LOGGER=
+set _JAVACMD=
+set _CL=
+set LOCALCLASSPATH=
+:mainEnd
1.11 +62 -54 xml-xindice/bin/xindice.bat
Index: xindice.bat
===================================================================
RCS file: /home/cvs/xml-xindice/bin/xindice.bat,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xindice.bat 15 Jan 2004 13:32:18 -0000 1.10
+++ xindice.bat 22 Jan 2004 20:54:09 -0000 1.11
@@ -1,76 +1,84 @@
@echo off
-
-if not "%OS%"=="Windows_NT" goto win9xStart
-:winNTStart
+if not "%OS%"=="Windows_NT" goto start
@setlocal
-:win9xStart
-
-rem find JAVA_HOME
-if not "%JAVA_HOME%"=="" goto checkXindiceHome
-echo JAVA_HOME is not set and ant could not be located. Please set JAVA_HOME.
+:start
+::
-----------------------------------------------------------------------------
+:: Xindice Command Line Tool Win32/Win16 Script for WAR distribution
+::
+:: $Id$
+::
-----------------------------------------------------------------------------
+
+:: ----- Verify and Set Required Environment Variables
-------------------------
+
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo ERROR: You must set JAVA_HOME to point at your Java
+echo Development Kit installation.
goto end
+:gotJavaHome
-:checkXindiceHome
-rem find XINDICE_HOME
-if not "%XINDICE_HOME%"=="" goto checkJava
-
-rem check for Xindice in "Program Files" on the system drive
-if not exist "%SystemDrive%\Program Files\Xindice" goto checkSystemDrive
-set XINDICE_HOME=%SystemDrive%\Program Files\Xindice
-goto checkJava
-
-:checkSystemDrive
-rem check for Xindice in the root directory of the system drive
-if not exist "%SystemDrive%\Xindice" goto checkWorkXindice
-set XINDICE_HOME=%SystemDrive%\Xindice
-goto checkJava
-
-:checkWorkXindice
-rem check for Xindice in the work directory on the system drive
-if not exist "%SystemDrive%\work\Xindice" goto checkCurrent
-set XINDICE_HOME=%SystemDrive%\work\Xindice
-goto checkJava
-
-:checkCurrent
-if exist ".\config" set XINDICE_HOME=.
-echo %XINDICE_HOME%
-goto checkJava
+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\xindice*.jar" goto noXindiceHome
+echo WARNING: The environment variable XINDICE_HOME is not set.
+echo Defaulting to %_XINDICE_HOME%
+goto gotXindiceHome
:noXindiceHome
-echo XINDICE_HOME is not set and ant could not be located. Please set
XINDICE_HOME.
+echo ERROR: You must set XINDICE_HOME to point at your
+echo Xindice WEB-INF directory.
goto end
-:checkJava
-if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
-if "%XINDICE_DB_HOME%" == "" set XINDICE_DB_HOME=%XINDICE_HOME%
-
-set LOCALCLASSPATH=%CLASSPATH%;%ANT_HOME%\config
-for %%i in (%XINDICE_HOME%\dist\xindice*.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
-
-if "%JAVA_HOME%" == "" goto runXindice
-if exist %JAVA_HOME%\lib\tools.jar call %XINDICE_HOME%\bin\lcp.bat
%JAVA_HOME%\lib\tools.jar
-if exist %JAVA_HOME%\lib\classes.zip call %XINDICE_HOME%\bin\lcp.bat
%JAVA_HOME%\lib\classes.zip
+: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 _LOGGER=%LOGGER%
+if "%_LOGGER%" == "" set _LOGGER=org.apache.commons.logging.impl.SimpleLog
+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%\dist\xindice*.jar) do call
%_XINDICE_HOME%\bin\lcp.bat %%i
+
+
+:: ----- Check Command Line Arguments
------------------------------------------
:runXindice
-set CL=
+set _CL=
:LOOP
if "%1"=="" goto DONE
-set CL=%CL% %1
+set _CL=%_CL% %1
shift
goto LOOP
:DONE
-set LOGGER=org.apache.commons.logging.impl.SimpleLog
-set LOGLEVEL=debug
-%JAVACMD% -Xms16m -Xmx128m
-Djava.endorsed.dirs=%XINDICE_HOME%\build\endorsed
-Dxindice.home=%XINDICE_HOME% -Dxindice.db.home=%XINDICE_DB_HOME%
-Dorg.apache.commons.logging.Log=%LOGGER%
-Dorg.apache.commons.logging.simplelog.defaultlog=%LOGLEVEL%
-Dcmd.home=%XINDICE_HOME%\bin -classpath %LOCALCLASSPATH%
org.apache.xindice.tools.XMLTools %CL%
+
+:: ----- Start Command Line Tool
-----------------------------------------------
+
+%_JAVACMD% -Xms16m -Xmx128m -Djava.endorsed.dirs=%_XINDICE_HOME%\java\lib
-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%
-Dcmd.home=%_XINDICE_HOME% -classpath %LOCALCLASSPATH%
org.apache.xindice.tools.XMLTools %_CL%
+
+
+:: ----- End
-------------------------------------------------------------------
:end
-if not "%OS%"=="Windows_NT" goto win9xEnd
-:winNTend
+if not "%OS%"=="Windows_NT" goto win16
@endlocal
goto mainEnd
-:win9xEnd
-set JAVACMD=
+:win16
+set _XINDICE_HOME=
+set _XINDICE_DB_HOME=
+set _XINDICE_CONFIG=
+set _LOGGER=
+set _JAVACMD=
+set _CL=
set LOCALCLASSPATH=
:mainEnd
|
Try Searching:
servers, voip, java, networking, microsoft ...
|
|
|
| 
