[pkg-java] r16547 - in trunk/dom4j/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Tue Apr 16 10:16:08 UTC 2013
Author: ebourg-guest
Date: 2013-04-16 10:16:08 +0000 (Tue, 16 Apr 2013)
New Revision: 16547
Added:
trunk/dom4j/debian/orig-tar.exclude
trunk/dom4j/debian/orig-tar.sh
trunk/dom4j/debian/patches/01_build-tweaks.patch
trunk/dom4j/debian/patches/02_disable-matrix-concat-test.patch
trunk/dom4j/debian/patches/03_remove-non-free-map.patch
trunk/dom4j/debian/patches/04_headless-test.patch
trunk/dom4j/debian/patches/05_java7-compat.patch
trunk/dom4j/debian/patches/06_dom-level3-support.patch
Removed:
trunk/dom4j/debian/README.Debian
trunk/dom4j/debian/patches/java7-compat.patch
trunk/dom4j/debian/patches/oldchanges.patch
Modified:
trunk/dom4j/debian/README.Debian.source
trunk/dom4j/debian/changelog
trunk/dom4j/debian/control
trunk/dom4j/debian/patches/series
trunk/dom4j/debian/rules
trunk/dom4j/debian/watch
Log:
Removed the dependency on backport-util-concurrent
Update Standards-Version: 3.9.4 (no changes)
debian/rules: Added a get-orig-source target to fetch the upstream tarball. The generated content, jars and non free classes are filtered on the fly.
Enabled XSD support by adding a dependency on libmsv-java
Link the Javadoc to the default JRE doc instead of the GNU Classpath doc
Reorganized the patches into smaller units
Fixed the Debian version mangling in debian/watch
Deleted: trunk/dom4j/debian/README.Debian
===================================================================
--- trunk/dom4j/debian/README.Debian 2013-04-16 04:19:55 UTC (rev 16546)
+++ trunk/dom4j/debian/README.Debian 2013-04-16 10:16:08 UTC (rev 16547)
@@ -1,7 +0,0 @@
-dom4j for Debian
-----------------
-
-dom4j for debian is currently built without support for XSD and xsd because of
-license issues.
-
- -- Marcus Better <marcus at better.se>, Tue, 19 May 2009 09:49:14 +0200
Modified: trunk/dom4j/debian/README.Debian.source
===================================================================
--- trunk/dom4j/debian/README.Debian.source 2013-04-16 04:19:55 UTC (rev 16546)
+++ trunk/dom4j/debian/README.Debian.source 2013-04-16 10:16:08 UTC (rev 16547)
@@ -4,8 +4,8 @@
* Binary-only jars in the `lib' directory and its subdirectories.
* `src/java/org/dom4j/tree/ConcurrentReaderHashMap.java' which comes
- from Sun Microsystems and cannot be legally distributed. It is
- replaced by the classes from the backport-util-concurrent package.
+ from Sun Microsystems and cannot be legally distributed. This class
+ is not used when the java.util.concurrent package is present.
* The generated files
`docs/clover/org/dom4j/tree/ConcurrentReaderHashMap.html' and
Modified: trunk/dom4j/debian/changelog
===================================================================
--- trunk/dom4j/debian/changelog 2013-04-16 04:19:55 UTC (rev 16546)
+++ trunk/dom4j/debian/changelog 2013-04-16 10:16:08 UTC (rev 16547)
@@ -1,7 +1,21 @@
-dom4j (1.6.1+dfsg.2-6) UNRELEASED; urgency=low
+dom4j (1.6.1+dfsg.2-7) experimental; urgency=low
* Team upload.
+ * Removed the dependency on backport-util-concurrent
+ * Update Standards-Version: 3.9.4 (no changes)
+ * debian/rules: Added a get-orig-source target to fetch the upstream tarball.
+ The generated content, jars and non free classes are filtered on the fly.
+ * Enabled XSD support by adding a dependency on libmsv-java
+ * Link the Javadoc to the default JRE doc instead of the Classpath doc
+ * Reorganized the patches into smaller units
+ * Fixed the Debian version mangling in debian/watch
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 15 Apr 2013 17:40:26 +0200
+
+dom4j (1.6.1+dfsg.2-6) unstable; urgency=low
+
+ * Team upload.
+
[ tony mancill ]
* Remove Michael Koch from uploaders (Closes: #654011)
Modified: trunk/dom4j/debian/control
===================================================================
--- trunk/dom4j/debian/control 2013-04-16 04:19:55 UTC (rev 16546)
+++ trunk/dom4j/debian/control 2013-04-16 10:16:08 UTC (rev 16547)
@@ -4,15 +4,17 @@
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
+Build-Depends-Indep: antlr, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java,
+ libxerces2-java, libxalan2-java (>= 2.7.0), junit, libjunitperf-java, libmsv-java,
+ librelaxng-datatype-java
+Standards-Version: 3.9.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
+Depends: ${misc:Depends}, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-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
Added: trunk/dom4j/debian/orig-tar.exclude
===================================================================
--- trunk/dom4j/debian/orig-tar.exclude (rev 0)
+++ trunk/dom4j/debian/orig-tar.exclude 2013-04-16 10:16:08 UTC (rev 16547)
@@ -0,0 +1,9 @@
+*.jar
+lib/*.jar
+lib/endorsed/*
+lib/test/*
+lib/tools/*
+docs/apidocs/*
+docs/clover/org/dom4j/tree/ConcurrentReaderHashMap.html
+docs/xref/org/dom4j/tree/ConcurrentReaderHashMap.html
+src/java/org/dom4j/tree/ConcurrentReaderHashMap.java
Added: trunk/dom4j/debian/orig-tar.sh
===================================================================
--- trunk/dom4j/debian/orig-tar.sh (rev 0)
+++ trunk/dom4j/debian/orig-tar.sh 2013-04-16 10:16:08 UTC (rev 16547)
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DEBIAN_VERSION=$2
+DIR=dom4j-$DEBIAN_VERSION
+TAR=../dom4j_$DEBIAN_VERSION+dfsg.2.orig.tar.gz
+
+# clean up the upstream tarball
+tar zxf $3
+rm -f $3
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
+
+exit 0
Property changes on: trunk/dom4j/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/dom4j/debian/patches/01_build-tweaks.patch
===================================================================
--- trunk/dom4j/debian/patches/01_build-tweaks.patch (rev 0)
+++ trunk/dom4j/debian/patches/01_build-tweaks.patch 2013-04-16 10:16:08 UTC (rev 16547)
@@ -0,0 +1,58 @@
+Description:
+ Link the Javadoc with the Java API installed with default-jre
+ Fix the classpath for the tests
+ Ignore test failures
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -24,6 +24,15 @@
+ <include name="xalan*.jar" />
+ <include name="xerces*.jar" />
+ </fileset>
++ <fileset dir="/usr/share/java">
++ <include name="jaxen.jar" />
++ <include name="junitperf.jar" />
++ <include name="relaxngDatatype.jar" />
++ <include name="xalan2.jar" />
++ <include name="xercesImpl.jar" />
++ <include name="xpp3.jar" />
++ <include name="xsdlib.jar" />
++ </fileset>
+ </path>
+
+ <path id="samples.classpath">
+@@ -155,6 +164,7 @@
+ <target name="compile-test" depends="compile">
+ <javac srcdir="${test.dir}"
+ destdir="${build.dest}"
++ encoding="ISO-8859-1"
+ debug="${debug}"
+ optimize="${optimize}"
+ deprecation="${deprecation}"
+@@ -219,7 +229,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="/usr/share/doc/default-jre/api"/>
+ <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
+ </javadoc>
+
+@@ -236,7 +246,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="/usr/share/doc/default-jre/api"/>
+ <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
+ <link href="${build.javadocs}"/>
+ </javadoc>
+@@ -270,7 +280,7 @@
+ <!-- =================================================================== -->
+ <target name="test" depends="compile-test">
+ <mkdir dir="${build.dir}/test-results/xml"/>
+- <junit printsummary="yes" haltonfailure="yes">
++ <junit printsummary="yes" haltonfailure="no">
+ <formatter type="xml"/>
+
+ <classpath>
Added: trunk/dom4j/debian/patches/02_disable-matrix-concat-test.patch
===================================================================
--- trunk/dom4j/debian/patches/02_disable-matrix-concat-test.patch (rev 0)
+++ trunk/dom4j/debian/patches/02_disable-matrix-concat-test.patch 2013-04-16 10:16:08 UTC (rev 16547)
@@ -0,0 +1,18 @@
+Description: Disable the matrix concat test
+Bug-Debian: http://bugs.debian.org/439614
+Forwarded: not-needed
+--- a/src/test/org/dom4j/xpath/MatrixConcatTest.java
++++ b/src/test/org/dom4j/xpath/MatrixConcatTest.java
+@@ -32,10 +32,11 @@
+ String[] exp1 = {"EQUITY_CF1", "EQUITY_CF2", "EQUITY_CF3"};
+
+ 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
Added: trunk/dom4j/debian/patches/03_remove-non-free-map.patch
===================================================================
--- trunk/dom4j/debian/patches/03_remove-non-free-map.patch (rev 0)
+++ trunk/dom4j/debian/patches/03_remove-non-free-map.patch 2013-04-16 10:16:08 UTC (rev 16547)
@@ -0,0 +1,69 @@
+Description: Remove the usages of the non free ConcurrentReaderHashMap class.
+Forwarded: not-needed
+--- a/src/java/org/dom4j/tree/NamespaceCache.java
++++ b/src/java/org/dom4j/tree/NamespaceCache.java
+@@ -10,6 +10,7 @@
+ import java.lang.ref.WeakReference;
+ import java.lang.reflect.Constructor;
+ import java.util.Map;
++import java.util.concurrent.ConcurrentHashMap;
+
+ import org.dom4j.Namespace;
+
+@@ -26,45 +27,17 @@
+ * @version $Revision: 1.15 $
+ */
+ public class NamespaceCache {
+- private static final String CONCURRENTREADERHASHMAP_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 = new ConcurrentHashMap();
+
+ /**
+ * Cache of {@link Namespace}instances indexed by URI for default
+ * namespaces with no prefixes
+ */
+- protected static Map noPrefixCache;
+-
+- static {
+- /* 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),
+- 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();
+- } catch (Throwable t2) {
+- /* If previous implementations fail, use internal one */
+- cache = new ConcurrentReaderHashMap();
+- noPrefixCache = new ConcurrentReaderHashMap();
+- }
+- }
+- }
++ protected static Map noPrefixCache = new ConcurrentHashMap();
+
+ /**
+ * DOCUMENT ME!
+@@ -154,7 +127,7 @@
+ answer = (Map) cache.get(uri);
+
+ if (answer == null) {
+- answer = new ConcurrentReaderHashMap();
++ answer = new ConcurrentHashMap();
+ cache.put(uri, answer);
+ }
+ }
Added: trunk/dom4j/debian/patches/04_headless-test.patch
===================================================================
--- trunk/dom4j/debian/patches/04_headless-test.patch (rev 0)
+++ trunk/dom4j/debian/patches/04_headless-test.patch 2013-04-16 10:16:08 UTC (rev 16547)
@@ -0,0 +1,10 @@
+--- a/xml/bean/gui.xml
++++ b/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: trunk/dom4j/debian/patches/05_java7-compat.patch (from rev 16542, trunk/dom4j/debian/patches/java7-compat.patch)
===================================================================
--- trunk/dom4j/debian/patches/05_java7-compat.patch (rev 0)
+++ trunk/dom4j/debian/patches/05_java7-compat.patch 2013-04-16 10:16:08 UTC (rev 16547)
@@ -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
+Bug-Debian: http://bugs.debian.org/673765
+--- 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);
Copied: trunk/dom4j/debian/patches/06_dom-level3-support.patch (from rev 16542, trunk/dom4j/debian/patches/oldchanges.patch)
===================================================================
--- trunk/dom4j/debian/patches/06_dom-level3-support.patch (rev 0)
+++ trunk/dom4j/debian/patches/06_dom-level3-support.patch 2013-04-16 10:16:08 UTC (rev 16547)
@@ -0,0 +1,958 @@
+Description: Implement DOM Level 3 methods to fix the compilation
+ with Java 5 and later
+Author: Torsten Werner
+Forwarded: not-needed
+--- a/src/java/org/dom4j/dom/DOMDocumentType.java
++++ b/src/java/org/dom4j/dom/DOMDocumentType.java
+@@ -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;
++ }
+ }
+
+ /*
+--- a/src/java/org/dom4j/dom/DOMProcessingInstruction.java
++++ b/src/java/org/dom4j/dom/DOMProcessingInstruction.java
+@@ -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
+ // -------------------------------------------------------------------------
+ }
+--- a/src/java/org/dom4j/dom/DOMAttribute.java
++++ b/src/java/org/dom4j/dom/DOMAttribute.java
+@@ -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;
++ }
+ }
+
+ /*
+--- a/src/java/org/dom4j/dom/DOMDocumentFactory.java
++++ b/src/java/org/dom4j/dom/DOMDocumentFactory.java
+@@ -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
++ */
+--- a/src/java/org/dom4j/dom/DOMComment.java
++++ b/src/java/org/dom4j/dom/DOMComment.java
+@@ -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;
++ }
+ }
+
+ /*
+--- a/src/java/org/dom4j/dom/DOMNamespace.java
++++ b/src/java/org/dom4j/dom/DOMNamespace.java
+@@ -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;
++ }
+ }
+
+ /*
+--- a/src/java/org/dom4j/dom/DOMDocument.java
++++ b/src/java/org/dom4j/dom/DOMDocument.java
+@@ -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;
++ }
+ }
+
+ /*
+--- a/src/java/org/dom4j/dom/DOMEntityReference.java
++++ b/src/java/org/dom4j/dom/DOMEntityReference.java
+@@ -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;
++ }
+ }
+
+ /*
+--- a/src/java/org/dom4j/dom/DOMText.java
++++ b/src/java/org/dom4j/dom/DOMText.java
+@@ -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;
++ }
+ }
+
+ /*
+--- a/src/java/org/dom4j/dom/DOMCDATA.java
++++ b/src/java/org/dom4j/dom/DOMCDATA.java
+@@ -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;
++ }
+ }
+
+ /*
+--- a/src/java/org/dom4j/dom/DOMElement.java
++++ b/src/java/org/dom4j/dom/DOMElement.java
+@@ -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;
++ }
+ }
+
+ /*
Deleted: trunk/dom4j/debian/patches/java7-compat.patch
===================================================================
--- trunk/dom4j/debian/patches/java7-compat.patch 2013-04-16 04:19:55 UTC (rev 16546)
+++ trunk/dom4j/debian/patches/java7-compat.patch 2013-04-16 10:16:08 UTC (rev 16547)
@@ -1,59 +0,0 @@
-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: trunk/dom4j/debian/patches/oldchanges.patch
===================================================================
--- trunk/dom4j/debian/patches/oldchanges.patch 2013-04-16 04:19:55 UTC (rev 16546)
+++ trunk/dom4j/debian/patches/oldchanges.patch 2013-04-16 10:16:08 UTC (rev 16547)
@@ -1,1165 +0,0 @@
-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>
Modified: trunk/dom4j/debian/patches/series
===================================================================
--- trunk/dom4j/debian/patches/series 2013-04-16 04:19:55 UTC (rev 16546)
+++ trunk/dom4j/debian/patches/series 2013-04-16 10:16:08 UTC (rev 16547)
@@ -1,2 +1,6 @@
-oldchanges.patch
-java7-compat.patch
+01_build-tweaks.patch
+02_disable-matrix-concat-test.patch
+03_remove-non-free-map.patch
+04_headless-test.patch
+05_java7-compat.patch
+06_dom-level3-support.patch
Modified: trunk/dom4j/debian/rules
===================================================================
--- trunk/dom4j/debian/rules 2013-04-16 04:19:55 UTC (rev 16546)
+++ trunk/dom4j/debian/rules 2013-04-16 10:16:08 UTC (rev 16547)
@@ -5,7 +5,7 @@
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen jaxmeapi \
- xalan2 xercesImpl ant-junit junit junitperf
+ xalan2 xercesImpl ant-junit junit junitperf xsdlib
DEB_ANT_BUILD_TARGET := package release-javadoc
DEB_ANT_CHECK_TARGET := test
@@ -15,3 +15,9 @@
install/libdom4j-java::
mh_installpom -plibdom4j-java debian/pom.xml
mh_installjar -plibdom4j-java debian/pom.xml -l build/dom4j.jar
+
+clean::
+ mh_clean
+
+get-orig-source:
+ uscan --force-download --rename
Modified: trunk/dom4j/debian/watch
===================================================================
--- trunk/dom4j/debian/watch 2013-04-16 04:19:55 UTC (rev 16546)
+++ trunk/dom4j/debian/watch 2013-04-16 10:16:08 UTC (rev 16547)
@@ -1,3 +1,3 @@
version=3
-opts="dversionmangle=s/\+dfsg//" \
- http://sf.net/dom4j/dom4j-(.*)\.tar\.gz
+opts="dversionmangle=s/\+dfsg(\.\d+)?//" \
+ http://sf.net/dom4j/dom4j-(.*)\.tar\.gz debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list