vgritsenko 2003/12/11 03:44:36
Modified: . build.bat build.sh build.xml
Log:
Add endorsed lib to java parameters, same as in xindice.bat
(yes, I know that lib/endorsed does not exist)
Revision Changes Path
1.4 +2 -2 xml-xindice/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xindice/build.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.bat 7 Aug 2003 17:47:28 -0000 1.3
+++ build.bat 11 Dec 2003 11:44:36 -0000 1.4
@@ -30,7 +30,7 @@
rem ----- Set endorsed library path to be used by Ant
set OLD_ANT_OPTS=%ANT_OPTS%
-call %ANT_HOME%\bin\ant -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3
%4 %5 %6 %7 %8 %9
+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
rem ----- Restore ANT_OPTS
set ANT_OPTS=%OLD_ANT_OPTS%
1.5 +4 -1 xml-xindice/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xindice/build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.sh 7 Aug 2003 17:47:28 -0000 1.4
+++ build.sh 11 Dec 2003 11:44:36 -0000 1.5
@@ -18,6 +18,9 @@
export CP
unset CLASSPATH
+ANT_OPTS=-Djava.endorsed.dirs=lib/endorsed
+export ANT_OPTS
+
$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger $@
CLASSPATH=$CP
1.61 +6 -1 xml-xindice/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/build.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- build.xml 5 Sep 2003 02:28:25 -0000 1.60
+++ build.xml 11 Dec 2003 11:44:36 -0000 1.61
@@ -136,6 +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="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-unit"/>
<jvmarg
value="-Dxindice.configuration=${basedir}/config/system.xml"/>
@@ -156,6 +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="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-binary"/>
<jvmarg
value="-Dxindice.configuration=${basedir}/config/system.xml"/>
@@ -176,6 +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="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-embed"/>
<jvmarg
value="-Dxindice.configuration=${basedir}/config/system.xml"/>
@@ -200,6 +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="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dtest.xmlrpc.hostport=${test.xmlrpc.hostport}"/>
<jvmarg
value="-Dtest.xmlrpc.service-location=${test.xmlrpc.service-location}"/>
@@ -221,6 +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="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-managed"/>
<jvmarg
value="-Dxindice.configuration=${basedir}/config/system.xml"/>
