You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by gg...@apache.org on 2014/03/26 03:50:04 UTC
svn commit: r1581654 - in /xalan: java/branches/xalan-j_2_7_1_maint/
java/branches/xalan-j_2_7_1_maint/lib/
java/branches/xalan-j_2_7_1_maint/lib/endorsed/ test/branches/xalan-j_2_7_x/
Author: ggregory
Date: Wed Mar 26 02:50:04 2014
New Revision: 1581654
URL: http://svn.apache.org/r1581654
Log:
Allow the build to work on other JDK versions than 1.3 because 1.3 crashes when doing a full build. Sets the compiler source and target to 1.3. In this commit, the xercesImpl and xml-apis jar files are moved to the new java/lib/endorsed folder from java/lib. This is in preparation to building with Java >= 1.4 where Xerces and XML-APIs MUST be on the endorsed path in order to be recognized.
Added:
xalan/java/branches/xalan-j_2_7_1_maint/lib/endorsed/
xalan/java/branches/xalan-j_2_7_1_maint/lib/endorsed/xercesImpl.jar (with props)
xalan/java/branches/xalan-j_2_7_1_maint/lib/endorsed/xml-apis.jar (with props)
Removed:
xalan/java/branches/xalan-j_2_7_1_maint/lib/xercesImpl.jar
xalan/java/branches/xalan-j_2_7_1_maint/lib/xml-apis.jar
Modified:
xalan/java/branches/xalan-j_2_7_1_maint/build.bat
xalan/java/branches/xalan-j_2_7_1_maint/build.sh
xalan/java/branches/xalan-j_2_7_1_maint/build.xml
xalan/test/branches/xalan-j_2_7_x/build.bat
xalan/test/branches/xalan-j_2_7_x/build.sh
xalan/test/branches/xalan-j_2_7_x/build.xml
Modified: xalan/java/branches/xalan-j_2_7_1_maint/build.bat
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/build.bat?rev=1581654&r1=1581653&r2=1581654&view=diff
==============================================================================
--- xalan/java/branches/xalan-j_2_7_1_maint/build.bat (original)
+++ xalan/java/branches/xalan-j_2_7_1_maint/build.bat Wed Mar 26 02:50:04 2014
@@ -23,7 +23,7 @@ rem Setup:
rem - you should set JAVA_HOME
rem - you can set ANT_HOME if you use your own Ant install
rem - JAVA_OPTS is added to the java command line
-rem - PARSER_JAR may be set to use alternate parser (default:lib\xercesImpl.jar)
+rem - PARSER_JAR may be set to use alternate parser (default:lib\endorsed\xercesImpl.jar)
echo.
echo Xalan-J 2.x Build
echo -------------
@@ -52,9 +52,9 @@ rem Set our local vars to all start with
set _ANT_JAR=%ANT_JAR%
if "%_ANT_JAR%" == "" set _ANT_JAR=tools\ant.jar
set _PARSER_JAR=%PARSER_JAR%
-if "%_PARSER_JAR%" == "" set _PARSER_JAR=lib\xercesImpl.jar
+if "%_PARSER_JAR%" == "" set _PARSER_JAR=lib\endorsed\xercesImpl.jar
set _XML-APIS_JAR=%XML-APIS_JAR%
-if "%_XML-APIS_JAR%" == "" set _XML-APIS_JAR=lib\xml-apis.jar
+if "%_XML-APIS_JAR%" == "" set _XML-APIS_JAR=lib\endorsed\xml-apis.jar
rem Attempt to automatically add system classes to _CLASSPATH
rem Use _underscore prefix to not conflict with user's settings
Modified: xalan/java/branches/xalan-j_2_7_1_maint/build.sh
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/build.sh?rev=1581654&r1=1581653&r2=1581654&view=diff
==============================================================================
--- xalan/java/branches/xalan-j_2_7_1_maint/build.sh (original)
+++ xalan/java/branches/xalan-j_2_7_1_maint/build.sh Wed Mar 26 02:50:04 2014
@@ -39,11 +39,11 @@ if [ "$ANT_JAR" = "" ] ; then
ANT_JAR=./tools/ant.jar
fi
if [ "$PARSER_JAR" = "" ] ; then
- PARSER_JAR=./lib/xercesImpl.jar
+ PARSER_JAR=./lib/endorsed/xercesImpl.jar
fi
if [ "$XML_APIS_JAR" = "" ] ; then
- XML_APIS_JAR=./lib/xml-apis.jar
+ XML_APIS_JAR=./lib/endorsed/xml-apis.jar
fi
# Use _underscore prefix to not conflict with user's settings
Modified: xalan/java/branches/xalan-j_2_7_1_maint/build.xml
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/build.xml?rev=1581654&r1=1581653&r2=1581654&view=diff
==============================================================================
--- xalan/java/branches/xalan-j_2_7_1_maint/build.xml (original)
+++ xalan/java/branches/xalan-j_2_7_1_maint/build.xml Wed Mar 26 02:50:04 2014
@@ -84,6 +84,7 @@ $Id$
<!-- <property name="bin.dir" value="./bin"/> -->
<property name="build.dir" value="./build"/>
<property name="lib.dir" value="./lib"/>
+ <property name="endorsed.dir" value="${lib.dir}/endorsed"/>
<property name="samples.dir" value="./samples"/>
<property name="src.dir" value="./src"/>
<property name="tools.dir" value="./tools"/>
@@ -98,9 +99,9 @@ $Id$
<!-- Jars needed to run Xalan Java (Interpretive, Compiled, or both) -->
<property name="xmlapis.jar.name" value="xml-apis.jar"/>
- <property name="xmlapis.jar" value="${lib.dir}/${xmlapis.jar.name}"/>
+ <property name="xmlapis.jar" value="${endorsed.dir}/${xmlapis.jar.name}"/>
<property name="parser.jar.name" value="xercesImpl.jar"/>
- <property name="parser.jar" value="${lib.dir}/${parser.jar.name}"/>
+ <property name="parser.jar" value="${endorsed.dir}/${parser.jar.name}"/>
<property name="bcel.jar.name" value="BCEL.jar"/>
<property name="bcel.jar" value="${lib.dir}/${bcel.jar.name}"/>
<property name="runtime.jar.name" value="runtime.jar"/>
Added: xalan/java/branches/xalan-j_2_7_1_maint/lib/endorsed/xercesImpl.jar
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/lib/endorsed/xercesImpl.jar?rev=1581654&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xalan/java/branches/xalan-j_2_7_1_maint/lib/endorsed/xercesImpl.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: xalan/java/branches/xalan-j_2_7_1_maint/lib/endorsed/xml-apis.jar
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/lib/endorsed/xml-apis.jar?rev=1581654&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xalan/java/branches/xalan-j_2_7_1_maint/lib/endorsed/xml-apis.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: xalan/test/branches/xalan-j_2_7_x/build.bat
URL: http://svn.apache.org/viewvc/xalan/test/branches/xalan-j_2_7_x/build.bat?rev=1581654&r1=1581653&r2=1581654&view=diff
==============================================================================
--- xalan/test/branches/xalan-j_2_7_x/build.bat (original)
+++ xalan/test/branches/xalan-j_2_7_x/build.bat Wed Mar 26 02:50:04 2014
@@ -59,7 +59,7 @@ if not "%OS%"=="Windows_NT" goto win9xSt
:winNTStart
@setlocal
-set classpath=..\java\tools\ant.jar;..\java\lib\xercesImpl.jar;..\java\lib\xalan.jar;..\java\lib\serializer.jar;..\java\lib\xml-apis.jar;%CLASSPATH%
+set classpath=..\java\tools\ant.jar;..\java\lib\endorsed\xercesImpl.jar;..\java\lib\xalan.jar;..\java\lib\serializer.jar;..\java\lib\endorsed\xml-apis.jar;%CLASSPATH%
rem On NT/2K grab all arguments at once
Modified: xalan/test/branches/xalan-j_2_7_x/build.sh
URL: http://svn.apache.org/viewvc/xalan/test/branches/xalan-j_2_7_x/build.sh?rev=1581654&r1=1581653&r2=1581654&view=diff
==============================================================================
--- xalan/test/branches/xalan-j_2_7_x/build.sh (original)
+++ xalan/test/branches/xalan-j_2_7_x/build.sh Wed Mar 26 02:50:04 2014
@@ -33,11 +33,11 @@ uname | grep WIN && CLS_PATH_SEP=\;
# If PARSER_JAR is not set, default to xercesImpl.jar
if [ "$PARSER_JAR" = "" ] ; then
- PARSER_JAR=../java/lib/xercesImpl.jar
+ PARSER_JAR=../java/lib/endorsed/xercesImpl.jar
fi
if [ "$XML_APIS_JAR" = "" ]; then
- XML_APIS_JAR=../java/lib/xml-apis.jar
+ XML_APIS_JAR=../java/lib/endorsed/xml-apis.jar
fi
if [ "$SERIALIZER_JAR" = "" ]; then
Modified: xalan/test/branches/xalan-j_2_7_x/build.xml
URL: http://svn.apache.org/viewvc/xalan/test/branches/xalan-j_2_7_x/build.xml?rev=1581654&r1=1581653&r2=1581654&view=diff
==============================================================================
--- xalan/test/branches/xalan-j_2_7_x/build.xml (original)
+++ xalan/test/branches/xalan-j_2_7_x/build.xml Wed Mar 26 02:50:04 2014
@@ -92,6 +92,7 @@ dependencies - users must manually 'buil
<!-- Specific locations related to Xalan code, which should be in a sister tree to us -->
<property name="xalan.relpath" value="../java"/>
<property name="xalan.lib.dir" value="${xalan.relpath}/lib"/>
+ <property name="xalan.endorsed.dir" value="${xalan.lib.dir}/endorsed"/>
<property name="xalan.tools.dir" value="${xalan.relpath}/tools"/>
<property name="xalan.build.dir" value="${xalan.relpath}/build"/>
<property name="xalan.xdocs.dir" value="${xalan.relpath}/xdocs"/>
@@ -103,8 +104,8 @@ dependencies - users must manually 'buil
value="${xalan.build.dir}/xalan-unbundled.jar"/>
<property name="xsltc.jar" value="${xalan.build.dir}/xsltc.jar"/>
<property name="ser.jar" value="${xalan.build.dir}/serializer.jar"/>
- <property name="xml-apis.jar" value="${xalan.lib.dir}/xml-apis.jar"/>
- <property name="parserjar" value="${xalan.lib.dir}/xercesImpl.jar"/>
+ <property name="xml-apis.jar" value="${xalan.endorsed.dir}/xml-apis.jar"/>
+ <property name="parserjar" value="${xalan.endorsed.dir}/xercesImpl.jar"/>
<property name="bcel.jar" value="${xalan.lib.dir}/BCEL.jar"/>
<!-- JTidy is used by the XSLTC comparator -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org