debian/0000775000000000000000000000000012171477644007205 5ustar debian/patches/0000775000000000000000000000000012171467276010634 5ustar debian/patches/compat.patch0000664000000000000000000000121012171464132013116 0ustar Description: Various compatibility patches for API compliance with library versions in Debian. Author: Marcus Better Forwarded: not-needed --- a/src/test/org/dom4j/xpath/MatrixConcatTest.java +++ b/src/test/org/dom4j/xpath/MatrixConcatTest.java @@ -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 debian/patches/backport-util.patch0000664000000000000000000000517712171465755014447 0ustar Description: Use backport-utils-concurrent instead of bundled Java for dfsg compliance. Author: Marcus Better 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); } } debian/patches/fix-test-compilation.patch0000664000000000000000000000352512171467054015733 0ustar Description: Fix the issues preventing the compilation of the tests Author: Emmanuel Bourg Forwarded: https://github.com/jenkinsci/dom4j/pull/3 --- a/build.xml +++ b/build.xml @@ -160,8 +160,11 @@ destdir="${build.dest}" debug="${debug}" optimize="${optimize}" + encoding="ISO-8859-1" deprecation="${deprecation}" classpathref="test.classpath"> + + @@ -284,6 +287,8 @@ + + --- a/src/test/org/dom4j/CloneTest.java +++ b/src/test/org/dom4j/CloneTest.java @@ -11,8 +11,6 @@ import java.util.Comparator; -import org.dom4j.dom.DOMDocument; -import org.dom4j.dom.DOMDocumentFactory; import org.dom4j.util.NodeComparator; /** @@ -30,18 +28,6 @@ // Test case(s) // ------------------------------------------------------------------------- - public void testBug1148333() { - DOMDocumentFactory factory = (DOMDocumentFactory) DOMDocumentFactory - .getInstance(); - DOMDocument doc = (DOMDocument) factory.createDocument(); - Element el = doc.addElement("root"); - el.addNamespace("pref2", "uri2"); - - DOMDocument clone = (DOMDocument) doc.cloneNode(true); - - assertNotSame(doc, clone); - assertNodesEqual(doc, clone); - } public void testElementWithNamespaceClone() { Element element = DocumentFactory.getInstance() debian/patches/series0000664000000000000000000000011012171466335012034 0ustar build.patch backport-util.patch compat.patch fix-test-compilation.patch debian/patches/build.patch0000664000000000000000000000576612171467276012772 0ustar Description: Debianisation of build.xml to use system libraries Author: Marcus Better Forwarded: not-needed --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + @@ -16,13 +16,14 @@ - - - - - - - + + + + + + + + @@ -223,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"> - - + @@ -240,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"> - - + @@ -274,7 +273,7 @@ - + --- a/xml/bean/gui.xml +++ b/xml/bean/gui.xml @@ -1,5 +1,5 @@ - - + + debian/rules0000775000000000000000000000130712171471726010261 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java PACKAGE := jenkins-dom4j DEB_ANT_BUILD_TARGET := package release-javadoc DEB_ANT_CHECK_TARGET := test DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen \ xalan2 xercesImpl ant-junit junit junitperf xsdlib binary-post-install/lib$(PACKAGE)-java:: mh_installpoms -plib$(PACKAGE)-java mh_installjar -plib$(PACKAGE)-java pom.xml -l build/dom4j.jar --usj-name=$(PACKAGE) clean:: mh_clean get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename debian/watch0000664000000000000000000000021112171432577010224 0ustar version=3 opts="dversionmangle=s/\.dfsg//" \ http://githubredir.debian.net/github/jenkinsci/dom4j/ (.*).tar.gz debian debian/orig-tar.sh debian/orig-tar.sh0000775000000000000000000000064012171432577011264 0ustar #!/bin/sh -e VERSION=$2 TAR=../jenkins-dom4j_$VERSION.orig.tar.gz DIR=jenkins-dom4j-$VERSION mkdir -p $DIR # Expand the upstream tarball tar -xzf $TAR -C $DIR --strip-components=1 # Repack excluding stuff we don't need GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' \ --exclude 'CVS' --exclude '.svn' \ --exclude 'src/java/org/dom4j/tree/ConcurrentReaderHashMap.java' $DIR rm -rf $DIR debian/changelog0000664000000000000000000000266712171467717011072 0ustar jenkins-dom4j (1.6.1-hudson-3-5) unstable; urgency=low * Don't compile the classes in the org.dom4j.dom package to match the behavior of the upstream build. * Specified the source file encoding to fix the unmappable character error with Java 7 (Closes: #717118) -- Emmanuel Bourg Wed, 17 Jul 2013 12:19:57 +0200 jenkins-dom4j (1.6.1-hudson-3-4) unstable; urgency=low * Removed the dependency on libjaxme-java * Use canonical URLs for the Vcs-* fields -- Emmanuel Bourg Thu, 27 Jun 2013 00:32:03 +0200 jenkins-dom4j (1.6.1-hudson-3-3) unstable; urgency=low * Team upload. * Upload to unstable. -- tony mancill Wed, 15 May 2013 16:01:14 -0700 jenkins-dom4j (1.6.1-hudson-3-2) experimental; urgency=low * Team upload. * Removed the dependency on backport-util-concurrent * Update Standards-Version: 3.9.4 (no changes) * Enabled XSD support by adding a dependency on libmsv-java * Updated debian/copyright to comply with the Machine-readable format 1.0 -- Emmanuel Bourg Tue, 16 Apr 2013 15:22:50 +0200 jenkins-dom4j (1.6.1-hudson-3-1) unstable; urgency=low * Initial Debian release (Closes: #634632) -- James Page Tue, 30 Aug 2011 22:45:48 +0100 jenkins-dom4j (1.6.1-hudson-3-0ubuntu1) oneiric; urgency=low * Initial release -- James Page Mon, 27 Jun 2011 15:37:35 +0100 debian/source/0000775000000000000000000000000012171432577010501 5ustar debian/source/format0000664000000000000000000000001412171432577011707 0ustar 3.0 (quilt) debian/source/lintian-overrides0000664000000000000000000000020512171432577014057 0ustar # Version has hu(ds)son in it so this can be # safely overriden jenkins-dom4j source: debian-watch-file-should-mangle-version line 3 debian/libjenkins-dom4j-java-doc.doc-base.api0000664000000000000000000000047012171432577016176 0ustar Document: libjenkins-dom4j-java Title: API Javadoc for dom4j (Jenkins branch) Author: dom4j developers Abstract: This is the API Javadoc provided by the dom4j library. Section: Programming Format: HTML Index: /usr/share/doc/libjenkins-dom4j-java/api/index.html Files: /usr/share/doc/libjenkins-dom4j-java/api/* debian/README.Debian0000664000000000000000000000041512171432577011242 0ustar Jenkins branch of dom4j for Debian ---------------------------------- This package contains the Jenkins branch of dom4j; please use the standard distribution of dom4j instead of this package. -- James Page Wed, 08 Jun 2011 09:56:08 +0100 debian/maven.ignoreRules0000664000000000000000000000003012171432577012520 0ustar jaxme jaxme-api * * * * debian/compat0000664000000000000000000000000212171432577010377 0ustar 7 debian/copyright0000664000000000000000000000440112171432577011133 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Hudson/Jenkins branch of dom4j Upstream-Contact: jenkinsci-dev@googlegroups.com Source: http://github.com/jenkinsci/dom4j/ Files: * Copyright: 2001-2005, MetaStuff, Ltd. License: DOM4J Files: debian/* Copyright: 2006-2009, Marcus Better, 2011, Canonical Ltd (http://www.canonical.com) License: DOM4J License: DOM4J Redistribution and use of this software and associated documentation ("Software"), with or without modification, are permitted provided that the following conditions are met: . 1. Redistributions of source code must retain copyright statements and notices. Redistributions must also contain a copy of this document. . 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . 3. The name "DOM4J" must not be used to endorse or promote products derived from this Software without prior written permission of MetaStuff, Ltd. For written permission, please contact dom4j-info@metastuff.com. . 4. Products derived from this Software may not be called "DOM4J" nor may "DOM4J" appear in their names without prior written permission of MetaStuff, Ltd. DOM4J is a registered trademark of MetaStuff, Ltd. . 5. Due credit should be given to the DOM4J Project - http://www.dom4j.org . THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. debian/libjenkins-dom4j-java.classpath0000664000000000000000000000013412171432577015165 0ustar build/dom4j.jar /usr/share/java/jaxen.jar /usr/share/java/xpp2.jar /usr/share/java/xpp3.jar debian/ant.properties0000664000000000000000000000002712171465344012076 0ustar java.awt.headless=true debian/libjenkins-dom4j-java-doc.install0000664000000000000000000000007412171432577015417 0ustar build/doc/apidocs/* usr/share/doc/libjenkins-dom4j-java/api debian/libjenkins-dom4j-java.poms0000664000000000000000000000001012171432577014152 0ustar pom.xml debian/README.source0000664000000000000000000000147412171432577011366 0ustar Notes about original dom4j packaging ==================================== The following files have been removed from the upstream source package 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 java.util.concurrent.ConcurrentHashMap. Notes about Jenkins/Hudson fork =============================== This source package contains the Jenkins/Hudson fork of dom4j; this fork is in place due to inactivity in dom4j and a requirement from Hudson/Jenkins to resolve issues and deliver some improvements. The package has retained the Hudson named instead of Jenkins; when the upstream source package renames this package should be re-aligned. debian/control0000664000000000000000000000314612171432577010610 0ustar Source: jenkins-dom4j Section: java Priority: optional Maintainer: Debian Java Maintainers Uploaders: James Page , Emmanuel Bourg Build-Depends: ant-optional, cdbs, debhelper (>= 7), default-jdk, javahelper, maven-repo-helper Build-Depends-Indep: antlr, junit, libjaxen-java, libjunitperf-java, libmsv-java, librelaxng-datatype-java, libxalan2-java (>= 2.7.0), libxerces2-java, libxpp2-java, libxpp3-java Standards-Version: 3.9.4 Homepage: http://github.com/jenkinsci/dom4j Vcs-Git: git://anonscm.debian.org/pkg-java/jenkins-dom4j.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jenkins-dom4j.git Package: libjenkins-dom4j-java Architecture: all Depends: libjaxen-java, libmsv-java, libxpp2-java, libxpp3-java, ${misc:Depends} Suggests: libjenkins-dom4j-java-doc Description: Jenkins variant of the flexible XML framework for Java dom4j is a library for working with XML, XPath and XSLT on the Java platform using the Java Collections Framework and with full support for DOM, SAX and JAXP. . This package contains the branch used/maintained by the Jenkins CI project Package: libjenkins-dom4j-java-doc Architecture: all Section: doc Depends: ${misc:Depends} Suggests: libjenkins-dom4j-java Description: Documentation for libjenkins-dom4j-java dom4j is a library for working with XML, XPath and XSLT on the Java platform using the Java Collections Framework and with full support for DOM, SAX and JAXP. . This package contains the documentation for dom4j (Hudson variant), including the API Javadoc.