[libxerces2-java] 01/02: This commit was manufactured by cvs2svn to create tag 'RELEASE_2_4_0-1'.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Jun 18 22:29:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag debian/RELEASE_2_4_0-1
in repository libxerces2-java.
commit 58ec4906123c7a5ffb6fef0ccca037a97da60d76
Author: (no author) <nobody at debian.org>
Date: Sun Apr 13 21:24:32 2003 +0000
This commit was manufactured by cvs2svn to create tag
'RELEASE_2_4_0-1'.
---
build.properties | 1 +
build.xml | 431 +++++++++++++++++++++++++++++++++++--------------------
debian/changelog | 36 +++++
debian/control | 16 ++-
debian/rules | 12 +-
5 files changed, 332 insertions(+), 164 deletions(-)
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000..90e15fb
--- /dev/null
+++ b/build.properties
@@ -0,0 +1 @@
+build.compiler=jikes
diff --git a/build.xml b/build.xml
index 8b4d8ef..65f7aeb 100644
--- a/build.xml
+++ b/build.xml
@@ -10,13 +10,18 @@ Authors:
Andy Clark, IBM
Copyright:
- Copyright (c) 2000-2002 The Apache Software Foundation.
+ Copyright (c) 2000-2003 The Apache Software Foundation.
$Id$
==================================================================== -->
<project default="usage" basedir=".">
+
+ <!-- enable compilation under IBM JDK 1.4 -->
+ <!-- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/> -->
+ <taskdef name="xjavac" classname="org.apache.tools.ant.taskdefs.Javac"/>
+
<!-- Allow properties following these statements to be overridden -->
<!-- Note that all of these don't have to exist. They've just been defined
incase they are used. -->
@@ -29,23 +34,24 @@ 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.1.0'/>
- <property name='parser.version' value='2.1.0'/>
- <property name='parser_version' value='2_1_0'/>
+ <property name='parser.Version' value='2.4.0'/>
+ <property name='parser.version' value='2.4.0'/>
+ <property name='parser_version' value='2_4_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}] ---------------"/>
<!-- changed made to synchronize with a patch from Sam Ruby (<rubys at apache.org>) to Xerces1
<property name="build.compiler" value="classic"/> -->
- <property name="debug" value="off"/>
+ <property name="debug" value="on"/>
<property name="optimize" value="on"/>
<property name="deprecation" value="off"/>
@@ -75,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}"/>
@@ -98,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."/>
@@ -115,7 +121,6 @@ Copyright:
<echo message=" tests-dom3 --> 'tests' + DOM Level 3 support."/>
<echo message=" deprecatedjars --> generates xerces.jar and samples jar"/>
<echo message=" dtdjars --> generates xercesImpl containing no schema support or WML/HTML DOM and xercesSamples & xmlParserAPIs jars"/>
- <echo message=" xml11jars --> EXPERIMENTAL! Generates xercesImpl containing very preliminary XML 1.1 support, as well as xercesSamples & xmlParserAPIs jars"/>
<echo message=" dvjar --> generates a Schema datatype jar"/>
<echo message=" pack-tools --> generates the tools distributions (zip and tar.gz)"/>
<echo message=" pack-src --> generates the source distributions (zip and tar.gz)"/>
@@ -172,14 +177,28 @@ Copyright:
<copy todir="${build.src}">
<fileset
dir="${src.dir}"
- includes="**/Makefile, **/Makefile.incl, javax/**, org/**"
+ includes="org/apache/**
+ org/w3c/dom/ls/**
+ org/w3c/dom/html/HTMLDOMImplementation.java"
excludes="**/classfiles_updated **/CVS* **/.#* **/XMLMessages.java
- **/SchemaImporter.java **/RevalidatingDOMParser.java
**/DatatypeContentModel.java **/ComplexTypeInfo.java
- **/DTDImporter.java **/v1/** **/v2/**
- org/apache/xerces/dom3/ls/**">
+ **/v1/** **/v2/**
+ javax.xml.parsers.ConvertToURI.java">
</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"
@@ -196,14 +215,22 @@ Copyright:
</fileset>
</copy>
- <javac srcdir="${build.src}"
- excludes="**/RevalidatingDOMParser.java"
+ <xjavac srcdir="${build.src}"
destdir="${build.dest}"
+ classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"
includeAntRuntime="false"
- includeJavaRuntime="true"/>
+ 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>
<!-- =================================================================== -->
@@ -220,34 +247,23 @@ Copyright:
<!-- Creates the implementation class package, excluding DOM Level 3 -->
<!-- =================================================================== -->
<target name="jar" depends="compile">
+ <!-- take care of manifest file -->
+ <copy todir="${build.dir}" file="${src.dir}/manifest.xerces"/>
+ <replace file="${build.dir}/manifest.xerces"
+ token="@@VERSION@@" value="${parser.Version}"/>
<jar jarfile="${build.dir}/${jar.parser}"
basedir="${build.dest}"
compress="true"
includes="org/apache/**, META-INF/**
+ org/w3c/dom/html/HTMLDOMImplementation.class
org/w3c/dom/ls/**
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>
-
- <!-- =================================================================== -->
- <!-- 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/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" />
+ org/w3c/dom/UserDataHandler.class"
+ manifest="${build.dir}/manifest.xerces"/>
</target>
<!-- =================================================================== -->
@@ -260,9 +276,9 @@ Copyright:
excludes="dom/DOMAddLines.java
dom/DOM3.java" />
</copy>
- <javac srcdir="${build.samples}"
+ <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"/>
@@ -275,11 +291,11 @@ 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>
- <javac srcdir="${build.tests}"
+ <xjavac srcdir="${build.tests}"
destdir="${build.dest}"
- classpath="${build.dir}/classes:./tools/junit.jar"
+ classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
debug="${debug}"
includeAntRuntime="false"
includeJavaRuntime="true"/>
@@ -332,18 +348,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'
@@ -411,7 +415,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/**"
/>
@@ -439,8 +443,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"/>
@@ -474,7 +479,7 @@ Copyright:
<copy todir="${disttools.dir}" >
<fileset
dir="${tools.dir}"
- includes="ant*, **/*.bat, *.jar"
+ includes="**/*.txt, **/*.bat, **/*.jar, **/*.zip"
excludes="**/CVS*, **/.#*, **/*.class"
/>
</copy>
@@ -532,6 +537,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}"/>
@@ -551,7 +558,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}"
@@ -594,81 +603,129 @@ 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="-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.range.Test ..." />
+ <java fork="yes"
+ classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+ classname="dom.range.Test"
+ failOnError="yes">
+ <arg value="all"/>
+ </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-schema.xml"/>
+ <arg value="out.xml"/>
+ </java>
+ <echo message="Running schema.Test ..." />
+ <java fork="yes"
+ classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+ classname="schema.Test"
+ failOnError="yes">
</java>
</target>
@@ -681,13 +738,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>
<!-- =================================================================== -->
@@ -696,19 +756,6 @@ Copyright:
<target name="deprecatedall" depends="pack-src, deprecated-bin, pack-tools">
</target>
- <target name="prepare-schema-src">
- <copy todir="${build.src}">
- <fileset
- dir="${src.dir}"
- includes="**/v2/**/*.java **/v2/**/*.properties"
- excludes="**/v2/new_datatypes/**">
- </fileset>
- </copy>
- </target>
-
- <target name="schema-all" depends="prepare-src, prepare-schema-src, pack-src, pack-bin">
- </target>
-
<!-- =================================================================== -->
<!-- Cleans everything -->
<!-- =================================================================== -->
@@ -724,7 +771,15 @@ Copyright:
<jar jarfile="${build.dir}/dtd-${jar.parser}"
basedir="${build.dest}"
compress="true"
- includes="org/apache/**, META-INF/**"/>
+ includes="org/apache/**, META-INF/**
+ org/w3c/dom/html/HTMLDOMImplementation.class
+ org/w3c/dom/ls/**
+ 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>
<!-- =================================================================== -->
@@ -737,7 +792,7 @@ Copyright:
</fileset>
</copy>
- <javac srcdir="${build.src}"
+ <xjavac srcdir="${build.src}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
@@ -758,13 +813,11 @@ Copyright:
<copy todir="${build.src}">
<fileset
dir="${src.dir}"
- includes="**/Makefile, **/Makefile.incl, javax/**, org/**"
+ includes="javax/**, org/**"
excludes="**/classfiles_updated **/CVS* **/.#* **/XMLMessages.java
- **/SchemaImporter.java **/RevalidatingDOMParser.java
**/DatatypeContentModel.java **/ComplexTypeInfo.java
- **/DTDImporter.java
**/v1/** **/v2/**
- **/RevalidatingDOMParser.java
+ javax.xml.parsers.ConvertToURI.java
org/apache/xerces/impl/xs/**
org/apache/xerces/impl/dv/xs/**
org/apache/xerces/impl/xs/identity/**
@@ -776,15 +829,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/**
">
@@ -800,7 +857,23 @@ Copyright:
">
</fileset>
</copy>
-
+
+ <!-- HACK: DOM implementation now is aware of type information
+ and thus is imports XSSimpleTypeDecl (for XML Schema type support)
+ Since in DTD jars we never going to have XSSimpleTypeDecl we can safely
+ replace it by String. The code after replacement may look a bit strange..
+ but there is nothing we can do at this point-->
+ <replace file="${build.dir}/src/org/apache/xerces/dom/AttrNSImpl.java"
+ token="import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl;" value=""/>
+ <replace file="${build.dir}/src/org/apache/xerces/dom/AttrNSImpl.java"
+ token="XSSimpleTypeDecl" value="String"/>
+ <replace file="${build.dir}/src/org/apache/xerces/dom/AttrNSImpl.java"
+ token="return ((String)type).getName();" value="return (String)type;"/>
+ <replace file="${build.dir}/src/org/apache/xerces/dom/AttrNSImpl.java"
+ token="return ((String)type).getNamespace();" value="return null;"/>
+
+
+
<!-- substitute tokens as needed -->
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
@@ -809,33 +882,10 @@ Copyright:
<!-- =================================================================== -->
<!-- Builds xercesImpl (dtd), xmlParserAPIs, and sample jars -->
<!-- =================================================================== -->
- <target name="dtdjars" depends="dtdjar, sampjar, apijar">
- </target>
-
- <!-- =================================================================== -->
- <!-- Creates the XML 1.1-enabled implementation class package, excluding DOM Level 3 -->
- <!-- =================================================================== -->
- <target name="xml11jar" depends="compile">
- <copy file="${src.dir}/org/apache/xerces/parsers/org.apache.xerces.xni.parser.XML11Configuration"
- tofile="${build.dest}/META-INF/services/org.apache.xerces.xni.parser.XMLParserConfiguration"
- overwrite="yes"/>
- <jar jarfile="${build.dir}/xml11-${jar.parser}"
- basedir="${build.dest}"
- compress="true"
- includes="org/apache/**, META-INF/**
- org/w3c/dom/ls/**
- 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>
-
- <!-- =================================================================== -->
- <!-- Builds XML 1.1-enabled xercesImpl, xmlParserAPIs and sample jar files -->
- <!-- =================================================================== -->
- <target name="xml11jars" depends="xml11jar, 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>
<!-- =================================================================== -->
@@ -858,7 +908,7 @@ Copyright:
</fileset>
</copy>
- <javac srcdir="${build.src}"
+ <xjavac srcdir="${build.src}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
@@ -870,7 +920,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}">
@@ -880,15 +930,34 @@ Copyright:
org/apache/xerces/impl/msg/XMLSchema**,
org/apache/xerces/impl/xpath/regex/**,
org/apache/xerces/impl/xs/XSTypeDecl.java,
- org/apache/xerces/impl/xs/psvi/StringList.java,
- org/apache/xerces/impl/xs/psvi/XSAnnotation.java,
- org/apache/xerces/impl/xs/psvi/XSConstants.java,
- org/apache/xerces/impl/xs/psvi/XSObject.java,
- org/apache/xerces/impl/xs/psvi/XSObjectList.java,
- org/apache/xerces/impl/xs/psvi/XSSimpleTypeDefinition.java,
- org/apache/xerces/impl/xs/psvi/XSTypeDefinition.java,
+ org/apache/xerces/impl/xs/psvi/StringList.java
+ org/apache/xerces/impl/xs/psvi/XSAnnotation.java
+ org/apache/xerces/impl/xs/psvi/XSAttributeDeclaration.java
+ org/apache/xerces/impl/xs/psvi/XSAttributeGroupDefinition.java
+ org/apache/xerces/impl/xs/psvi/XSAttributeUse.java
+ org/apache/xerces/impl/xs/psvi/XSComplexTypeDefinition.java
+ org/apache/xerces/impl/xs/psvi/XSConstants.java
+ org/apache/xerces/impl/xs/psvi/XSElementDeclaration.java
+ org/apache/xerces/impl/xs/psvi/XSIDCDefinition.java
+ org/apache/xerces/impl/xs/psvi/XSModel.java
+ org/apache/xerces/impl/xs/psvi/XSModelGroup.java
+ org/apache/xerces/impl/xs/psvi/XSModelGroupDefinition.java
+ org/apache/xerces/impl/xs/psvi/XSNamedMap.java
+ org/apache/xerces/impl/xs/psvi/XSNamespaceItem.java
+ org/apache/xerces/impl/xs/psvi/XSNamespaceItemList.java
+ org/apache/xerces/impl/xs/psvi/XSNotationDeclaration.java
+ org/apache/xerces/impl/xs/psvi/XSObject.java
+ org/apache/xerces/impl/xs/psvi/XSObjectList.java
+ org/apache/xerces/impl/xs/psvi/XSParticle.java
+ org/apache/xerces/impl/xs/psvi/XSSimpleTypeDefinition.java
+ org/apache/xerces/impl/xs/psvi/XSTerm.java
+ org/apache/xerces/impl/xs/psvi/XSTypeDefinition.java
+ org/apache/xerces/impl/xs/psvi/XSWildcard.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,
@@ -963,13 +1032,13 @@ Copyright:
<copy todir="${build.src}">
<fileset
dir="${src.dir}"
- includes="**/Makefile, **/Makefile.incl, javax/**, org/**"
+ includes="javax/**, org/**"
excludes="**/classfiles_updated **/CVS* **/.#* **/XMLMessages.java
- **/SchemaImporter.java **/RevalidatingDOMParser.java
**/DatatypeContentModel.java **/ComplexTypeInfo.java
- **/DTDImporter.java **/v1/** **/v2/**
+ **/v1/** **/v2/**
+ javax.xml.parsers.ConvertToURI.java
org/apache/xerces/dom3/*.java
- org/apache/xerces/dom3/ls/**
+ org/apache/xerces/dom3/bootstrap/*.java
org/w3c/dom/*.java">
</fileset>
</copy>
@@ -989,12 +1058,25 @@ 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/DOMImplementationListImpl.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"
@@ -1002,27 +1084,31 @@ 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>
@@ -1036,20 +1122,20 @@ Copyright:
</fileset>
</copy>
- <javac srcdir="${build.src}"
- excludes="**/RevalidatingDOMParser.java"
+ <xjavac srcdir="${build.src}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"
includeAntRuntime="false"
- includeJavaRuntime="true"/>
+ includeJavaRuntime="true"
+ classpath="${tools.dir}/${jar.apis}"/>
</target>
<!-- =================================================================== -->
<!-- Compiles the samples with DOM Level 3 -->
<!-- =================================================================== -->
- <target name="samples-dom3" depends="compile-dom3">
+ <target name="samples-dom3" depends="jar-dom3, apijar-dom3">
<mkdir dir="${build.samples}"/>
<copy todir="${build.samples}" >
<fileset dir="${samples.dir}" />
@@ -1060,11 +1146,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"/>
- <javac srcdir="${build.samples}"
+ <xjavac srcdir="${build.samples}"
destdir="${build.dest}"
- classpath="${build.dir}/classes"
+ classpath="${build.dir}/classes:${build.dir}/dom3-${jar.parser}:${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.apis}"
debug="${debug}"
includeAntRuntime="false"
includeJavaRuntime="true"/>
@@ -1081,7 +1170,16 @@ Copyright:
<copy todir="${build.tests}">
<fileset dir="${tests.dir}" />
</copy>
- <javac srcdir="${build.tests}"
+ <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"
debug="${debug}"
@@ -1096,7 +1194,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">
@@ -1156,6 +1254,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"
@@ -1198,10 +1316,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 6c03775..33578f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+xerces2-j (2.4.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Built using Blackdown's JDK 1.4 instead of the converted RPM from Sun
+ * Standards-Version: 3.5.9 (no changes required)
+
+ -- Stefan Gybas <sgybas at debian.org> Sun, 13 Apr 2003 18:50:54 +0200
+
+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 <sgybas at debian.org> Mon, 10 Feb 2003 19:54:06 +0100
+
+xerces2-j (2.2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Added versioned build dependency on jikes
+ * Compile the classes with debugging enabled
+ * Standards-Version: 3.5.8 (no changes required)
+
+ -- Stefan Gybas <sgybas at debian.org> Mon, 18 Nov 2002 15:10:27 +0100
+
+xerces2-j (2.2.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Added Takashi Okamoto and Ola Lundqvist as uploaders
+ * Use jikes to compile the Java classes
+
+ -- Stefan Gybas <sgybas at debian.org> Wed, 23 Oct 2002 18:23:15 +0200
+
xerces2-j (2.1.0-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 0ec5922..23b872a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: xerces2-j
Section: contrib/libs
Priority: optional
Maintainer: Stefan Gybas <sgybas at debian.org>
-Build-Depends-Indep: debhelper (>= 4.1.0), ant (>= 1.5-1), j2sdk (>= 1.4.0-1), libxerces-java, libxalan2-java
-Standards-Version: 3.5.7
+Uploaders: Takashi Okamoto <tora at debian.org>, Ola Lundqvist <opal at debian.org>
+Build-Depends-Indep: debhelper (>= 4.1.0), ant (>= 1.5-1), j2sdk1.4, jikes (>= 1.18), libxerces-java, libxalan2-java
+Standards-Version: 3.5.9
Package: libxerces2-java
Architecture: all
@@ -22,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..d2c4a3d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Build using the converted (using alien >= 8.08) JDK 1.4 RPM package from Sun
-export JAVA_HOME=/usr/lib/j2sdk1.4
+# Build using Blackdown's JDK 1.4 package
+export JAVA_HOME=/usr/lib/j2se/1.4
ANT=/usr/bin/ant
UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
@@ -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
More information about the pkg-java-commits
mailing list