[pkg-java] r16085 - in tags/dom4j: . 1.6.1+dfsg.2-6/debian 1.6.1+dfsg.2-6/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed May 30 00:18:43 UTC 2012
Author: drazzib
Date: 2012-05-30 00:18:42 +0000 (Wed, 30 May 2012)
New Revision: 16085
Added:
tags/dom4j/1.6.1+dfsg.2-6/
tags/dom4j/1.6.1+dfsg.2-6/debian/changelog
tags/dom4j/1.6.1+dfsg.2-6/debian/control
tags/dom4j/1.6.1+dfsg.2-6/debian/copyright
tags/dom4j/1.6.1+dfsg.2-6/debian/patches/java7-compat.patch
tags/dom4j/1.6.1+dfsg.2-6/debian/patches/oldchanges.patch
tags/dom4j/1.6.1+dfsg.2-6/debian/patches/series
Removed:
tags/dom4j/1.6.1+dfsg.2-6/debian/changelog
tags/dom4j/1.6.1+dfsg.2-6/debian/control
tags/dom4j/1.6.1+dfsg.2-6/debian/copyright
tags/dom4j/1.6.1+dfsg.2-6/debian/patches/oldchanges.patch
tags/dom4j/1.6.1+dfsg.2-6/debian/patches/series
Log:
[svn-buildpackage] Tagging dom4j 1.6.1+dfsg.2-6
Deleted: tags/dom4j/1.6.1+dfsg.2-6/debian/changelog
===================================================================
--- trunk/dom4j/debian/changelog 2012-05-28 23:09:51 UTC (rev 16073)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/changelog 2012-05-30 00:18:42 UTC (rev 16085)
@@ -1,87 +0,0 @@
-dom4j (1.6.1+dfsg.2-6) UNRELEASED; urgency=low
-
- * Team upload.
- * Remove Michael Koch from uploaders (Closes: #654011)
-
- -- tony mancill <tmancill at debian.org> Fri, 03 Feb 2012 21:26:13 -0800
-
-dom4j (1.6.1+dfsg.2-5) unstable; urgency=low
-
- * Team upload.
- * Remove Java runtime from Depends.
- * Switch to cdbs.
-
- -- Torsten Werner <twerner at debian.org> Wed, 17 Aug 2011 18:43:40 +0200
-
-dom4j (1.6.1+dfsg.2-4) unstable; urgency=low
-
- * debian/control, debian/rules: Build with default-jdk
-
- -- Thierry Carrez <thierry.carrez at ubuntu.com> Thu, 03 Jun 2010 16:14:12 +0200
-
-dom4j (1.6.1+dfsg.2-3) unstable; urgency=low
-
- * Team upload.
- * Update Homepage to point to sourceforge site.
- * Install POM file.
- * Ignore test failures.
- * Add missing ${misc:Depends}.
- * Switch to source format 3.0.
- * Update Standards-Version: 3.8.4.
-
- -- Torsten Werner <twerner at debian.org> Thu, 27 May 2010 22:14:45 +0200
-
-dom4j (1.6.1+dfsg.2-2) unstable; urgency=low
-
- * Make libdom4j-java Depend on default-jre-headless instead of kaffe.
- * Build-Depends on debhelper >= 7.
- * Use dh_prep instead of dh_clean -k.
- * Updated Standards-Version to 3.8.3.
-
- -- Michael Koch <konqueror at gmx.de> Fri, 25 Sep 2009 20:21:02 +0200
-
-dom4j (1.6.1+dfsg.2-1) unstable; urgency=low
-
- * Remove non-free generated files. (Closes: #529308)
- * Change section to java.
- * Remove source files from jaxen since we have (circular) build
- dependency on libjaxen-java. (Closes: #427913)
- * Re-enable test case BeansTest by running tests in headless
- mode. (Closes: #403052)
- * Build-depend on ant-optional, since we use ant in the clean target.
- * debian/copyright: Machine-readable copyright format.
- * debian/control: Bump standards-version to 3.8.2.
- * Include sample code, thanks to Mario Lang. (Closes: #536079)
-
- -- Marcus Better <marcus at better.se> Thu, 09 Jul 2009 20:34:46 +0200
-
-dom4j (1.6.1+dfsg-3) unstable; urgency=low
-
- * Build-Depends on openjdk-6-jdk instead of java-gcj-runtime-dev. Fixes
- ThreadingTest testcase. Closes: #427456
- * Disabled parts of MatrixConcatTest. This fails on *every* runtime.
- Closes: #439614
- * Added myself to Uploaders.
- * Added Homepage, Vcs-Svn and Vcs-Browser fields.
- * Updated Standards-Version to 3.7.3.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 10 Apr 2008 07:59:15 +0200
-
-dom4j (1.6.1+dfsg-2) unstable; urgency=high
-
- * The two classes from jaxen in package org.jaxen.dom4j were
- accidentally left out of the previous version. (Closes: #403039)
-
- -- Marcus Better <marcus at better.se> Thu, 14 Dec 2006 13:04:57 +0100
-
-dom4j (1.6.1+dfsg-1) unstable; urgency=low
-
- [ Wolfgang Baer ]
- * Disabled support for STAX and datatypes (xsdlib)
-
- [ Marcus Better ]
- * Initial release. (Closes: #305227)
- * Removed binary third-party jars from source tarball.
- * debian/rules: Don't use cdbs.
-
- -- Marcus Better <marcus at better.se> Mon, 9 Oct 2006 21:24:19 +0200
Copied: tags/dom4j/1.6.1+dfsg.2-6/debian/changelog (from rev 16084, trunk/dom4j/debian/changelog)
===================================================================
--- tags/dom4j/1.6.1+dfsg.2-6/debian/changelog (rev 0)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/changelog 2012-05-30 00:18:42 UTC (rev 16085)
@@ -0,0 +1,98 @@
+dom4j (1.6.1+dfsg.2-6) unstable; urgency=low
+
+ * Team upload.
+
+ [ tony mancill ]
+ * Remove Michael Koch from uploaders (Closes: #654011)
+
+ [ James Page ]
+ * Fix FTBFS with openjdk-7 (LP: #888121) (Closes: #673765):
+ - d/patches/java7-compat.patch: Fix compareTo function in Rule class
+ to ensure that comparisions are actually symmetric.
+
+ [ Damien Raude-Morvan ]
+ * Update Standards-Version: 3.9.3
+ * d/copyright: Update to copyright-format 1.0.
+
+ -- tony mancill <tmancill at debian.org> Fri, 03 Feb 2012 21:26:13 -0800
+
+dom4j (1.6.1+dfsg.2-5) unstable; urgency=low
+
+ * Team upload.
+ * Remove Java runtime from Depends.
+ * Switch to cdbs.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 17 Aug 2011 18:43:40 +0200
+
+dom4j (1.6.1+dfsg.2-4) unstable; urgency=low
+
+ * debian/control, debian/rules: Build with default-jdk
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com> Thu, 03 Jun 2010 16:14:12 +0200
+
+dom4j (1.6.1+dfsg.2-3) unstable; urgency=low
+
+ * Team upload.
+ * Update Homepage to point to sourceforge site.
+ * Install POM file.
+ * Ignore test failures.
+ * Add missing ${misc:Depends}.
+ * Switch to source format 3.0.
+ * Update Standards-Version: 3.8.4.
+
+ -- Torsten Werner <twerner at debian.org> Thu, 27 May 2010 22:14:45 +0200
+
+dom4j (1.6.1+dfsg.2-2) unstable; urgency=low
+
+ * Make libdom4j-java Depend on default-jre-headless instead of kaffe.
+ * Build-Depends on debhelper >= 7.
+ * Use dh_prep instead of dh_clean -k.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 25 Sep 2009 20:21:02 +0200
+
+dom4j (1.6.1+dfsg.2-1) unstable; urgency=low
+
+ * Remove non-free generated files. (Closes: #529308)
+ * Change section to java.
+ * Remove source files from jaxen since we have (circular) build
+ dependency on libjaxen-java. (Closes: #427913)
+ * Re-enable test case BeansTest by running tests in headless
+ mode. (Closes: #403052)
+ * Build-depend on ant-optional, since we use ant in the clean target.
+ * debian/copyright: Machine-readable copyright format.
+ * debian/control: Bump standards-version to 3.8.2.
+ * Include sample code, thanks to Mario Lang. (Closes: #536079)
+
+ -- Marcus Better <marcus at better.se> Thu, 09 Jul 2009 20:34:46 +0200
+
+dom4j (1.6.1+dfsg-3) unstable; urgency=low
+
+ * Build-Depends on openjdk-6-jdk instead of java-gcj-runtime-dev. Fixes
+ ThreadingTest testcase. Closes: #427456
+ * Disabled parts of MatrixConcatTest. This fails on *every* runtime.
+ Closes: #439614
+ * Added myself to Uploaders.
+ * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+ * Updated Standards-Version to 3.7.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 10 Apr 2008 07:59:15 +0200
+
+dom4j (1.6.1+dfsg-2) unstable; urgency=high
+
+ * The two classes from jaxen in package org.jaxen.dom4j were
+ accidentally left out of the previous version. (Closes: #403039)
+
+ -- Marcus Better <marcus at better.se> Thu, 14 Dec 2006 13:04:57 +0100
+
+dom4j (1.6.1+dfsg-1) unstable; urgency=low
+
+ [ Wolfgang Baer ]
+ * Disabled support for STAX and datatypes (xsdlib)
+
+ [ Marcus Better ]
+ * Initial release. (Closes: #305227)
+ * Removed binary third-party jars from source tarball.
+ * debian/rules: Don't use cdbs.
+
+ -- Marcus Better <marcus at better.se> Mon, 9 Oct 2006 21:24:19 +0200
Deleted: tags/dom4j/1.6.1+dfsg.2-6/debian/control
===================================================================
--- trunk/dom4j/debian/control 2012-05-28 23:09:51 UTC (rev 16073)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/control 2012-05-30 00:18:42 UTC (rev 16085)
@@ -1,29 +0,0 @@
-Source: dom4j
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Marcus Better <marcus at better.se>
-Build-Depends: debhelper (>= 7), ant-optional, default-jdk, maven-repo-helper, cdbs
-Build-Depends-Indep: antlr, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java
-Standards-Version: 3.8.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/dom4j
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/dom4j
-Homepage: http://sourceforge.net/projects/dom4j/
-
-Package: libdom4j-java
-Architecture: all
-Depends: ${misc:Depends}, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libbackport-util-concurrent-java
-Suggests: libdom4j-java-doc
-Description: flexible XML framework for Java
- dom4j is a library for working with XML, XPath and XSLT on the Java
- platform using the Java Collections Framework and with full support
- for DOM, SAX and JAXP.
-
-Package: libdom4j-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libdom4j-java
-Description: documentation for libdom4j-java
- This package contains the documentation for dom4j, including the API
- Javadoc.
Copied: tags/dom4j/1.6.1+dfsg.2-6/debian/control (from rev 16084, trunk/dom4j/debian/control)
===================================================================
--- tags/dom4j/1.6.1+dfsg.2-6/debian/control (rev 0)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/control 2012-05-30 00:18:42 UTC (rev 16085)
@@ -0,0 +1,29 @@
+Source: dom4j
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Marcus Better <marcus at better.se>
+Build-Depends: debhelper (>= 7), ant-optional, default-jdk, maven-repo-helper, cdbs
+Build-Depends-Indep: antlr, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java
+Standards-Version: 3.9.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/dom4j
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/dom4j
+Homepage: http://sourceforge.net/projects/dom4j/
+
+Package: libdom4j-java
+Architecture: all
+Depends: ${misc:Depends}, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libbackport-util-concurrent-java
+Suggests: libdom4j-java-doc
+Description: flexible XML framework for Java
+ dom4j is a library for working with XML, XPath and XSLT on the Java
+ platform using the Java Collections Framework and with full support
+ for DOM, SAX and JAXP.
+
+Package: libdom4j-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libdom4j-java
+Description: documentation for libdom4j-java
+ This package contains the documentation for dom4j, including the API
+ Javadoc.
Deleted: tags/dom4j/1.6.1+dfsg.2-6/debian/copyright
===================================================================
--- trunk/dom4j/debian/copyright 2012-05-28 23:09:51 UTC (rev 16073)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/copyright 2012-05-30 00:18:42 UTC (rev 16085)
@@ -1,52 +0,0 @@
-Format-Specification:
- http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=48
-Name: dom4j
-Maintainer: http://lists.sourceforge.net/lists/listinfo/dom4j-user
-Source: http://sourceforge.net/projects/dom4j/
-
-Copyright: 2001-2005, MetaStuff, Ltd.
-License: DOM4J
-
-Files: debian/*
-Copyright: Copyright 2006-2009, Marcus Better
-License: DOM4J
-
-License: DOM4J
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
- 2. Redistributions in binary form must reproduce the
- above copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
- 3. The name "DOM4J" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of MetaStuff, Ltd. For written permission,
- please contact dom4j-info at metastuff.com.
-
- 4. Products derived from this Software may not be called "DOM4J"
- nor may "DOM4J" appear in their names without prior written
- permission of MetaStuff, Ltd. DOM4J is a registered
- trademark of MetaStuff, Ltd.
-
- 5. Due credit should be given to the DOM4J Project -
- http://www.dom4j.org
-
- THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
Copied: tags/dom4j/1.6.1+dfsg.2-6/debian/copyright (from rev 16084, trunk/dom4j/debian/copyright)
===================================================================
--- tags/dom4j/1.6.1+dfsg.2-6/debian/copyright (rev 0)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/copyright 2012-05-30 00:18:42 UTC (rev 16085)
@@ -0,0 +1,52 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dom4j
+Upstream-Contact: http://lists.sourceforge.net/lists/listinfo/dom4j-user
+Source: http://sourceforge.net/projects/dom4j/
+
+Files: *
+Copyright: 2001-2005, MetaStuff, Ltd.
+License: DOM4J
+
+Files: debian/*
+Copyright: Copyright 2006-2009, Marcus Better
+License: DOM4J
+
+License: DOM4J
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain copyright
+ statements and notices. Redistributions must also contain a
+ copy of this document.
+ .
+ 2. Redistributions in binary form must reproduce the
+ above copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ .
+ 3. The name "DOM4J" must not be used to endorse or promote
+ products derived from this Software without prior written
+ permission of MetaStuff, Ltd. For written permission,
+ please contact dom4j-info at metastuff.com.
+ .
+ 4. Products derived from this Software may not be called "DOM4J"
+ nor may "DOM4J" appear in their names without prior written
+ permission of MetaStuff, Ltd. DOM4J is a registered
+ trademark of MetaStuff, Ltd.
+ .
+ 5. Due credit should be given to the DOM4J Project -
+ http://www.dom4j.org
+ .
+ THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
Copied: tags/dom4j/1.6.1+dfsg.2-6/debian/patches/java7-compat.patch (from rev 16084, trunk/dom4j/debian/patches/java7-compat.patch)
===================================================================
--- tags/dom4j/1.6.1+dfsg.2-6/debian/patches/java7-compat.patch (rev 0)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/patches/java7-compat.patch 2012-05-30 00:18:42 UTC (rev 16085)
@@ -0,0 +1,59 @@
+Description: Fixup compareTo function in Rule class to be compliant
+ with the Java 7 (and Java 6) API. Comparisons where not symmetric
+ with the upstream handling in this function:
+ .
+ r1 > r2 but ! r2 < r1
+ .
+ Also added extra tests to ensure that comparison works both ways.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+
+--- a/src/java/org/dom4j/rule/Rule.java
++++ b/src/java/org/dom4j/rule/Rule.java
+@@ -99,16 +99,16 @@
+ * @return DOCUMENT ME!
+ */
+ public int compareTo(Rule that) {
+- int answer = this.importPrecedence - that.importPrecedence;
+-
+- if (answer == 0) {
+- answer = (int) Math.round(this.priority - that.priority);
+-
+- if (answer == 0) {
+- answer = this.appearenceCount - that.appearenceCount;
+- }
++ int answer = 0;
++ if (this.importPrecedence != that.importPrecedence) {
++ answer = this.importPrecedence < that.importPrecedence ? -1 : 1;
++ }
++ else if (Double.compare(this.priority, that.priority) != 0) {
++ answer = Double.compare(this.priority, that.priority);
++ }
++ else if (this.appearenceCount != that.appearenceCount) {
++ answer = this.appearenceCount < that.appearenceCount ? -1 : 1;
+ }
+-
+ return answer;
+ }
+
+--- a/src/test/org/dom4j/rule/RuleTest.java
++++ b/src/test/org/dom4j/rule/RuleTest.java
+@@ -48,6 +48,18 @@
+
+ assertTrue("r1 > r2", value > 0);
+
++ value = r2.compareTo(r1);
++
++ System.out.println("Comparison: " + value);
++
++ assertTrue("r2 < r1", value < 0);
++
++ value = r1.compareTo(r1);
++
++ System.out.println("Comparison: " + value);
++
++ assertTrue("r1 == r1", value == 0);
++
+ ArrayList list = new ArrayList();
+ list.add(r1);
+ list.add(r2);
Deleted: tags/dom4j/1.6.1+dfsg.2-6/debian/patches/oldchanges.patch
===================================================================
--- trunk/dom4j/debian/patches/oldchanges.patch 2012-05-28 23:09:51 UTC (rev 16073)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/patches/oldchanges.patch 2012-05-30 00:18:42 UTC (rev 16085)
@@ -1,1135 +0,0 @@
-This patch should be cleaned up.
-Torsten Werner
-
---- dom4j-1.6.1+dfsg.2.orig/build.xml
-+++ dom4j-1.6.1+dfsg.2/build.xml
-@@ -16,13 +16,13 @@
- </path>
-
- <path id="test.classpath">
-- <path refid="compile.classpath" />
-- <fileset dir="./lib/test">
-- <include name="**/*.jar" />
-- </fileset>
-- <fileset dir="./lib/tools">
-- <include name="xalan*.jar" />
-- <include name="xerces*.jar" />
-+ <fileset dir="/usr/share/java">
-+ <include name="backport-util-concurrent.jar" />
-+ <include name="jaxen.jar" />
-+ <include name="junitperf.jar" />
-+ <include name="xalan2.jar" />
-+ <include name="xercesImpl.jar" />
-+ <include name="xpp3.jar" />
- </fileset>
- </path>
-
-@@ -146,6 +146,9 @@
- source="1.3"
- deprecation="${deprecation}"
- classpathref="compile.classpath">
-+ <exclude name="org/dom4j/datatype/**"/>
-+ <exclude name="org/dom4j/io/STAXEventReader.java"/>
-+ <exclude name="org/dom4j/io/STAXEventWriter.java"/>
- </javac>
- </target>
-
-@@ -159,6 +162,8 @@
- optimize="${optimize}"
- deprecation="${deprecation}"
- classpathref="test.classpath">
-+ <exclude name="org/dom4j/datatype/**"/>
-+ <exclude name="org/dom4j/io/StaxTest.java"/>
- </javac>
- </target>
-
-@@ -219,8 +224,7 @@
- doctitle="${Name}"
- bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
- stylesheetfile="${doc.dir}/style/javadoc.css">
-- <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
-- <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
-+ <link href="file:///usr/share/doc/classpath-doc/api"/>
- </javadoc>
-
- <mkdir dir="${build.apidocs}"/>
-@@ -236,8 +240,7 @@
- doctitle="${Name}"
- bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
- stylesheetfile="${doc.dir}/style/javadoc.css">
-- <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
-- <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
-+ <link href="file:///usr/share/doc/classpath-doc/api"/>
- <link href="${build.javadocs}"/>
- </javadoc>
- </target>
-@@ -278,10 +281,17 @@
- <path refid="test.classpath" />
- </classpath>
-
-+ <sysproperty key="org.xml.sax.driver"
-+ value="org.apache.xerces.parsers.SAXParser"/>
-+
- <batchtest fork="yes" todir="${build.dir}/test-results/xml">
- <fileset dir="${test.dir}">
- <include name="**/*Test.java" />
-- <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" />
-+ <exclude name="**/AllTests.java" />
-+ <exclude name="**/Abstract*.java" />
-+ <exclude name="**/TestCase.java" />
-+ <exclude name="**/StaxTest.java" />
-+ <exclude name="**/datatype/*Test.java" />
- </fileset>
- </batchtest>
- </junit>
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMDocumentType.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMDocumentType.java
-@@ -12,7 +12,9 @@ import org.dom4j.tree.DefaultDocumentTyp
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -177,6 +179,66 @@ public class DOMDocumentType extends Def
- public String getInternalSubset() {
- return getElementName();
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMProcessingInstruction.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMProcessingInstruction.java
-@@ -15,7 +15,9 @@ import org.dom4j.tree.DefaultProcessingI
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -177,6 +179,66 @@ public class DOMProcessingInstruction ex
- }
- }
-
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
- // Implementation methods
- // -------------------------------------------------------------------------
- }
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMAttribute.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMAttribute.java
-@@ -14,7 +14,10 @@ import org.dom4j.tree.DefaultAttribute;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.TypeInfo;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -179,6 +182,76 @@ public class DOMAttribute extends Defaul
- public org.w3c.dom.Element getOwnerElement() {
- return DOMNodeHelper.asDOMElement(getParent());
- }
-+
-+ public TypeInfo getSchemaTypeInfo() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isId() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node other) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String textContent) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node other) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String prefix) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String feature, String version) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String key, Object data, UserDataHandler handler) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String key) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMDocumentFactory.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMDocumentFactory.java
-@@ -174,6 +174,11 @@ public class DOMDocumentFactory extends
- docType.getPublicId(), docType.getSystemId());
- }
- }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
-
-@@ -213,4 +218,4 @@ public class DOMDocumentFactory extends
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-- */
-\ No newline at end of file
-+ */
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMComment.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMComment.java
-@@ -13,7 +13,9 @@ import org.dom4j.tree.DefaultComment;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -187,6 +189,66 @@ public class DOMComment extends DefaultC
- throws DOMException {
- DOMNodeHelper.replaceData(this, offset, count, arg);
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node other) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String textContent) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node other) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String prefix) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String feature, String version) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String key, Object data, UserDataHandler handler) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String key) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMNamespace.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMNamespace.java
-@@ -13,7 +13,9 @@ import org.dom4j.tree.DefaultNamespace;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -140,6 +142,66 @@ public class DOMNamespace extends Defaul
- public boolean hasAttributes() {
- return DOMNodeHelper.hasAttributes(this);
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMDocument.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMDocument.java
-@@ -15,12 +15,15 @@ import org.dom4j.tree.DefaultDocument;
-
- import org.w3c.dom.Attr;
- import org.w3c.dom.CDATASection;
-+import org.w3c.dom.DOMConfiguration;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.EntityReference;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
- import org.w3c.dom.ProcessingInstruction;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -301,6 +304,136 @@ public class DOMDocument extends Default
- return super.getDocumentFactory();
- }
- }
-+
-+ public String getInputEncoding() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getXmlEncoding() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean getXmlStandalone() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public void setXmlStandalone(boolean arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public String getXmlVersion() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setXmlVersion(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean getStrictErrorChecking() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public void setStrictErrorChecking(boolean arg0) {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public String getDocumentURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setDocumentURI(String arg0) {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public Node adoptNode(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public DOMConfiguration getDomConfig() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void normalizeDocument() {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public Node renameNode(Node arg0, String arg1, String arg2) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMEntityReference.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMEntityReference.java
-@@ -13,7 +13,9 @@ import org.dom4j.tree.DefaultEntity;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -166,6 +168,66 @@ public class DOMEntityReference extends
- public boolean hasAttributes() {
- return DOMNodeHelper.hasAttributes(this);
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMText.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMText.java
-@@ -14,7 +14,9 @@ import org.dom4j.tree.DefaultText;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -224,6 +226,81 @@ public class DOMText extends DefaultText
- protected Text createText(String text) {
- return new DOMText(text);
- }
-+
-+ public boolean isElementContentWhitespace() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String getWholeText() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public org.w3c.dom.Text replaceWholeText(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMCDATA.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMCDATA.java
-@@ -14,7 +14,10 @@ import org.dom4j.tree.DefaultCDATA;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.Text;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -225,6 +228,81 @@ public class DOMCDATA extends DefaultCDA
- protected CDATA createCDATA(String text) {
- return new DOMCDATA(text);
- }
-+
-+ public boolean isElementContentWhitespace() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String getWholeText() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Text replaceWholeText(String content) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node other) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String textContent) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node other) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String prefix) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String feature, String version) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String key, Object data, UserDataHandler handler) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String key) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMElement.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMElement.java
-@@ -16,11 +16,14 @@ import org.dom4j.Namespace;
- import org.dom4j.QName;
- import org.dom4j.tree.DefaultElement;
-
-+import org.w3c.dom.Attr;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
- import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.TypeInfo;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -389,6 +392,86 @@ public class DOMElement extends DefaultE
-
- return getDocumentFactory().createQName(localName, prefix, namespace);
- }
-+
-+ public TypeInfo getSchemaTypeInfo() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setIdAttribute(String arg0, boolean arg1) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public void setIdAttributeNS(String arg0, String arg1, boolean arg2) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public void setIdAttributeNode(Attr arg0, boolean arg1) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/tree/NamespaceCache.java
-+++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/tree/NamespaceCache.java
-@@ -26,42 +26,46 @@ import org.dom4j.Namespace;
- * @version $Revision: 1.15 $
- */
- public class NamespaceCache {
-- private static final String CONCURRENTREADERHASHMAP_CLASS
-- = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap";
-+ private static final String BACKPORT_CONCURRENTHASHMAP_CLASS
-+ = "edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap";
-+ private static final String OSWEGO_CONCURRENTHASHMAP_CLASS
-+ = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap";
-
- /**
- * Cache of {@link Map}instances indexed by URI which contain caches of
- * {@link Namespace}for each prefix
- */
-- protected static Map cache;
-+ protected static Map cache = newConcurrentHashMap();
-
- /**
- * Cache of {@link Namespace}instances indexed by URI for default
- * namespaces with no prefixes
- */
-- protected static Map noPrefixCache;
-+ protected static Map noPrefixCache = newConcurrentHashMap();
-
-- static {
-+ protected static Map newConcurrentHashMap()
-+ {
- /* Try the java.util.concurrent.ConcurrentHashMap first. */
- try {
- Class clazz = Class
- .forName("java.util.concurrent.ConcurrentHashMap");
- Constructor construct = clazz.getConstructor(new Class[] {
- Integer.TYPE, Float.TYPE, Integer.TYPE });
-- cache = (Map) construct.newInstance(new Object[] {new Integer(11),
-+ return (Map) construct.newInstance(new Object[] {new Integer(11),
- new Float(0.75f), new Integer(1) });
-- noPrefixCache = (Map) construct.newInstance(new Object[] {
-- new Integer(11), new Float(0.75f), new Integer(1) });
- } catch (Throwable t1) {
-- /* Try to use the util.concurrent library (if in classpath) */
- try {
-- Class clazz = Class.forName(CONCURRENTREADERHASHMAP_CLASS);
-- cache = (Map) clazz.newInstance();
-- noPrefixCache = (Map) clazz.newInstance();
-+ /* Try to use the backport-util-concurrent library */
-+ Class clazz = Class.forName(BACKPORT_CONCURRENTHASHMAP_CLASS);
-+ return (Map) clazz.newInstance();
- } catch (Throwable t2) {
-- /* If previous implementations fail, use internal one */
-- cache = new ConcurrentReaderHashMap();
-- noPrefixCache = new ConcurrentReaderHashMap();
-+ try {
-+ /* Try to use the oswego concurrent library */
-+ Class clazz = Class.forName(OSWEGO_CONCURRENTHASHMAP_CLASS);
-+ return (Map) clazz.newInstance();
-+ } catch (Throwable t3) {
-+ return null;
-+ }
- }
- }
- }
-@@ -154,7 +158,7 @@ public class NamespaceCache {
- answer = (Map) cache.get(uri);
-
- if (answer == null) {
-- answer = new ConcurrentReaderHashMap();
-+ answer = newConcurrentHashMap();
- cache.put(uri, answer);
- }
- }
---- dom4j-1.6.1+dfsg.2.orig/src/test/org/dom4j/xpath/MatrixConcatTest.java
-+++ dom4j-1.6.1+dfsg.2/src/test/org/dom4j/xpath/MatrixConcatTest.java
-@@ -33,9 +33,11 @@ public class MatrixConcatTest extends Ab
-
- String[] exp2 = {"EQUITY_BAR_CF1", "EQUITY_BAR_CF2", "EQUITY_BAR_CF3"};
-
-+ /* Disabled. Doesn't wor k with any JVM I found.
- testMatrixConcat("'EQUITY_',/product/cashflows/CashFlow/XREF", exp1);
- testMatrixConcat("'EQUITY_','BAR_',/product/cashflows/CashFlow/XREF",
- exp2);
-+ */
- }
-
- // Implementation methods
---- dom4j-1.6.1+dfsg.2.orig/xml/bean/gui.xml
-+++ dom4j-1.6.1+dfsg.2/xml/bean/gui.xml
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <widgets>
-- <window class="javax.swing.JFrame" title="Frame #1"/>
-- <window class="javax.swing.JFrame" title="Frame #2"/>
-+ <window class="java.awt.Canvas" title="Frame #1"/>
-+ <window class="java.awt.Canvas" title="Frame #2"/>
- </widgets>
Copied: tags/dom4j/1.6.1+dfsg.2-6/debian/patches/oldchanges.patch (from rev 16084, trunk/dom4j/debian/patches/oldchanges.patch)
===================================================================
--- tags/dom4j/1.6.1+dfsg.2-6/debian/patches/oldchanges.patch (rev 0)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/patches/oldchanges.patch 2012-05-30 00:18:42 UTC (rev 16085)
@@ -0,0 +1,1165 @@
+This patch should be cleaned up.
+Torsten Werner
+
+Index: dom4j/build.xml
+===================================================================
+--- dom4j.orig/build.xml 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/build.xml 2012-05-21 10:02:51.481930000 +0100
+@@ -16,13 +16,13 @@
+ </path>
+
+ <path id="test.classpath">
+- <path refid="compile.classpath" />
+- <fileset dir="./lib/test">
+- <include name="**/*.jar" />
+- </fileset>
+- <fileset dir="./lib/tools">
+- <include name="xalan*.jar" />
+- <include name="xerces*.jar" />
++ <fileset dir="/usr/share/java">
++ <include name="backport-util-concurrent.jar" />
++ <include name="jaxen.jar" />
++ <include name="junitperf.jar" />
++ <include name="xalan2.jar" />
++ <include name="xercesImpl.jar" />
++ <include name="xpp3.jar" />
+ </fileset>
+ </path>
+
+@@ -146,6 +146,9 @@
+ source="1.3"
+ deprecation="${deprecation}"
+ classpathref="compile.classpath">
++ <exclude name="org/dom4j/datatype/**"/>
++ <exclude name="org/dom4j/io/STAXEventReader.java"/>
++ <exclude name="org/dom4j/io/STAXEventWriter.java"/>
+ </javac>
+ </target>
+
+@@ -159,6 +162,8 @@
+ optimize="${optimize}"
+ deprecation="${deprecation}"
+ classpathref="test.classpath">
++ <exclude name="org/dom4j/datatype/**"/>
++ <exclude name="org/dom4j/io/StaxTest.java"/>
+ </javac>
+ </target>
+
+@@ -219,8 +224,7 @@
+ doctitle="${Name}"
+ bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
+ stylesheetfile="${doc.dir}/style/javadoc.css">
+- <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
+- <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
++ <link href="file:///usr/share/doc/classpath-doc/api"/>
+ </javadoc>
+
+ <mkdir dir="${build.apidocs}"/>
+@@ -236,8 +240,7 @@
+ doctitle="${Name}"
+ bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
+ stylesheetfile="${doc.dir}/style/javadoc.css">
+- <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
+- <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
++ <link href="file:///usr/share/doc/classpath-doc/api"/>
+ <link href="${build.javadocs}"/>
+ </javadoc>
+ </target>
+@@ -278,10 +281,17 @@
+ <path refid="test.classpath" />
+ </classpath>
+
++ <sysproperty key="org.xml.sax.driver"
++ value="org.apache.xerces.parsers.SAXParser"/>
++
+ <batchtest fork="yes" todir="${build.dir}/test-results/xml">
+ <fileset dir="${test.dir}">
+ <include name="**/*Test.java" />
+- <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" />
++ <exclude name="**/AllTests.java" />
++ <exclude name="**/Abstract*.java" />
++ <exclude name="**/TestCase.java" />
++ <exclude name="**/StaxTest.java" />
++ <exclude name="**/datatype/*Test.java" />
+ </fileset>
+ </batchtest>
+ </junit>
+Index: dom4j/src/java/org/dom4j/dom/DOMDocumentType.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMDocumentType.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMDocumentType.java 2012-05-21 10:02:51.481930000 +0100
+@@ -12,7 +12,9 @@
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -177,6 +179,66 @@
+ public String getInternalSubset() {
+ return getElementName();
+ }
++
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node arg0) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String arg0) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String arg0, String arg1) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+ /*
+Index: dom4j/src/java/org/dom4j/dom/DOMProcessingInstruction.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMProcessingInstruction.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMProcessingInstruction.java 2012-05-21 10:02:51.481930000 +0100
+@@ -15,7 +15,9 @@
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -177,6 +179,66 @@
+ }
+ }
+
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node arg0) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String arg0) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String arg0, String arg1) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
+ // Implementation methods
+ // -------------------------------------------------------------------------
+ }
+Index: dom4j/src/java/org/dom4j/dom/DOMAttribute.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMAttribute.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMAttribute.java 2012-05-21 10:02:51.481930000 +0100
+@@ -14,7 +14,10 @@
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.TypeInfo;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -179,6 +182,76 @@
+ public org.w3c.dom.Element getOwnerElement() {
+ return DOMNodeHelper.asDOMElement(getParent());
+ }
++
++ public TypeInfo getSchemaTypeInfo() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isId() {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node other) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String textContent) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node other) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String namespaceURI) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String namespaceURI) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String prefix) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String feature, String version) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String key, Object data, UserDataHandler handler) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String key) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+ /*
+Index: dom4j/src/java/org/dom4j/dom/DOMDocumentFactory.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMDocumentFactory.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMDocumentFactory.java 2012-05-21 10:02:51.481930000 +0100
+@@ -174,6 +174,11 @@
+ docType.getPublicId(), docType.getSystemId());
+ }
+ }
++
++ public Object getFeature(String arg0, String arg1) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+
+@@ -213,4 +218,4 @@
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+- */
+\ No newline at end of file
++ */
+Index: dom4j/src/java/org/dom4j/dom/DOMComment.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMComment.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMComment.java 2012-05-21 10:02:51.481930000 +0100
+@@ -13,7 +13,9 @@
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -187,6 +189,66 @@
+ throws DOMException {
+ DOMNodeHelper.replaceData(this, offset, count, arg);
+ }
++
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node other) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String textContent) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node other) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String namespaceURI) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String namespaceURI) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String prefix) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String feature, String version) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String key, Object data, UserDataHandler handler) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String key) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+ /*
+Index: dom4j/src/java/org/dom4j/dom/DOMNamespace.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMNamespace.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMNamespace.java 2012-05-21 10:02:51.481930000 +0100
+@@ -13,7 +13,9 @@
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -140,6 +142,66 @@
+ public boolean hasAttributes() {
+ return DOMNodeHelper.hasAttributes(this);
+ }
++
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node arg0) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String arg0) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String arg0, String arg1) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+ /*
+Index: dom4j/src/java/org/dom4j/dom/DOMDocument.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMDocument.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMDocument.java 2012-05-21 10:02:51.481930000 +0100
+@@ -15,12 +15,15 @@
+
+ import org.w3c.dom.Attr;
+ import org.w3c.dom.CDATASection;
++import org.w3c.dom.DOMConfiguration;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.EntityReference;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
+ import org.w3c.dom.ProcessingInstruction;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -301,6 +304,136 @@
+ return super.getDocumentFactory();
+ }
+ }
++
++ public String getInputEncoding() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public String getXmlEncoding() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean getXmlStandalone() {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public void setXmlStandalone(boolean arg0) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public String getXmlVersion() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setXmlVersion(String arg0) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean getStrictErrorChecking() {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public void setStrictErrorChecking(boolean arg0) {
++ // TODO Auto-generated method stub
++
++ }
++
++ public String getDocumentURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setDocumentURI(String arg0) {
++ // TODO Auto-generated method stub
++
++ }
++
++ public Node adoptNode(Node arg0) throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public DOMConfiguration getDomConfig() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void normalizeDocument() {
++ // TODO Auto-generated method stub
++
++ }
++
++ public Node renameNode(Node arg0, String arg1, String arg2) throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node arg0) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String arg0) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String arg0, String arg1) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+ /*
+Index: dom4j/src/java/org/dom4j/dom/DOMEntityReference.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMEntityReference.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMEntityReference.java 2012-05-21 10:02:51.481930000 +0100
+@@ -13,7 +13,9 @@
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -166,6 +168,66 @@
+ public boolean hasAttributes() {
+ return DOMNodeHelper.hasAttributes(this);
+ }
++
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node arg0) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String arg0) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String arg0, String arg1) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+ /*
+Index: dom4j/src/java/org/dom4j/dom/DOMText.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMText.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMText.java 2012-05-21 10:02:51.481930000 +0100
+@@ -14,7 +14,9 @@
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -224,6 +226,81 @@
+ protected Text createText(String text) {
+ return new DOMText(text);
+ }
++
++ public boolean isElementContentWhitespace() {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String getWholeText() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public org.w3c.dom.Text replaceWholeText(String arg0) throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node arg0) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String arg0) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String arg0, String arg1) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+ /*
+Index: dom4j/src/java/org/dom4j/dom/DOMCDATA.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMCDATA.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMCDATA.java 2012-05-21 10:02:51.481930000 +0100
+@@ -14,7 +14,10 @@
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.Text;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -225,6 +228,81 @@
+ protected CDATA createCDATA(String text) {
+ return new DOMCDATA(text);
+ }
++
++ public boolean isElementContentWhitespace() {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String getWholeText() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Text replaceWholeText(String content) throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node other) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String textContent) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node other) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String namespaceURI) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String namespaceURI) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String prefix) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String feature, String version) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String key, Object data, UserDataHandler handler) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String key) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+ /*
+Index: dom4j/src/java/org/dom4j/dom/DOMElement.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/dom/DOMElement.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/dom/DOMElement.java 2012-05-21 10:02:51.481930000 +0100
+@@ -16,11 +16,14 @@
+ import org.dom4j.QName;
+ import org.dom4j.tree.DefaultElement;
+
++import org.w3c.dom.Attr;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
+ import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.TypeInfo;
++import org.w3c.dom.UserDataHandler;
+
+ /**
+ * <p>
+@@ -389,6 +392,86 @@
+
+ return getDocumentFactory().createQName(localName, prefix, namespace);
+ }
++
++ public TypeInfo getSchemaTypeInfo() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setIdAttribute(String arg0, boolean arg1) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public void setIdAttributeNS(String arg0, String arg1, boolean arg2) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public void setIdAttributeNode(Attr arg0, boolean arg1) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public String getBaseURI() {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public short compareDocumentPosition(Node arg0) throws DOMException {
++ // TODO Auto-generated method stub
++ return 0;
++ }
++
++ public String getTextContent() throws DOMException {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public void setTextContent(String arg0) throws DOMException {
++ // TODO Auto-generated method stub
++
++ }
++
++ public boolean isSameNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupPrefix(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isDefaultNamespace(String arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public String lookupNamespaceURI(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public boolean isEqualNode(Node arg0) {
++ // TODO Auto-generated method stub
++ return false;
++ }
++
++ public Object getFeature(String arg0, String arg1) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++ // TODO Auto-generated method stub
++ return null;
++ }
++
++ public Object getUserData(String arg0) {
++ // TODO Auto-generated method stub
++ return null;
++ }
+ }
+
+ /*
+Index: dom4j/src/java/org/dom4j/tree/NamespaceCache.java
+===================================================================
+--- dom4j.orig/src/java/org/dom4j/tree/NamespaceCache.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/java/org/dom4j/tree/NamespaceCache.java 2012-05-21 10:02:51.481930000 +0100
+@@ -26,42 +26,46 @@
+ * @version $Revision: 1.15 $
+ */
+ public class NamespaceCache {
+- private static final String CONCURRENTREADERHASHMAP_CLASS
+- = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap";
++ private static final String BACKPORT_CONCURRENTHASHMAP_CLASS
++ = "edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap";
++ private static final String OSWEGO_CONCURRENTHASHMAP_CLASS
++ = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap";
+
+ /**
+ * Cache of {@link Map}instances indexed by URI which contain caches of
+ * {@link Namespace}for each prefix
+ */
+- protected static Map cache;
++ protected static Map cache = newConcurrentHashMap();
+
+ /**
+ * Cache of {@link Namespace}instances indexed by URI for default
+ * namespaces with no prefixes
+ */
+- protected static Map noPrefixCache;
++ protected static Map noPrefixCache = newConcurrentHashMap();
+
+- static {
++ protected static Map newConcurrentHashMap()
++ {
+ /* Try the java.util.concurrent.ConcurrentHashMap first. */
+ try {
+ Class clazz = Class
+ .forName("java.util.concurrent.ConcurrentHashMap");
+ Constructor construct = clazz.getConstructor(new Class[] {
+ Integer.TYPE, Float.TYPE, Integer.TYPE });
+- cache = (Map) construct.newInstance(new Object[] {new Integer(11),
++ return (Map) construct.newInstance(new Object[] {new Integer(11),
+ new Float(0.75f), new Integer(1) });
+- noPrefixCache = (Map) construct.newInstance(new Object[] {
+- new Integer(11), new Float(0.75f), new Integer(1) });
+ } catch (Throwable t1) {
+- /* Try to use the util.concurrent library (if in classpath) */
+ try {
+- Class clazz = Class.forName(CONCURRENTREADERHASHMAP_CLASS);
+- cache = (Map) clazz.newInstance();
+- noPrefixCache = (Map) clazz.newInstance();
++ /* Try to use the backport-util-concurrent library */
++ Class clazz = Class.forName(BACKPORT_CONCURRENTHASHMAP_CLASS);
++ return (Map) clazz.newInstance();
+ } catch (Throwable t2) {
+- /* If previous implementations fail, use internal one */
+- cache = new ConcurrentReaderHashMap();
+- noPrefixCache = new ConcurrentReaderHashMap();
++ try {
++ /* Try to use the oswego concurrent library */
++ Class clazz = Class.forName(OSWEGO_CONCURRENTHASHMAP_CLASS);
++ return (Map) clazz.newInstance();
++ } catch (Throwable t3) {
++ return null;
++ }
+ }
+ }
+ }
+@@ -154,7 +158,7 @@
+ answer = (Map) cache.get(uri);
+
+ if (answer == null) {
+- answer = new ConcurrentReaderHashMap();
++ answer = newConcurrentHashMap();
+ cache.put(uri, answer);
+ }
+ }
+Index: dom4j/src/test/org/dom4j/xpath/MatrixConcatTest.java
+===================================================================
+--- dom4j.orig/src/test/org/dom4j/xpath/MatrixConcatTest.java 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/src/test/org/dom4j/xpath/MatrixConcatTest.java 2012-05-21 10:02:51.481930000 +0100
+@@ -33,9 +33,11 @@
+
+ String[] exp2 = {"EQUITY_BAR_CF1", "EQUITY_BAR_CF2", "EQUITY_BAR_CF3"};
+
++ /* Disabled. Doesn't wor k with any JVM I found.
+ testMatrixConcat("'EQUITY_',/product/cashflows/CashFlow/XREF", exp1);
+ testMatrixConcat("'EQUITY_','BAR_',/product/cashflows/CashFlow/XREF",
+ exp2);
++ */
+ }
+
+ // Implementation methods
+Index: dom4j/xml/bean/gui.xml
+===================================================================
+--- dom4j.orig/xml/bean/gui.xml 2012-05-21 10:02:51.481930000 +0100
++++ dom4j/xml/bean/gui.xml 2012-05-21 10:02:51.481930000 +0100
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <widgets>
+- <window class="javax.swing.JFrame" title="Frame #1"/>
+- <window class="javax.swing.JFrame" title="Frame #2"/>
++ <window class="java.awt.Canvas" title="Frame #1"/>
++ <window class="java.awt.Canvas" title="Frame #2"/>
+ </widgets>
Deleted: tags/dom4j/1.6.1+dfsg.2-6/debian/patches/series
===================================================================
--- trunk/dom4j/debian/patches/series 2012-05-28 23:09:51 UTC (rev 16073)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/patches/series 2012-05-30 00:18:42 UTC (rev 16085)
@@ -1 +0,0 @@
-oldchanges.patch
Copied: tags/dom4j/1.6.1+dfsg.2-6/debian/patches/series (from rev 16084, trunk/dom4j/debian/patches/series)
===================================================================
--- tags/dom4j/1.6.1+dfsg.2-6/debian/patches/series (rev 0)
+++ tags/dom4j/1.6.1+dfsg.2-6/debian/patches/series 2012-05-30 00:18:42 UTC (rev 16085)
@@ -0,0 +1,2 @@
+oldchanges.patch
+java7-compat.patch
More information about the pkg-java-commits
mailing list