yoavs 2004/06/16 11:04:39
Modified: catalina build.xml
catalina/src/bin launcher.properties
catalina/src/share/org/apache/catalina/startup
TldConfig.java
tester build.xml
webapps/docs changelog.xml class-loader-howto.xml
Log:
Bugzilla 29368 done: replaced references to xmlParserAPIs.jar with xmls-apis.jar.
Revision Changes Path
1.61 +7 -7 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- build.xml 27 Apr 2004 05:51:20 -0000 1.60
+++ build.xml 16 Jun 2004 18:04:38 -0000 1.61
@@ -72,7 +72,7 @@
<pathelement location="${regexp.jar}"/>
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${xercesImpl.jar}"/>
- <pathelement location="${xmlParserAPIs.jar}"/>
+ <pathelement location="${xml-apis.jar}"/>
<pathelement location="${classes.dir}"/>
</path>
@@ -103,7 +103,7 @@
<pathelement location="${regexp.jar}"/>
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${xercesImpl.jar}"/>
- <pathelement location="${xmlParserAPIs.jar}"/>
+ <pathelement location="${xml-apis.jar}"/>
<pathelement location="${classes.dir}"/>
<pathelement location="${catalina.build}/tests"/>
</path>
@@ -167,9 +167,9 @@
<condition property="jaxp.present">
<and>
<available classname="javax.xml.parsers.SAXParser"
- classpath="${xmlParserAPIs.jar}" />
+ classpath="${xml-apis.jar}" />
<available classname="org.xml.sax.ContentHandler"
- classpath="${xmlParserAPIs.jar}" />
+ classpath="${xml-apis.jar}" />
</and>
</condition>
<condition property="javamail.present">
@@ -252,11 +252,11 @@
<available property="servlet-api.jar.present" file="${servlet-api.jar}" />
<available property="tomcat-util.jar.present" file="${tomcat-util.jar}" />
<available property="xercesImpl.jar.present" file="${xercesImpl.jar}"/>
- <available property="xmlParserAPIs.jar.present" file="${xmlParserAPIs.jar}"/>
+ <available property="xml-apis.jar.present" file="${xml-apis.jar}"/>
<condition property="xerces2.jars.present">
<and>
<equals arg1="${xercesImpl.jar.present}" arg2="true"/>
- <equals arg1="${xmlParserAPIs.jar.present}" arg2="true"/>
+ <equals arg1="${xml-apis.jar.present}" arg2="true"/>
</and>
</condition>
@@ -523,7 +523,7 @@
</target>
<target name="copy-xerces2.jars">
<copy todir="${catalina.build}/common/endorsed" file="${xercesImpl.jar}"/>
- <copy todir="${catalina.build}/common/endorsed" file="${xmlParserAPIs.jar}"/>
+ <copy todir="${catalina.build}/common/endorsed" file="${xml-apis.jar}"/>
</target>
1.3 +1 -1 jakarta-tomcat-catalina/catalina/src/bin/launcher.properties
Index: launcher.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/launcher.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- launcher.properties 26 May 2004 20:15:17 -0000 1.2
+++ launcher.properties 16 Jun 2004 18:04:38 -0000 1.3
@@ -20,4 +20,4 @@
# LauncherBootstrap class can properly resolve the files without regard to
# the current working directory.
#
-ant.class.path=../common/lib/ant.jar:../common/lib/ant-launcher.jar:../common/endorsed/xercesImpl.jar:../common/endorsed/xmlParserAPIs.jar
+ant.class.path=../common/lib/ant.jar:../common/lib/ant-launcher.jar:../common/endorsed/xercesImpl.jar:../common/endorsed/xml-apis.jar
1.39 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
Index: TldConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- TldConfig.java 26 May 2004 16:16:56 -0000 1.38
+++ TldConfig.java 16 Jun 2004 18:04:38 -0000 1.39
@@ -118,6 +118,7 @@
noTldJars.add("tomcat-coyote.jar");
noTldJars.add("xercesImpl.jar");
noTldJars.add("xmlParserAPIs.jar");
+ noTldJars.add("xml-apis.jar");
// JARs from J2SE runtime
noTldJars.add("sunjce_provider.jar");
noTldJars.add("ldapsec.jar");
1.5 +1 -1 jakarta-tomcat-catalina/tester/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 20 Jul 2003 14:53:04 -0000 1.4
+++ build.xml 16 Jun 2004 18:04:38 -0000 1.5
@@ -92,7 +92,7 @@
<!-- Install Xerces -->
<copy todir="${tester.build}/web/WEB-INF/lib" file="${xercesImpl.jar}"/>
- <copy todir="${tester.build}/web/WEB-INF/lib" file="${xmlParserAPIs.jar}"/>
+ <copy todir="${tester.build}/web/WEB-INF/lib" file="${xml-apis.jar}"/>
<!-- Create and install tester library -->
<mkdir dir="${tester.build}/web/WEB-INF/lib"/>
1.69 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- changelog.xml 16 Jun 2004 15:13:58 -0000 1.68
+++ changelog.xml 16 Jun 2004 18:04:38 -0000 1.69
@@ -19,6 +19,9 @@
<changelog>
<update>Updated dependencies on commons-dbcp (to 1.2.1), commons-pool (to
1.2), and commons-logging (to 1.0.4). (yoavs)
</update>
+ <fix>
+ <bug>29368</bug>: Replaced references to xmlParserAPIs.jar with
xml-apis.jar, as the former is now deprecated in Xerces. Users wishing to use old
versions of Xerces that don't have xml-apis.jar can still do so without a problem.
Users wishing to build tomcat using xmlParserAPIs.jar instead of xml-apis.jar can also
do so with a trivial edit in the build.xml file.
+ </fix>
</changelog>
</subsection>
1.11 +0 -1 jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml
Index: class-loader-howto.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- class-loader-howto.xml 16 Jun 2004 15:50:30 -0000 1.10
+++ class-loader-howto.xml 16 Jun 2004 18:04:39 -0000 1.11
@@ -207,7 +207,6 @@
<li><em>org.w3c.dom.*</em></li>
<li><em>org.apache.xerces.*</em></li>
<li><em>org.apache.xalan.*</em></li>
-<li><em>
</ul>
Last, any JAR containing servlet API classes will be ignored by the
classloader.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
