This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libxerces2-java.
commit 4a1488c2bd5472adc51565e9870631a6145020d6 Author: Stefan Gybas <[email protected]> Date: Mon Feb 10 20:35:30 2003 +0000 Debian release 2.3.0-1 --- build.xml | 267 ++++++++++++++++++++++++++++++++++++++----------------- debian/changelog | 11 +++ debian/control | 13 ++- debian/rules | 8 +- 4 files changed, 212 insertions(+), 87 deletions(-) diff --git a/build.xml b/build.xml index 12dd192..3e7e7e0 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ Authors: Andy Clark, IBM Copyright: - Copyright (c) 2000-2002 The Apache Software Foundation. + Copyright (c) 2000-2003 The Apache Software Foundation. $Id$ @@ -34,17 +34,18 @@ Copyright: <property name='parser.Name' value='Xerces-J'/> <property name='parser.name' value='xerces-j'/> <property name='parser.shortname' value='xerces'/> - <property name='parser.Version' value='2.2.1'/> - <property name='parser.version' value='2.2.1'/> - <property name='parser_version' value='2_2_1'/> + <property name='parser.Version' value='2.3.0'/> + <property name='parser.version' value='2.3.0'/> + <property name='parser_version' value='2_3_0'/> <property name='deprecatedjar.parser' value='xerces.jar'/> - <property name='jar.apis' value='xmlParserAPIs.jar'/> + <property name='jar.apis' value='xml-apis.jar'/> + <property name='deprecatedjar.apis' value='xmlParserAPIs.jar'/> <property name='jar.parser' value='xercesImpl.jar'/> <property name='jar.samples' value='xercesSamples.jar'/> <property name='jar.dv' value='xercesDV.jar'/> - <property name="year" value="1999-2002"/> + <property name="year" value="1999-2003"/> <property name="copyright" value="Copyright © ${year} Apache XML Project. All Rights Reserved."/> <echo message= "---------------- ${parser.Name} ${parser.Version} [${year}] ---------------"/> @@ -80,6 +81,7 @@ Copyright: <property name="distsrc.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/> <property name="disttools.dir" value="${build.dir}/tools"/> <property name="distbin.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/> + <property name='src.apis.zip' value="${tools.dir}/xml-apis--src.zip"/> <filter token="year" value="${year}"/> <filter token="version" value="${parser.Version}"/> @@ -103,8 +105,7 @@ Copyright: <echo message=" jar --> generates the xercesImpl.jar file"/> <echo message=" sampjar --> generates the xercesSamples.jar file"/> - <echo message=" apijar --> generates the xmlParserAPIs.jar file"/> - <echo message=" jars --> generates xercesImpl, xercesSamples & xmlParserAPIs jars"/> + <echo message=" jars --> generates xercesImpl & xercesSamples jars"/> <echo message=" jar-dom3 --> 'jar' + DOM Level 3 support"/> <echo message=" sampjar-dom3 --> 'sampjar' + DOM Level 3 support"/> <echo message=" apijar-dom3 --> 'apijar' + DOM Level 3 support."/> @@ -177,7 +178,9 @@ Copyright: <copy todir="${build.src}"> <fileset dir="${src.dir}" - includes="javax/**, org/**" + includes="org/apache/** + org/w3c/dom/ls/** + org/w3c/dom/html/HTMLDOMImplementation.java" excludes="**/classfiles_updated **/CVS* **/.#* **/XMLMessages.java **/DatatypeContentModel.java **/ComplexTypeInfo.java **/v1/** **/v2/** @@ -185,6 +188,19 @@ Copyright: org/apache/xerces/dom3/ls/**"> </fileset> </copy> + + <!-- now deal with API's: --> + <unzip src="${src.apis.zip}" dest="${build.src}"> + <patternset + includes="org/xml/sax/** + javax/xml/parsers/** + org/w3c/dom/* + org/w3c/dom/events/** + org/w3c/dom/html/** + org/w3c/dom/ranges/** + org/w3c/dom/traversal/**" + /> + </unzip> <!-- substitute tokens as needed --> <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" @@ -207,7 +223,15 @@ Copyright: deprecation="${deprecation}" optimize="${optimize}" includeAntRuntime="false" - includeJavaRuntime="false"/> + includeJavaRuntime="false" + excludes="org/xml/sax/** + javax/xml/parsers/** + org/w3c/dom/* + org/w3c/dom/events/** + org/w3c/dom/html/** + org/w3c/dom/ranges/** + org/w3c/dom/traversal/**" + /> </target> <!-- =================================================================== --> @@ -239,24 +263,6 @@ Copyright: </target> <!-- =================================================================== --> - <!-- Creates the API class package, excluding DOM Level 3 --> - <!-- =================================================================== --> - <target name="apijar" depends="compile"> - <jar jarfile="${build.dir}/${jar.apis}" - basedir="${build.dest}" - compress="true" - includes="org/xml/**, org/w3c/**, javax/**" - excludes="org/w3c/dom/ls/** - org/w3c/dom/xpath/** - org/w3c/dom/DOMError.class - org/w3c/dom/DOMErrorHandler.class - org/w3c/dom/DOMImplementationSource.class - org/w3c/dom/DOMImplementationRegistry.class - org/w3c/dom/DOMLocator.class - org/w3c/dom/UserDataHandler.class" /> - </target> - - <!-- =================================================================== --> <!-- Compiles the samples --> <!-- =================================================================== --> <target name="samples" depends="compile"> @@ -268,7 +274,7 @@ Copyright: </copy> <xjavac srcdir="${build.samples}" destdir="${build.dest}" - classpath="${build.dir}/classes" + classpath="${build.dir}/classes:${tools.dir}/${jar.apis}" debug="${debug}" includeAntRuntime="false" includeJavaRuntime="true"/> @@ -281,7 +287,7 @@ Copyright: <mkdir dir="${build.tests}"/> <copy todir="${build.tests}"> <fileset dir="${tests.dir}" - excludes="dom/rename/**, dom/dom3/**, dom/registry/**, dom/mem/**" /> + excludes="dom/rename/**, dom/registry/**" /> </copy> <xjavac srcdir="${build.tests}" destdir="${build.dest}" @@ -338,18 +344,6 @@ Copyright: <!-- Creates the API documentation --> <!-- =================================================================== --> <target name="javadocs" depends="prepare-src"> - <!-- - <mkdir dir="${build.javadocs}"/> - <javadoc packagenames="${packages}" - sourcepath="${build.src}" - destdir="${build.javadocs}" - author="true" - version="true" - use="true" - windowtitle="${parser.Name} API" - doctitle="${parser.Name}" - bottom="${copyright}" /> - --> <mkdir dir='${build.dir}/docs/javadocs/api'/> <javadoc packagenames='javax.xml.parsers,org.w3c.*,org.xml.*' locale='en_US' @@ -417,7 +411,7 @@ Copyright: <copy todir="${distsrc.dir}/src" > <fileset dir="${src.dir}" - includes="**/Makefile, **/Makefile.incl, org/**, javax/**" + includes="org/**, dom3/**, javax/**" excludes="**/CVS*, **/.#*, **/*.class **/v1/** **/v2/**" /> @@ -445,8 +439,9 @@ Copyright: /> </copy> - <!--<copy file="Makefile" tofile="${distsrc.dir}/Makefile"/>--> <copy file="LICENSE" tofile="${distsrc.dir}/LICENSE"/> + <copy file="LICENSE-DOM.html" tofile="${distsrc.dir}/LICENSE-DOM.html"/> + <copy file="LICENSE-SAX.html" tofile="${distsrc.dir}/LICENSE-SAX.html"/> <copy file="README" tofile="${distsrc.dir}/README"/> <copy file="Readme.html" tofile="${distsrc.dir}/Readme.html"/> <copy file="STATUS" tofile="${distsrc.dir}/STATUS"/> @@ -480,7 +475,7 @@ Copyright: <copy todir="${disttools.dir}" > <fileset dir="${tools.dir}" - includes="ant*, **/*.bat, *.jar" + includes="**/*.txt, **/*.bat, **/*.jar, **/*.zip" excludes="**/CVS*, **/.#*, **/*.class" /> </copy> @@ -538,6 +533,8 @@ Copyright: </copy> <copy file="LICENSE" tofile="${distbin.dir}/LICENSE"/> + <copy file="LICENSE-DOM.html" tofile="${distbin.dir}/LICENSE-DOM.html"/> + <copy file="LICENSE-SAX.html" tofile="${distbin.dir}/LICENSE-SAX.html"/> <copy file="Readme.html" tofile="${distbin.dir}/Readme.html"/> <copy file="${build.dir}/${jar.samples}" tofile="${distbin.dir}/${jar.samples}"/> @@ -557,7 +554,9 @@ Copyright: <!-- =================================================================== --> <target name="pack-bin" depends="pack-bin-common, jars"> <copy file="${build.dir}/${jar.parser}" tofile="${distbin.dir}/${jar.parser}"/> - <copy file="${build.dir}/${jar.apis}" tofile="${distbin.dir}/${jar.apis}"/> + <!-- support xml-commons APIs --> + <copy file="${tools.dir}/${jar.apis}" tofile="${distbin.dir}/${jar.apis}"/> + <copy file="${tools.dir}/${jar.apis}" tofile="${distbin.dir}/${deprecatedjar.apis}"/> <zip zipfile="${build.dir}/${parser.Name}-bin.${parser.version}.zip" basedir="${build.dir}" @@ -600,81 +599,117 @@ Copyright: <!-- =================================================================== --> <target name="test" depends="tests"> <echo message="Performing sanity test for ${parser.Name} ${parser.Version} ..." /> - <echo message="Using classpath='${build.dir}/classes'" /> + <echo message="Using classpath='${tools.dir}/${jar.apis}:${build.dir}/classes'" /> <echo message="Running sax.Counter ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="sax.Counter" failOnError="yes"> <arg value="${data.dir}/personal.xml"/> </java> <echo message="Running sax.Writer ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="sax.Writer" failOnError="yes"> <arg value="${data.dir}/personal.xml"/> </java> <echo message="Running dom.Counter ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.Counter" failOnError="yes"> <arg value="${data.dir}/personal.xml"/> </java> <echo message="Running dom.Writer ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.Writer" failOnError="yes"> <arg value="${data.dir}/personal.xml"/> </java> + <echo message="Running thread.Test dom" /> + <java fork="yes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" + classname="thread.Test" + failOnError="yes"> + <arg value="-dom"/> + <arg value="-threads"/> + <arg value="20"/> + <arg value="-time"/> + <arg value="10"/> + <arg value="${data.dir}/personal-schema.xml"/> + + </java> + <echo message="Running thread.Test sax" /> + <java fork="yes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" + classname="thread.Test" + failOnError="yes"> + <arg value="-dom"/> + <arg value="-threads"/> + <arg value="20"/> + <arg value="-time"/> + <arg value="10"/> + <arg value="${data.dir}/personal-schema.xml"/> + + </java> + + + <!-- <echo message="Running DOMFilter ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.DOMFilter" args="-p dom.wrappers.DOMParser ${data.dir}/personal.xml"/> --> <!-- The following are samples but not command-line applications. <echo message="Running IteratorView ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.traversal.IteratorView" failOnError="yes" args="${data.dir}/personal.xml"/> <echo message="Running TreeWalkerView ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.traversal.TreeWalkerView" failOnError="yes" args="${data.dir}/personal.xml"/> <echo message="Running TreeViewer ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.TreeViewer" failOnError="yes" args="${data.dir}/personal.xml"/> --> <echo message="Running dom.DTest ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.DTest" failOnError="yes"> </java> + <echo message="Running dom.mem.Test ..." /> + <java fork="yes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" + classname="dom.mem.Test" + failOnError="yes"> + </java> + <echo message="Running dom.ids.Test ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.ids.Test" failOnError="yes"> </java> <echo message="Running dom.serialization.Test ..." /> <java fork="yes" - classpath="${build.dir}/classes" + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.serialization.Test" - failOnError="yes" - args="${data.dir}/personal.xml out.xml"> - + failOnError="yes"> + <arg value="${data.dir}/personal.xml"/> + <arg value="out.xml"/> </java> </target> @@ -687,13 +722,16 @@ Copyright: <!-- =================================================================== --> <!-- Builds xercesImpl, xmlParserAPIs and sample jar files --> <!-- =================================================================== --> - <target name="jars" depends="jar, sampjar, apijar"> + <target name="jars" depends="jar, sampjar"> + <!-- support xml-commons APIs --> + <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/> + <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${deprecatedjar.apis}"/> </target> <!-- =================================================================== --> <!-- Builds and packages tools, sources and binary distributions --> <!-- =================================================================== --> - <target name="all" depends="pack-bin, deprecated-bin, pack-src, pack-tools"> + <target name="all" depends="pack-bin, pack-src, pack-tools"> </target> <!-- =================================================================== --> @@ -767,16 +805,19 @@ Copyright: org/apache/xerces/impl/xpath/regex/** org/apache/xerces/impl/dv/Schema*.java org/apache/xerces/impl/msg/XMLSchema** - org/apache/xerces/impl/validation/XMLGrammarPoolImpl.java org/apache/xerces/parsers/DOMASBuilderImpl.java org/apache/xerces/parsers/StandardParserConfiguration.java org/apache/xerces/parsers/IntegratedParserConfiguration.java + org/apache/xerces/parsers/SecurityConfiguration.java org/apache/xerces/parsers/XML11Configuration.java org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java org/apache/xerces/parsers/CachingParserPool.java org/apache/xerces/dom/ASModelImpl.java org/apache/xerces/dom/ASDOMImplementationImpl.java - org/apache/xerces/impl/XML11*.java + org/apache/xerces/impl/XML11D*.java + org/apache/xerces/impl/XML11NamespaceBinder.java + org/apache/xerces/impl/XMLVersionDetector.java + org/apache/xerces/util/DOMUtil.java org/apache/html/** org/apache/wml/** "> @@ -801,11 +842,16 @@ Copyright: <!-- =================================================================== --> <!-- Builds xercesImpl (dtd), xmlParserAPIs, and sample jars --> <!-- =================================================================== --> - <target name="dtdjars" depends="dtdjar, sampjar, apijar"> + <target name="dtdjars" depends="dtdjar, sampjar"> + <!-- support xml-commons APIs --> + <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/> + <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${deprecatedjar.apis}"/> </target> <!-- =================================================================== --> <!-- Creates the XML 1.1-enabled implementation class package, excluding DOM Level 3 --> + <!-- REVISIT: Once a release or so has gone by with XML 1.1 support being enabled by default, these targets should be + removed; as should the XML11ParserConfiguration file in the org/apache/xerces/parsers directory. --> <!-- =================================================================== --> <target name="xml11jar" depends="compile"> <copy file="${src.dir}/org/apache/xerces/parsers/org.apache.xerces.xni.parser.XML11Configuration" @@ -827,7 +873,10 @@ Copyright: <!-- =================================================================== --> <!-- Builds XML 1.1-enabled xercesImpl, xmlParserAPIs and sample jar files --> <!-- =================================================================== --> - <target name="xml11jars" depends="xml11jar, sampjar, apijar"> + <target name="xml11jars" depends="xml11jar, sampjar"> + <!-- support xml-commons APIs --> + <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/> + <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${deprecatedjar.apis}"/> </target> <!-- =================================================================== --> @@ -862,7 +911,7 @@ Copyright: <!-- =================================================================== --> <!-- Compiles the dv source code package --> <!-- =================================================================== --> - <target name="dvprepare-src"> + <target name="dvprepare-src" depends="prepare"> <!-- copy src files --> <copy todir="${build.src}"> @@ -881,6 +930,9 @@ Copyright: org/apache/xerces/impl/xs/psvi/XSTypeDefinition.java, org/apache/xerces/impl/xs/util/StringListImpl.java, org/apache/xerces/impl/xs/util/XSObjectListImpl.java, + org/apache/xerces/util/ObjectFactory.java, + org/apache/xerces/util/SecuritySupport.java, + org/apache/xerces/util/SecuritySupport12.java, org/apache/xerces/util/SymbolHash.java, org/apache/xerces/util/URI.java, org/apache/xerces/util/XMLChar.java, @@ -981,12 +1033,23 @@ Copyright: <!-- DOM level 3 hack: replace import statements--> - <replace file="${build.src}/org/apache/xerces/dom/NodeImpl.java" + <replace file="${build.src}/org/apache/xerces/dom/NodeImpl.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/dom/ElementImpl.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/dom/ElementNSImpl.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/dom/AttrImpl.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/dom/AttrNSImpl.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xerces/dom/DocumentImpl.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xerces/dom/DOMNormalizer.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/dom/DOMConfigurationImpl.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/dom/PSVIDocumentImpl.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xerces/dom/DOMLocatorImpl.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xerces/dom/DOMImplementationSourceImpl.java" @@ -994,27 +1057,33 @@ Copyright: <replace file="${build.src}/org/apache/xerces/dom/DOMErrorImpl.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xerces/dom/CoreDocumentImpl.java" - token="org.apache.xerces.dom3" value="org.w3c.dom"/> - + token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xerces/parsers/DOMBuilderImpl.java" - token="org.apache.xerces.dom3" value="org.w3c.dom"/> - + token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xerces/util/DOMErrorHandlerWrapper.java" - token="org.apache.xerces.dom3" value="org.w3c.dom"/> - + token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xml/serialize/XMLSerializer.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xml/serialize/BaseMarkupSerializer.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/apache/xml/serialize/DOMWriterImpl.java" - token="org.apache.xerces.dom3" value="org.w3c.dom"/> - + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xml/serialize/XML11Serializer.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/w3c/dom/ls/DOMWriter.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/w3c/dom/ls/ParseErrorEvent.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> <replace file="${build.src}/org/w3c/dom/ls/DOMBuilder.java" token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/impl/xs/opti/DefaultNode.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/impl/xs/opti/AttrImpl.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/impl/xs/opti/DefaultElement.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.src}/org/apache/xerces/impl/xs/opti/DefaultDocument.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> </target> @@ -1034,7 +1103,8 @@ Copyright: deprecation="${deprecation}" optimize="${optimize}" includeAntRuntime="false" - includeJavaRuntime="true"/> + includeJavaRuntime="true" + classpath="${tools.dir}/${jar.apis}"/> </target> <!-- =================================================================== --> @@ -1051,11 +1121,14 @@ Copyright: <replace file="${build.samples}/dom/ASBuilder.java" token="org.apache.xerces.dom3.DOMErrorHandler" value="org.w3c.dom.DOMErrorHandler"/> + + <replace file="${build.samples}/dom/ASBuilder.java" + token="org.apache.xerces.dom3.DOMConfiguration" value="org.w3c.dom.DOMConfiguration"/> <xjavac srcdir="${build.samples}" destdir="${build.dest}" - classpath="${build.dir}/classes" + classpath="${build.dir}/classes:${tools.dir}/${jar.apis}" debug="${debug}" includeAntRuntime="false" includeJavaRuntime="true"/> @@ -1072,6 +1145,15 @@ Copyright: <copy todir="${build.tests}"> <fileset dir="${tests.dir}" /> </copy> + <replace file="${build.tests}/dom/mem/Test.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.tests}/dom/dom3/Test.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.tests}/dom/ids/Test.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <replace file="${build.tests}/thread/Test.java" + token="org.apache.xerces.dom3" value="org.w3c.dom"/> + <xjavac srcdir="${build.tests}" destdir="${build.dest}" classpath="${build.dir}/classes:./tools/junit.jar" @@ -1087,7 +1169,7 @@ Copyright: <echo message="Performing sanity test for ${parser.Name} ${parser.Version} ..." /> <echo message="Using classpath='${build.dir}/classes'" /> <echo message="Running sax.Counter ..." /> - <java fork="yes" + <java fork="yes" classpath="${build.dir}/classes" classname="sax.Counter" failOnError="yes"> @@ -1147,6 +1229,26 @@ Copyright: classname="dom.mem.Test" failOnError="yes"> </java> + <echo message="Running thread.Test ..." /> + <java fork="yes" + classpath="${build.dir}/classes" + classname="thread.Test" + failOnError="yes"> + <arg value="-dom"/> + <arg value="-threads"/> + <arg value="20"/> + <arg value="-time"/> + <arg value="10"/> + <arg value="${data.dir}/personal-schema.xml"/> + + </java> + + <echo message="Running dom.ids.Test ..." /> + <java fork="yes" + classpath="${build.dir}/classes" + classname="dom.ids.Test" + failOnError="yes"> + </java> <echo message="Running dom.DTest ..." /> <java fork="yes" classpath="${build.dir}/classes" @@ -1189,10 +1291,13 @@ Copyright: <!-- Creates the API class package with DOM Level 3 --> <!-- =================================================================== --> <target name="apijar-dom3" depends="compile-dom3"> + <copy file="${tools.dir}/${jar.apis}" + tofile="${build.dir}/dom3-${jar.apis}"/> <jar jarfile="${build.dir}/dom3-${jar.apis}" basedir="${build.dest}" compress="true" - includes="org/xml/**, org/w3c/**, javax/**" /> + includes="org/xml/**, org/w3c/**" + update="yes"/> </target> diff --git a/debian/changelog b/debian/changelog index c737176..f0f9466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +xerces2-j (2.3.0-1) unstable; urgency=low + + * New upstream release + + Fixes the DTD parsing problems in Tomcat 4 (closes: #167135, #171929) + * Build with the latest Jikes version (>= 1.18) + * Include the compiled examples (xercesSamples.jar) (closes: #170822) + * Enable experimental DOM Level 3 support and updated the package + description about the new XML 1.1 features + + -- Stefan Gybas <[email protected]> Mon, 10 Feb 2003 19:54:06 +0100 + xerces2-j (2.2.1-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 0c748ea..23a624f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: contrib/libs Priority: optional Maintainer: Stefan Gybas <[email protected]> Uploaders: Takashi Okamoto <[email protected]>, Ola Lundqvist <[email protected]> -Build-Depends-Indep: debhelper (>= 4.1.0), ant (>= 1.5-1), j2sdk (>= 1.4.0-1), jikes (>= 1.15), jikes (<< 1:1.16), libxerces-java, libxalan2-java +Build-Depends-Indep: debhelper (>= 4.1.0), ant (>= 1.5-1), j2sdk (>= 1.4.0-1), jikes (>= 1.18), libxerces-java, libxalan2-java Standards-Version: 3.5.8 Package: libxerces2-java @@ -23,8 +23,15 @@ Description: Validating XML parser for Java * Simple API for XML (SAX) 2.0 Core and Extension * Java APIs for XML Processing (JAXP) 1.1 * XML Schema 1.0 Structures and Datatypes Recommendations - * partial implementation of Document Object Model (DOM) Level 3 Core, - Load and Save and Abstract Schemas [deprecated] + * experimental implementation of the Document Object Model (DOM) Level 3 + Core and Load/Save Working Drafts + . + Xerces is now able to parse documents written according to the XML 1.1 + Candidate Recommendation, except that it does not yet provide an option to + enable normalization checking as described in section 2.13 of this + specification. It also handles namespaces according to the XML Namespaces 1.1 + Candidate Recommendation, and will correctly serialize XML 1.1 documents if + the DOM level 3 load/save API's are in use. . For more information about Xerces2-J see the home page at http://xml.apache.org/xerces2-j/index.html. diff --git a/debian/rules b/debian/rules index 9ef6c71..00037ba 100644 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\ build: build-stamp build-stamp: dh_testdir - $(ANT) jar apijar docs javadocs + $(ANT) jar-dom3 apijar-dom3 sampjar-dom3 docs javadocs touch build-stamp clean: @@ -28,10 +28,12 @@ install: build dh_testroot dh_clean -k dh_installdirs - install -m 644 build/xercesImpl.jar debian/libxerces2-java/usr/share/java/xercesImpl-$(UPSTREAM_VERSION).jar + install -m 644 build/dom3-xercesImpl.jar debian/libxerces2-java/usr/share/java/xercesImpl-$(UPSTREAM_VERSION).jar ln -s xercesImpl-$(UPSTREAM_VERSION).jar debian/libxerces2-java/usr/share/java/xercesImpl.jar - install -m 644 build/xmlParserAPIs.jar debian/libxerces2-java/usr/share/java/xmlParserAPIs-$(UPSTREAM_VERSION).jar + install -m 644 build/dom3-xml-apis.jar debian/libxerces2-java/usr/share/java/xmlParserAPIs-$(UPSTREAM_VERSION).jar ln -s xmlParserAPIs-$(UPSTREAM_VERSION).jar debian/libxerces2-java/usr/share/java/xmlParserAPIs.jar + install -m 644 build/xercesSamples.jar debian/libxerces2-java/usr/share/java/xercesSamples-$(UPSTREAM_VERSION).jar + ln -s xercesSamples-$(UPSTREAM_VERSION).jar debian/libxerces2-java/usr/share/java/xercesSamples.jar # Build architecture-independent files here. binary-indep: build install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxerces2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
