This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository dom4j.
commit d7a82587b999dec19e9f553f47cc44199daf98c2 Author: Emmanuel Bourg <[email protected]> Date: Tue Apr 16 10:16:08 2013 +0000 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 --- debian/README.Debian | 7 - debian/README.Debian.source | 4 +- debian/changelog | 16 +- debian/control | 8 +- debian/orig-tar.exclude | 9 + debian/orig-tar.sh | 14 ++ debian/patches/01_build-tweaks.patch | 58 +++++ debian/patches/02_disable-matrix-concat-test.patch | 18 ++ debian/patches/03_remove-non-free-map.patch | 69 ++++++ debian/patches/04_headless-test.patch | 10 + .../{java7-compat.patch => 05_java7-compat.patch} | 2 +- ...ldchanges.patch => 06_dom-level3-support.patch} | 259 +++------------------ debian/patches/series | 8 +- debian/rules | 8 +- debian/watch | 4 +- 15 files changed, 242 insertions(+), 252 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 3a6d793..0000000 --- a/debian/README.Debian +++ /dev/null @@ -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 <[email protected]>, Tue, 19 May 2009 09:49:14 +0200 diff --git a/debian/README.Debian.source b/debian/README.Debian.source index 1f7a997..5a1d32f 100644 --- a/debian/README.Debian.source +++ b/debian/README.Debian.source @@ -4,8 +4,8 @@ for DFSG compliance: * 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 diff --git a/debian/changelog b/debian/changelog index c4286e0..065bfa3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,18 @@ -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 <[email protected]> Mon, 15 Apr 2013 17:40:26 +0200 + +dom4j (1.6.1+dfsg.2-6) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index 0eb1212..851a8c0 100644 --- a/debian/control +++ b/debian/control @@ -4,15 +4,17 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Marcus Better <[email protected]> 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 diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude new file mode 100644 index 0000000..e8cf89e --- /dev/null +++ b/debian/orig-tar.exclude @@ -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 diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..fae3a1d --- /dev/null +++ b/debian/orig-tar.sh @@ -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 diff --git a/debian/patches/01_build-tweaks.patch b/debian/patches/01_build-tweaks.patch new file mode 100644 index 0000000..a8352a4 --- /dev/null +++ b/debian/patches/01_build-tweaks.patch @@ -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> diff --git a/debian/patches/02_disable-matrix-concat-test.patch b/debian/patches/02_disable-matrix-concat-test.patch new file mode 100644 index 0000000..3a45aba --- /dev/null +++ b/debian/patches/02_disable-matrix-concat-test.patch @@ -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 diff --git a/debian/patches/03_remove-non-free-map.patch b/debian/patches/03_remove-non-free-map.patch new file mode 100644 index 0000000..868b318 --- /dev/null +++ b/debian/patches/03_remove-non-free-map.patch @@ -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); + } + } diff --git a/debian/patches/04_headless-test.patch b/debian/patches/04_headless-test.patch new file mode 100644 index 0000000..c60a17c --- /dev/null +++ b/debian/patches/04_headless-test.patch @@ -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> diff --git a/debian/patches/java7-compat.patch b/debian/patches/05_java7-compat.patch similarity index 95% rename from debian/patches/java7-compat.patch rename to debian/patches/05_java7-compat.patch index 7ee12e3..41a86e1 100644 --- a/debian/patches/java7-compat.patch +++ b/debian/patches/05_java7-compat.patch @@ -7,7 +7,7 @@ Description: Fixup compareTo function in Rule class to be compliant Also added extra tests to ensure that comparison works both ways. Author: James Page <[email protected]> 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 @@ diff --git a/debian/patches/oldchanges.patch b/debian/patches/06_dom-level3-support.patch similarity index 64% rename from debian/patches/oldchanges.patch rename to debian/patches/06_dom-level3-support.patch index 6e5dbbc..053704e 100644 --- a/debian/patches/oldchanges.patch +++ b/debian/patches/06_dom-level3-support.patch @@ -1,93 +1,9 @@ -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 +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; @@ -165,10 +81,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMDocumentType.java } /* -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 +--- 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; @@ -246,10 +160,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMProcessingInstruction.java // 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 +--- 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; @@ -338,10 +250,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMAttribute.java } /* -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 +--- a/src/java/org/dom4j/dom/DOMDocumentFactory.java ++++ b/src/java/org/dom4j/dom/DOMDocumentFactory.java @@ -174,6 +174,11 @@ docType.getPublicId(), docType.getSystemId()); } @@ -361,10 +271,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMDocumentFactory.java - */ \ 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 +--- 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; @@ -442,10 +350,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMComment.java } /* -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 +--- 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; @@ -523,10 +429,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMNamespace.java } /* -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 +--- 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; @@ -680,10 +584,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMDocument.java } /* -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 +--- 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; @@ -761,10 +663,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMEntityReference.java } /* -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 +--- 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; @@ -857,10 +757,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMText.java } /* -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 +--- 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; @@ -954,10 +852,8 @@ Index: dom4j/src/java/org/dom4j/dom/DOMCDATA.java } /* -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 +--- 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; @@ -1060,106 +956,3 @@ Index: dom4j/src/java/org/dom4j/dom/DOMElement.java } /* -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> diff --git a/debian/patches/series b/debian/patches/series index af59e60..77110c6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 diff --git a/debian/rules b/debian/rules index 996f217..b7f8ada 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk 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 @@ DEB_INSTALL_CHANGELOGS_ALL := docs/changes-report.html 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 diff --git a/debian/watch b/debian/watch index 2514151..55452ca 100644 --- a/debian/watch +++ b/debian/watch @@ -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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dom4j.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
