vgritsenko 2003/12/12 07:39:40
Modified: . build.bat build.sh build.xml xindice.bat xindice.sh
Log:
Create endorsed lib in build/endorsed, and use it while building,
running, or testing.
Revision Changes Path
1.5 +9 -2 xml-xindice/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xindice/build.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.bat 11 Dec 2003 11:44:36 -0000 1.4
+++ build.bat 12 Dec 2003 15:39:40 -0000 1.5
@@ -10,6 +10,13 @@
if not exist "tools\lib\xalan*.jar" copy java\lib\xalan*.jar tools\lib
if not exist "tools\lib\xml-api*.jar" copy java\lib\xml-api*.jar tools\lib
+rem ----- Create endorsed lib for the Java
------------------------
+if not exist "build" mkdir build
+if not exist "build\endorsed" mkdir build\endorsed
+if not exist "build\endorsed\xerces*.jar" copy java\lib\xerces*.jar
build\endorsed
+if not exist "tools\endorsed\xalan*.jar" copy java\lib\xalan*.jar
build\endorsed
+if not exist "tools\endorsed\xml-api*.jar" copy java\lib\xml-api*.jar
build\endorsed
+
rem ----- Verify and Set Required Environment Variables
------------------------
rem ----- Ignore system CLASSPATH variable
@@ -30,7 +37,7 @@
rem ----- Set endorsed library path to be used by Ant
set OLD_ANT_OPTS=%ANT_OPTS%
-call %ANT_HOME%\bin\ant -Djava.endorsed.dirs=lib\endorsed -logger
org.apache.tools.ant.NoBannerLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %ANT_HOME%\bin\ant -Djava.endorsed.dirs=build\endorsed -logger
org.apache.tools.ant.NoBannerLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
rem ----- Restore ANT_OPTS
set ANT_OPTS=%OLD_ANT_OPTS%
1.6 +14 -2 xml-xindice/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xindice/build.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.sh 11 Dec 2003 11:44:36 -0000 1.5
+++ build.sh 12 Dec 2003 15:39:40 -0000 1.6
@@ -9,6 +9,18 @@
cp java/lib/xerces*.jar tools/lib
cp java/lib/xml-api*.jar tools/lib
+if [ -f build ]
+then
+ mkdir build
+fi
+if [ -f build/endorsed ]
+then
+ mkdir build/endorsed
+fi
+cp java/lib/xalan*.jar build/endorsed
+cp java/lib/xerces*.jar build/endorsed
+cp java/lib/xml-api*.jar build/endorsed
+
chmod u+x ./tools/bin/antRun
chmod u+x ./tools/bin/ant
@@ -18,7 +30,7 @@
export CP
unset CLASSPATH
-ANT_OPTS=-Djava.endorsed.dirs=lib/endorsed
+ANT_OPTS=-Djava.endorsed.dirs=build/endorsed
export ANT_OPTS
$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger $@
1.62 +6 -6 xml-xindice/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/build.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- build.xml 11 Dec 2003 11:44:36 -0000 1.61
+++ build.xml 12 Dec 2003 15:39:40 -0000 1.62
@@ -136,7 +136,7 @@
<target name="test-unit" depends="test-build, test-validate">
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <jvmarg value="-Djava.endorsed.dirs=${basedir}/lib/endorsed"/>
+ <jvmarg value="-Djava.endorsed.dirs=${basedir}/build/endorsed"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-unit"/>
<jvmarg
value="-Dxindice.configuration=${basedir}/config/system.xml"/>
@@ -157,7 +157,7 @@
<target name="test-embed-binary" depends="test-build, test-validate">
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <jvmarg value="-Djava.endorsed.dirs=${basedir}/lib/endorsed"/>
+ <jvmarg value="-Djava.endorsed.dirs=${basedir}/build/endorsed"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-binary"/>
<jvmarg
value="-Dxindice.configuration=${basedir}/config/system.xml"/>
@@ -178,7 +178,7 @@
<target name="test-integration-embed" depends="test-build,
test-validate">
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <jvmarg value="-Djava.endorsed.dirs=${basedir}/lib/endorsed"/>
+ <jvmarg value="-Djava.endorsed.dirs=${basedir}/build/endorsed"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-embed"/>
<jvmarg
value="-Dxindice.configuration=${basedir}/config/system.xml"/>
@@ -203,7 +203,7 @@
<echo message="XML-RPC service
location='${test.xmlrpc.service-location}'"/>
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <jvmarg value="-Djava.endorsed.dirs=${basedir}/lib/endorsed"/>
+ <jvmarg value="-Djava.endorsed.dirs=${basedir}/build/endorsed"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dtest.xmlrpc.hostport=${test.xmlrpc.hostport}"/>
<jvmarg
value="-Dtest.xmlrpc.service-location=${test.xmlrpc.service-location}"/>
@@ -225,7 +225,7 @@
<target name="test-integration-managed" depends="test-build,
test-validate">
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <jvmarg value="-Djava.endorsed.dirs=${basedir}/lib/endorsed"/>
+ <jvmarg value="-Djava.endorsed.dirs=${basedir}/build/endorsed"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-managed"/>
<jvmarg
value="-Dxindice.configuration=${basedir}/config/system.xml"/>
1.7 +4 -4 xml-xindice/xindice.bat
Index: xindice.bat
===================================================================
RCS file: /home/cvs/xml-xindice/xindice.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xindice.bat 11 Dec 2003 11:40:32 -0000 1.6
+++ xindice.bat 12 Dec 2003 15:39:40 -0000 1.7
@@ -62,19 +62,19 @@
:: ----- Start Servlet
---------------------------------------------------------
:doStart
-%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=lib\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% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -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
goto end
:: ----- Run Servlet
-----------------------------------------------------------
:doRun
-%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %LOCALCLASSPATH%
-Djava.endorsed.dirs=lib\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
+%JAVA_HOME%\bin\java.exe %JAVA_OPT% -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
goto end
:: ----- Servlet Debug
---------------------------------------------------------
:doDebug
-%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -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=lib\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% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -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
goto end
1.6 +3 -3 xml-xindice/xindice.sh
Index: xindice.sh
===================================================================
RCS file: /home/cvs/xml-xindice/xindice.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xindice.sh 11 Dec 2003 11:40:32 -0000 1.5
+++ xindice.sh 12 Dec 2003 15:39:40 -0000 1.6
@@ -99,7 +99,7 @@
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=lib/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 $XINDICE_HOME/tools/jetty/conf/main.xml" >>
$XINDICE_HOME/logs/xindice.out 2>&1 &
echo $! > $XINDICE_PID
@@ -107,7 +107,7 @@
;;
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=lib/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
+ $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
;;
stop)
