vgritsenko 2004/01/28 06:27:28
Modified: bin xindice.bat xindice.war.bat
Log:
Add LOGLEVEL variable
Revision Changes Path
1.12 +7 -5 xml-xindice/bin/xindice.bat
Index: xindice.bat
===================================================================
RCS file: /home/cvs/xml-xindice/bin/xindice.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xindice.bat 22 Jan 2004 20:54:09 -0000 1.11
+++ xindice.bat 28 Jan 2004 14:27:27 -0000 1.12
@@ -31,7 +31,6 @@
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%
@@ -39,6 +38,8 @@
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 _LOGLEVEL=%LOGLEVEL%
+if "%_LOGLEVEL%" == "" set _LOGLEVEL=INFO
set _JAVACMD=%JAVACMD%
if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
@@ -46,8 +47,8 @@
:: ----- 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
+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
------------------------------------------
@@ -64,7 +65,7 @@
:: ----- 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%
+%_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
-------------------------------------------------------------------
@@ -78,6 +79,7 @@
set _XINDICE_DB_HOME=
set _XINDICE_CONFIG=
set _LOGGER=
+set _LOGLEVEL=
set _JAVACMD=
set _CL=
set LOCALCLASSPATH=
1.4 +4 -2 xml-xindice/bin/xindice.war.bat
Index: xindice.war.bat
===================================================================
RCS file: /home/cvs/xml-xindice/bin/xindice.war.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xindice.war.bat 22 Jan 2004 20:54:09 -0000 1.3
+++ xindice.war.bat 28 Jan 2004 14:27:27 -0000 1.4
@@ -31,7 +31,6 @@
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%
@@ -39,6 +38,8 @@
if "%_XINDICE_CONFIG%" == "" set _XINDICE_CONFIG=%_XINDICE_HOME%\system.xml
set _LOGGER=%LOGGER%
if "%_LOGGER%" == "" set _LOGGER=org.apache.commons.logging.impl.SimpleLog
+set _LOGLEVEL=%LOGLEVEL%
+if "%_LOGLEVEL%" == "" set _LOGLEVEL=INFO
set _JAVACMD=%JAVACMD%
if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
@@ -77,6 +78,7 @@
set _XINDICE_DB_HOME=
set _XINDICE_CONFIG=
set _LOGGER=
+set _LOGLEVEL=
set _JAVACMD=
set _CL=
set LOCALCLASSPATH=
