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 11247fbe421df5fda8be4d018a99213211ee80d0 Author: Stefan Gybas <[email protected]> Date: Sun Apr 13 21:24:32 2003 +0000 Debian release 2.4.0-1 --- build.xml | 137 ++++++++++++++++++++++++++++++++----------------------- debian/changelog | 8 ++++ debian/control | 4 +- debian/rules | 4 +- 4 files changed, 93 insertions(+), 60 deletions(-) diff --git a/build.xml b/build.xml index 3e7e7e0..65f7aeb 100644 --- a/build.xml +++ b/build.xml @@ -34,9 +34,9 @@ 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.3.0'/> - <property name='parser.version' value='2.3.0'/> - <property name='parser_version' value='2_3_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='xml-apis.jar'/> @@ -121,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)"/> @@ -184,8 +183,7 @@ Copyright: excludes="**/classfiles_updated **/CVS* **/.#* **/XMLMessages.java **/DatatypeContentModel.java **/ComplexTypeInfo.java **/v1/** **/v2/** - javax.xml.parsers.ConvertToURI.java - org/apache/xerces/dom3/ls/**"> + javax.xml.parsers.ConvertToURI.java"> </fileset> </copy> @@ -219,6 +217,7 @@ Copyright: <xjavac srcdir="${build.src}" destdir="${build.dest}" + classpath="${build.dir}/classes:${tools.dir}/${jar.apis}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}" @@ -248,6 +247,10 @@ 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" @@ -259,7 +262,8 @@ Copyright: 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> <!-- =================================================================== --> @@ -291,7 +295,7 @@ Copyright: </copy> <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"/> @@ -646,7 +650,6 @@ Copyright: 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"/> @@ -696,6 +699,13 @@ Copyright: 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" @@ -708,9 +718,15 @@ Copyright: classpath="${tools.dir}/${jar.apis}:${build.dir}/classes" classname="dom.serialization.Test" failOnError="yes"> - <arg value="${data.dir}/personal.xml"/> + <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> <!-- =================================================================== --> @@ -755,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> <!-- =================================================================== --> @@ -833,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}"/> @@ -849,37 +889,6 @@ Copyright: </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" - 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"> - <!-- 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> - - <!-- =================================================================== --> <!-- Build xercesDV jar --> <!-- =================================================================== --> <target name="dvjar" depends="dvcompile"> @@ -921,13 +930,29 @@ 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, @@ -1013,7 +1038,7 @@ Copyright: **/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> @@ -1035,12 +1060,14 @@ Copyright: <!-- DOM level 3 hack: replace import statements--> <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" + <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"/> @@ -1072,8 +1099,6 @@ Copyright: 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" @@ -1110,7 +1135,7 @@ Copyright: <!-- =================================================================== --> <!-- 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}" /> @@ -1128,7 +1153,7 @@ Copyright: <xjavac srcdir="${build.samples}" destdir="${build.dest}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}" + classpath="${build.dir}/classes:${build.dir}/dom3-${jar.parser}:${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.apis}" debug="${debug}" includeAntRuntime="false" includeJavaRuntime="true"/> diff --git a/debian/changelog b/debian/changelog index f0f9466..33578f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 <[email protected]> Sun, 13 Apr 2003 18:50:54 +0200 + xerces2-j (2.3.0-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 23a624f..23b872a 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ 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.18), libxerces-java, libxalan2-java -Standards-Version: 3.5.8 +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 diff --git a/debian/rules b/debian/rules index 00037ba..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\-) -- 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
