This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository dom4j.
commit 695a9928408e1abc0efb5b9e8c32c588b275f43f Author: Marcus Better <mar...@better.se> Date: Wed Nov 1 11:38:05 2006 +0000 Merge debian branch (r2703). --- dom4j/build.xml | 16 +- dom4j/debian/README.Debian | 9 +- dom4j/debian/README.Debian.source | 3 +- dom4j/debian/control | 4 +- .../org/jaxen/dom4j/DocumentNavigator.java | 509 --------------------- .../jaxen_src/org/jaxen/dom4j/Dom4jXPath.java | 103 ----- .../debian/jaxen_src/org/jaxen/dom4j/package.html | 13 - dom4j/debian/libdom4j-java-doc.links | 1 + .../patches/00_BuildXml_DisableStaxDatatype.patch | 68 --- .../debian/patches/01_BuildXml_JaxenIncludes.patch | 11 - dom4j/debian/rules | 10 +- 11 files changed, 25 insertions(+), 722 deletions(-) diff --git a/dom4j/build.xml b/dom4j/build.xml index 17169b2..bd028d5 100644 --- a/dom4j/build.xml +++ b/dom4j/build.xml @@ -19,6 +19,7 @@ <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" /> @@ -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"> - <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}"/> @@ -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"> - <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> @@ -282,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,**/StaxTest.java,**/datatype/*Test.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> diff --git a/dom4j/debian/README.Debian b/dom4j/debian/README.Debian index 225c673..dbb5958 100644 --- a/dom4j/debian/README.Debian +++ b/dom4j/debian/README.Debian @@ -1,10 +1,11 @@ dom4j for Debian ---------------- -dom4j for debian is currently built without support for xsd because of +dom4j for debian is currently built without support for XSD and xsd because of license issues. -Because of circular dependencies with libjaxen-java for the XPath -support, the dom4j jar will include the needed jaxen classes. +Because of circular dependencies with jaxen for the XPath support, the +dom4j jar includes the classes DocumentNavigator and Dom4jXPath from +the package org.jaxen.dom4j. - -- Marcus Better <mar...@better.se>, Mon, 9 Oct 2006 21:13:53 +0200 + -- Marcus Better <mar...@better.se>, Wed, 1 Nov 2006 12:25:21 +0100 diff --git a/dom4j/debian/README.Debian.source b/dom4j/debian/README.Debian.source index 71c1438..80b0587 100644 --- a/dom4j/debian/README.Debian.source +++ b/dom4j/debian/README.Debian.source @@ -4,4 +4,5 @@ for DFSG compliance: * Removed binary-only jars in the `lib' directory and its subdirectories. * Removed `src/java/org/dom4j/tree/ConcurrentReaderHashMap.java' which - comes from Sun Microsystems and cannot be legally distributed. + comes from Sun Microsystems and cannot be legally distributed. It is + replaced by the classes from the backport-util-concurrent package. diff --git a/dom4j/debian/control b/dom4j/debian/control index e0418a5..f8894b3 100644 --- a/dom4j/debian/control +++ b/dom4j/debian/control @@ -4,12 +4,12 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Marcus Better <mar...@better.se> Build-Depends: debhelper (>= 5.0.0), ant, ant-optional -Build-Depends-Indep: antlr, java-gcj-compat-dev, libjaxp1.2-java, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java +Build-Depends-Indep: antlr, java-gcj-compat-dev, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java Standards-Version: 3.7.2 Package: libdom4j-java Architecture: all -Depends: kaffe | java1-runtime | java2-runtime, libjaxp1.2-java | libjaxp1.3-java, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java, libbackport-util-concurrent-java +Depends: kaffe | java1-runtime | java2-runtime, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java, libbackport-util-concurrent-java Suggests: java-virtual-machine, 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/dom4j/debian/jaxen_src/org/jaxen/dom4j/DocumentNavigator.java b/dom4j/debian/jaxen_src/org/jaxen/dom4j/DocumentNavigator.java deleted file mode 100644 index 4114c6e..0000000 --- a/dom4j/debian/jaxen_src/org/jaxen/dom4j/DocumentNavigator.java +++ /dev/null @@ -1,509 +0,0 @@ -package org.jaxen.dom4j; - -/* - * $Header: /home/projects/jaxen/scm/jaxen/src/java/main/org/jaxen/dom4j/DocumentNavigator.java,v 1.30 2005/06/28 13:44:45 elharo Exp $ - * $Revision: 1.30 $ - * $Date: 2005/06/28 13:44:45 $ - * - * ==================================================================== - * - * Copyright (C) 2000-2005 bob mcwhirter & James Strachan. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions, and the disclaimer that follows - * these conditions in the documentation and/or other materials - * provided with the distribution. - * - * 3. The name "Jaxen" must not be used to endorse or promote products - * derived from this software without prior written permission. For - * written permission, please contact lice...@jaxen.org. - * - * 4. Products derived from this software may not be called "Jaxen", nor - * may "Jaxen" appear in their name, without prior written permission - * from the Jaxen Project Management (p...@jaxen.org). - * - * In addition, we request (but do not require) that you include in the - * end-user documentation provided with the redistribution and/or in the - * software itself an acknowledgement equivalent to the following: - * "This product includes software developed by the - * Jaxen Project <http://www.jaxen.org/>." - * Alternatively, the acknowledgment may be graphical using the logos - * available at http://www.jaxen.org/ - * - * THIS SOFTWARE IS PROVIDED ``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 THE Jaxen AUTHORS OR THE PROJECT - * 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. - * - * ==================================================================== - * This software consists of voluntary contributions made by many - * individuals on behalf of the Jaxen Project and was originally - * created by bob mcwhirter <b...@werken.com> and - * James Strachan <jstrac...@apache.org>. For more information on the - * Jaxen Project, please see <http://www.jaxen.org/>. - * - * $Id: DocumentNavigator.java,v 1.30 2005/06/28 13:44:45 elharo Exp $ -*/ - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; - -import org.dom4j.Attribute; -import org.dom4j.Branch; -import org.dom4j.CDATA; -import org.dom4j.Comment; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.Element; -import org.dom4j.Namespace; -import org.dom4j.Node; -import org.dom4j.ProcessingInstruction; -import org.dom4j.QName; -import org.dom4j.Text; -import org.dom4j.io.SAXReader; -import org.jaxen.DefaultNavigator; -import org.jaxen.FunctionCallException; -import org.jaxen.NamedAccessNavigator; -import org.jaxen.Navigator; -import org.jaxen.XPath; -import org.jaxen.JaxenConstants; -import org.jaxen.saxpath.SAXPathException; -import org.jaxen.util.SingleObjectIterator; - -/** - * Interface for navigating around the DOM4J object model. - * - * <p> - * This class is not intended for direct usage, but is - * used by the Jaxen engine during evaluation. - * </p> - * - * @see XPath - * - * @author <a href="mailto:b...@werken.com">bob mcwhirter</a> - * @author Stephen Colebourne - */ -public class DocumentNavigator extends DefaultNavigator implements NamedAccessNavigator -{ - - private transient SAXReader reader; - - /** Singleton implementation. - */ - private static class Singleton - { - /** Singleton instance. - */ - private static DocumentNavigator instance = new DocumentNavigator(); - } - - /** Retrieve the singleton instance of this <code>DocumentNavigator</code>. - */ - public static Navigator getInstance() - { - return Singleton.instance; - } - - public boolean isElement(Object obj) - { - return obj instanceof Element; - } - - public boolean isComment(Object obj) - { - return obj instanceof Comment; - } - - public boolean isText(Object obj) - { - return ( obj instanceof Text - || - obj instanceof CDATA ); - } - - public boolean isAttribute(Object obj) - { - return obj instanceof Attribute; - } - - public boolean isProcessingInstruction(Object obj) - { - return obj instanceof ProcessingInstruction; - } - - public boolean isDocument(Object obj) - { - return obj instanceof Document; - } - - public boolean isNamespace(Object obj) - { - return obj instanceof Namespace; - } - - public String getElementName(Object obj) - { - Element elem = (Element) obj; - - return elem.getName(); - } - - public String getElementNamespaceUri(Object obj) - { - Element elem = (Element) obj; - - String uri = elem.getNamespaceURI(); - if ( uri == null) - return ""; - else - return uri; - } - - public String getElementQName(Object obj) - { - Element elem = (Element) obj; - - return elem.getQualifiedName(); - } - - public String getAttributeName(Object obj) - { - Attribute attr = (Attribute) obj; - - return attr.getName(); - } - - public String getAttributeNamespaceUri(Object obj) - { - Attribute attr = (Attribute) obj; - - String uri = attr.getNamespaceURI(); - if ( uri == null) - return ""; - else - return uri; - } - - public String getAttributeQName(Object obj) - { - Attribute attr = (Attribute) obj; - - return attr.getQualifiedName(); - } - - public Iterator getChildAxisIterator(Object contextNode) - { - Iterator result = null; - if ( contextNode instanceof Branch ) - { - Branch node = (Branch) contextNode; - result = node.nodeIterator(); - } - if (result != null) { - return result; - } - return JaxenConstants.EMPTY_ITERATOR; - } - - /** - * Retrieves an <code>Iterator</code> over the child elements that - * match the supplied name. - * - * @param contextNode the origin context node - * @param localName the local name of the children to return, always present - * @param namespacePrefix the prefix of the namespace of the children to return - * @param namespaceURI the uri of the namespace of the children to return - * @return an Iterator that traverses the named children, or null if none - */ - public Iterator getChildAxisIterator( - Object contextNode, String localName, String namespacePrefix, String namespaceURI) { - - if ( contextNode instanceof Element ) { - Element node = (Element) contextNode; - return node.elementIterator(QName.get(localName, namespacePrefix, namespaceURI)); - } - if ( contextNode instanceof Document ) { - Document node = (Document) contextNode; - Element el = node.getRootElement(); - if (el.getName().equals(localName) == false) { - return JaxenConstants.EMPTY_ITERATOR; - } - if (namespaceURI != null) { - if (namespaceURI.equals(el.getNamespaceURI()) == false) { - return JaxenConstants.EMPTY_ITERATOR; - } - } - return new SingleObjectIterator(el); - } - - return JaxenConstants.EMPTY_ITERATOR; - } - - public Iterator getParentAxisIterator(Object contextNode) - { - if ( contextNode instanceof Document ) - { - return JaxenConstants.EMPTY_ITERATOR; - } - - Node node = (Node) contextNode; - - Object parent = node.getParent(); - - if ( parent == null ) - { - parent = node.getDocument(); - } - - return new SingleObjectIterator( parent ); - } - - public Iterator getAttributeAxisIterator(Object contextNode) - { - if ( ! ( contextNode instanceof Element ) ) - { - return JaxenConstants.EMPTY_ITERATOR; - } - - Element elem = (Element) contextNode; - - return elem.attributeIterator(); - } - - /** - * Retrieves an <code>Iterator</code> over the attribute elements that - * match the supplied name. - * - * @param contextNode the origin context node - * @param localName the local name of the attributes to return, always present - * @param namespacePrefix the prefix of the namespace of the attributes to return - * @param namespaceURI the URI of the namespace of the attributes to return - * @return an Iterator that traverses the named attributes, not null - */ - public Iterator getAttributeAxisIterator( - Object contextNode, String localName, String namespacePrefix, String namespaceURI) { - - if ( contextNode instanceof Element ) { - Element node = (Element) contextNode; - Attribute attr = node.attribute(QName.get(localName, namespacePrefix, namespaceURI)); - if (attr == null) { - return JaxenConstants.EMPTY_ITERATOR; - } - return new SingleObjectIterator(attr); - } - return JaxenConstants.EMPTY_ITERATOR; - } - - public Iterator getNamespaceAxisIterator(Object contextNode) - { - if ( ! ( contextNode instanceof Element ) ) - { - return JaxenConstants.EMPTY_ITERATOR; - } - - Element element = (Element) contextNode; - List nsList = new ArrayList(); - HashSet prefixes = new HashSet(); - for ( Element context = element; context != null; context = context.getParent() ) { - List declaredNS = new ArrayList(context.declaredNamespaces()); - declaredNS.add(context.getNamespace()); - - for ( Iterator iter = context.attributes().iterator(); iter.hasNext(); ) - { - Attribute attr = (Attribute) iter.next(); - declaredNS.add(attr.getNamespace()); - } - - for ( Iterator iter = declaredNS.iterator(); iter.hasNext(); ) - { - Namespace namespace = (Namespace) iter.next(); - if (namespace != Namespace.NO_NAMESPACE) - { - String prefix = namespace.getPrefix(); - if ( ! prefixes.contains( prefix ) ) { - prefixes.add( prefix ); - nsList.add( namespace.asXPathResult( element ) ); - } - } - } - } - nsList.add( Namespace.XML_NAMESPACE.asXPathResult( element ) ); - return nsList.iterator(); - } - - public Object getDocumentNode(Object contextNode) - { - if ( contextNode instanceof Document ) - { - return contextNode; - } - else if ( contextNode instanceof Node ) - { - Node node = (Node) contextNode; - return node.getDocument(); - } - return null; - } - - /** Returns a parsed form of the given xpath string, which will be suitable - * for queries on DOM4J documents. - */ - public XPath parseXPath (String xpath) throws SAXPathException - { - return new Dom4jXPath(xpath); - } - - public Object getParentNode(Object contextNode) - { - if ( contextNode instanceof Node ) - { - Node node = (Node) contextNode; - Object answer = node.getParent(); - if ( answer == null ) - { - answer = node.getDocument(); - if (answer == contextNode) { - return null; - } - } - return answer; - } - return null; - } - - public String getTextStringValue(Object obj) - { - return getNodeStringValue( (Node) obj ); - } - - public String getElementStringValue(Object obj) - { - return getNodeStringValue( (Node) obj ); - } - - public String getAttributeStringValue(Object obj) - { - return getNodeStringValue( (Node) obj ); - } - - private String getNodeStringValue(Node node) - { - return node.getStringValue(); - } - - public String getNamespaceStringValue(Object obj) - { - Namespace ns = (Namespace) obj; - - return ns.getURI(); - } - - public String getNamespacePrefix(Object obj) - { - Namespace ns = (Namespace) obj; - - return ns.getPrefix(); - } - - public String getCommentStringValue(Object obj) - { - Comment cmt = (Comment) obj; - - return cmt.getText(); - } - - public String translateNamespacePrefixToUri(String prefix, Object context) - { - Element element = null; - if ( context instanceof Element ) - { - element = (Element) context; - } - else if ( context instanceof Node ) - { - Node node = (Node) context; - element = node.getParent(); - } - if ( element != null ) - { - Namespace namespace = element.getNamespaceForPrefix( prefix ); - - if ( namespace != null ) - { - return namespace.getURI(); - } - } - return null; - } - - public short getNodeType(Object node) - { - if ( node instanceof Node ) - { - return ((Node) node).getNodeType(); - } - return 0; - } - - public Object getDocument(String uri) throws FunctionCallException - { - try - { - return getSAXReader().read( uri ); - } - catch (DocumentException e) - { - throw new FunctionCallException("Failed to parse document for URI: " + uri, e); - } - } - - public String getProcessingInstructionTarget(Object obj) - { - ProcessingInstruction pi = (ProcessingInstruction) obj; - - return pi.getTarget(); - } - - public String getProcessingInstructionData(Object obj) - { - ProcessingInstruction pi = (ProcessingInstruction) obj; - - return pi.getText(); - } - - // Properties - //------------------------------------------------------------------------- - public SAXReader getSAXReader() - { - if ( reader == null ) - { - reader = new SAXReader(); - reader.setMergeAdjacentText( true ); - } - return reader; - } - - public void setSAXReader(SAXReader reader) - { - this.reader = reader; - } - -} diff --git a/dom4j/debian/jaxen_src/org/jaxen/dom4j/Dom4jXPath.java b/dom4j/debian/jaxen_src/org/jaxen/dom4j/Dom4jXPath.java deleted file mode 100644 index a02d6e2..0000000 --- a/dom4j/debian/jaxen_src/org/jaxen/dom4j/Dom4jXPath.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * $Header: /home/projects/jaxen/scm/jaxen/src/java/main/org/jaxen/dom4j/Dom4jXPath.java,v 1.6 2005/06/28 13:44:45 elharo Exp $ - * $Revision: 1.6 $ - * $Date: 2005/06/28 13:44:45 $ - * - * ==================================================================== - * - * Copyright (C) 2000-2002 bob mcwhirter & James Strachan. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions, and the disclaimer that follows - * these conditions in the documentation and/or other materials - * provided with the distribution. - * - * 3. The name "Jaxen" must not be used to endorse or promote products - * derived from this software without prior written permission. For - * written permission, please contact lice...@jaxen.org. - * - * 4. Products derived from this software may not be called "Jaxen", nor - * may "Jaxen" appear in their name, without prior written permission - * from the Jaxen Project Management (p...@jaxen.org). - * - * In addition, we request (but do not require) that you include in the - * end-user documentation provided with the redistribution and/or in the - * software itself an acknowledgement equivalent to the following: - * "This product includes software developed by the - * Jaxen Project <http://www.jaxen.org/>." - * Alternatively, the acknowledgment may be graphical using the logos - * available at http://www.jaxen.org/ - * - * THIS SOFTWARE IS PROVIDED ``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 THE Jaxen AUTHORS OR THE PROJECT - * 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. - * - * ==================================================================== - * This software consists of voluntary contributions made by many - * individuals on behalf of the Jaxen Project and was originally - * created by bob mcwhirter <b...@werken.com> and - * James Strachan <jstrac...@apache.org>. For more information on the - * Jaxen Project, please see <http://www.jaxen.org/>. - * - * $Id: Dom4jXPath.java,v 1.6 2005/06/28 13:44:45 elharo Exp $ - */ - - - -package org.jaxen.dom4j; - -import org.jaxen.BaseXPath; -import org.jaxen.JaxenException; - -/** An XPath implementation for the dom4j model - * - * <p>This is the main entry point for matching an XPath against a DOM - * tree. You create a compiled XPath object, then match it against - * one or more context nodes using the {@link #selectNodes(Object)} - * method, as in the following example:</p> - * - * <pre> - * Node node = ...; - * XPath path = new Dom4jXPath("a/b/c"); - * List results = path.selectNodes(node); - * </pre> - * - * @see BaseXPath - * @see <a href="http://dom4j.org/">The dom4j website</a> - * - * @author <a href="mailto:b...@werken.com">bob mcwhirter</a> - * @author <a href="mailto:jstac...@apache.org">James Strachan</a> - * - * @version $Revision: 1.6 $ - */ -public class Dom4jXPath extends BaseXPath -{ - /** Construct given an XPath expression string. - * - * @param xpathExpr the XPath expression - * - * @throws JaxenException if there is a syntax error while - * parsing the expression - */ - public Dom4jXPath(String xpathExpr) throws JaxenException - { - super( xpathExpr, DocumentNavigator.getInstance() ); - } -} diff --git a/dom4j/debian/jaxen_src/org/jaxen/dom4j/package.html b/dom4j/debian/jaxen_src/org/jaxen/dom4j/package.html deleted file mode 100644 index 123ff56..0000000 --- a/dom4j/debian/jaxen_src/org/jaxen/dom4j/package.html +++ /dev/null @@ -1,13 +0,0 @@ -<html> - <head> - <title> - org.jaxen.dom4j.* - </title> - </head> - - <body> - <p> - Navigation for <a href="http://dom4j.org">dom4j</a> trees. - </p> - </body> -</html> diff --git a/dom4j/debian/libdom4j-java-doc.links b/dom4j/debian/libdom4j-java-doc.links new file mode 100644 index 0000000..b5984f2 --- /dev/null +++ b/dom4j/debian/libdom4j-java-doc.links @@ -0,0 +1 @@ +usr/share/doc/libdom4j-java-doc/changelog.html usr/share/doc/libdom4j-java-doc/changes-report.html diff --git a/dom4j/debian/patches/00_BuildXml_DisableStaxDatatype.patch b/dom4j/debian/patches/00_BuildXml_DisableStaxDatatype.patch deleted file mode 100644 index 90880e7..0000000 --- a/dom4j/debian/patches/00_BuildXml_DisableStaxDatatype.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- build.xml.orig 2006-02-12 18:52:29.000000000 +0100 -+++ build.xml 2006-02-12 18:51:57.000000000 +0100 -@@ -16,13 +16,11 @@ - </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="xalan2.jar" /> -+ <include name="xerces*.jar" /> -+ <include name="jaxen.jar" /> -+ <include name="xpp3.jar" /> - </fileset> - </path> - -@@ -144,8 +142,13 @@ - optimize="${optimize}" - target="1.3" - source="1.3" -- deprecation="${deprecation}" -- classpathref="compile.classpath"> -+ deprecation="${deprecation}" -+ nowarn="yes" -+ includeJavaRuntime="yes" -+ bootclasspath="/usr/share/java/jaxp-1.2.jar"> -+ <exclude name="org/dom4j/datatype/**"/> -+ <exclude name="org/dom4j/io/STAXEventReader.java"/> -+ <exclude name="org/dom4j/io/STAXEventWriter.java"/> - </javac> - </target> - -@@ -158,7 +161,9 @@ - debug="${debug}" - optimize="${optimize}" - deprecation="${deprecation}" -- classpathref="test.classpath"> -+ nowarn="yes"> -+ <exclude name="org/dom4j/datatype/**"/> -+ <exclude name="org/dom4j/io/StaxTest.java"/> - </javac> - </target> - -@@ -270,7 +275,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> -@@ -280,8 +285,8 @@ - - <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" /> -+ <include name="**/*Test.java" /> -+ <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java,**/StaxTest.java,**/datatype/*Test.java" /> - </fileset> - </batchtest> - </junit> diff --git a/dom4j/debian/patches/01_BuildXml_JaxenIncludes.patch b/dom4j/debian/patches/01_BuildXml_JaxenIncludes.patch deleted file mode 100644 index f4d5494..0000000 --- a/dom4j/debian/patches/01_BuildXml_JaxenIncludes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- build.xml.orig 2006-02-12 18:51:57.000000000 +0100 -+++ build.xml 2006-02-12 18:54:41.000000000 +0100 -@@ -185,7 +185,7 @@ - <target name="package" depends="compile"> - <jar jarfile="${build.dir}/${name}.jar" - basedir="${build.dest}" -- includes="org/dom4j/**"/> -+ includes="org/dom4j/** org/jaxen/**"/> - </target> - - <!-- =================================================================== --> diff --git a/dom4j/debian/rules b/dom4j/debian/rules index 443c99c..cf7a724 100755 --- a/dom4j/debian/rules +++ b/dom4j/debian/rules @@ -4,7 +4,7 @@ JAVA_HOME := /usr/lib/jvm/java-gcj DEB_JARS_BASE := /usr/share/java JAVACMD := $(JAVA_HOME)/bin/java -DEB_JARS := ant ant-launcher jaxp-1.2.jar xpp2 xpp3 jaxen jaxmeapi \ +DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen jaxmeapi \ xalan2 xercesImpl ant-junit junit junitperf DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \ @@ -18,7 +18,7 @@ DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \ ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \ org.apache.tools.ant.Main $(DEB_ANT_ARGS) -PKGNAME := libjaxme-java +PKGNAME := libdom4j-java INSTALLDIR := $(CURDIR)/debian/$(PKGNAME) JAVALIBDIR := $(INSTALLDIR)/usr/share/java @@ -27,7 +27,7 @@ VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut build: build-stamp build-stamp: dh_testdir - $(ANT_INVOKE) package test + $(ANT_INVOKE) package test release-javadoc touch build-stamp clean: @@ -52,6 +52,7 @@ binary-indep: build install $(INSTALLDIR)-doc/usr/share/doc/$(PKGNAME)-doc/api install -m 644 build/dom4j.jar $(JAVALIBDIR)/dom4j-$(VERSION).jar ln -s dom4j-$(VERSION).jar $(JAVALIBDIR)/dom4j.jar + dh_link dh_compress dh_fixperms dh_installdeb @@ -63,6 +64,3 @@ binary-arch: build install binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install - -# move jaxen/dom4j stuff to the source directory -# cp -r debian/jaxen_src/* src/java/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dom4j.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits