[pkg-java] r14269 - in trunk/dom4j: . debian debian/patches

Torsten Werner twerner at alioth.debian.org
Wed Aug 17 16:36:56 UTC 2011


Author: twerner
Date: 2011-08-17 16:36:56 +0000 (Wed, 17 Aug 2011)
New Revision: 14269

Added:
   trunk/dom4j/debian/patches/
   trunk/dom4j/debian/patches/oldchanges.patch
   trunk/dom4j/debian/patches/series
Removed:
   trunk/dom4j/LICENSE.txt
   trunk/dom4j/build.xml
   trunk/dom4j/docs/
   trunk/dom4j/dom4j-1.6.1.jar
   trunk/dom4j/lib/
   trunk/dom4j/maven.xml
   trunk/dom4j/project.properties
   trunk/dom4j/project.xml
   trunk/dom4j/src/
   trunk/dom4j/xdocs/
   trunk/dom4j/xml/
Modified:
   trunk/dom4j/debian/
   trunk/dom4j/debian/changelog
   trunk/dom4j/debian/control
Log:
UNRELEASED
* Team upload.
* Remove Java runtime from Depends.

Deleted: trunk/dom4j/LICENSE.txt
===================================================================
--- trunk/dom4j/LICENSE.txt	2011-08-17 16:20:40 UTC (rev 14268)
+++ trunk/dom4j/LICENSE.txt	2011-08-17 16:36:56 UTC (rev 14269)
@@ -1,40 +0,0 @@
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info at metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.

Deleted: trunk/dom4j/build.xml
===================================================================
--- trunk/dom4j/build.xml	2011-08-17 16:20:40 UTC (rev 14268)
+++ trunk/dom4j/build.xml	2011-08-17 16:36:56 UTC (rev 14269)
@@ -1,723 +0,0 @@
-<project default="usage" basedir=".">
-
-    <path id="compile.classpath">
-        <fileset dir="./lib/endorsed">
-            <include name="*.jar" />
-        </fileset>
-        <fileset dir="./lib">
-            <include name="*.jar" />
-        </fileset>
-    </path>
-
-    <path id="endorsed.classpath">
-        <fileset dir="./lib/endorsed">
-            <include name="*.jar" />
-        </fileset>
-    </path>
-
-    <path id="test.classpath">
-        <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>
-
-    <path id="samples.classpath">
-        <fileset dir="./lib/tools">
-            <include name="**/*.jar" />
-        </fileset>
-        <path refid="test.classpath" />
-        <pathelement location="."/>
-    </path>
-
-  <!-- =================================================================== -->
-  <!-- Initialization target                                               -->
-  <!-- =================================================================== -->
-  <target name="init">
-    <tstamp/>
-    <property name="Name" value="dom4j"/>
-    <property name="name" value="dom4j"/>
-    <property name="version" value="1.6.1"/>
-    <property name="year" value="2005"/>
-
-    <echo message="----------- ${Name} ${version} [${year}] ------------"/>
-
-    <property name="debug" value="on"/>
-    <property name="optimize" value="on"/>
-    <property name="deprecation" value="off"/>
-
-    <property name="src.dir" value="./src/java"/>
-    <property name="conf.dir" value="./src/conf"/>
-    <property name="doc.dir" value="./src/doc"/>
-    <property name="samples.dir" value="./src/samples"/>
-    <property name="test.dir" value="./src/test"/>
-    <property name="lib.dir" value="./lib"/>
-    <property name="packages" value="org.*"/>
-    <property name="api.packages" value="org.dom4j,org.dom4j.dtd,org.dom4j.io,org.dom4j.rule,org.dom4j.datatype,org.dom4j.util"/>
-
-    <property name="build.dir" value="./build"/>
-    <property name="build.src" value="./build/src"/>
-    <property name="build.dest" value="./build/classes"/>
-    <property name="build.doc" value="./build/doc"/>
-    <property name="build.apidocs" value="./build/doc/apidocs"/>
-    <property name="build.javadocs" value="./build/doc/javadoc"/>
-    <property name="build.generated.src" value="./build/generated"/>
-
-    <property name="xml.format.options" value="-indentSize 2 -trimText -newlines"/>
-
-    <filter token="year" value="${year}"/>
-    <filter token="version" value="${version}"/>
-    <filter token="date" value="${TODAY}"/>
-    <filter token="log" value="true"/>
-    <filter token="verbose" value="true"/>
-
-    <!-- Gump support -->
-    <property name="jaxen.src" value="../jaxen/jaxen/src/java/main"/>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Help on usage                                                       -->
-  <!-- =================================================================== -->
-  <target name="usage">
-    <echo message=""/>
-    <echo message=""/>
-    <echo message="dom4j build file"/>
-    <echo message="-------------------------------------------------------------"/>
-    <echo message=""/>
-    <echo message=" available targets are:"/>
-    <echo message=""/>
-    <echo message="   all      --> cleans then builds everything (default)"/>
-    <echo message="   package  --> generates the dom4j.jar file"/>
-    <echo message="   compile  --> compiles the source code"/>
-    <echo message="   api      --> generates the API documentation"/>
-    <echo message="   javadoc  --> generates the full JavaDoc documentation"/>
-    <echo message="   clean    --> cleans up the directory"/>
-    <echo message="   test     --> builds and runs the unit tests"/>
-    <echo message="   demo-all --> runs the main standard sample programs"/>
-    <echo message=""/>
-    <echo message="-------------------------------------------------------------"/>
-    <echo message=""/>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Prepares the build directory                                        -->
-  <!-- =================================================================== -->
-  <target name="prepare" depends="init">
-    <mkdir dir="${build.dir}"/>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Prepares the source code                                            -->
-  <!-- =================================================================== -->
-  <target name="prepare-src" depends="prepare">
-    <!-- create directories -->
-    <mkdir dir="${build.src}"/>
-    <mkdir dir="${build.dest}"/>
-
-    <!-- copy src files -->
-    <copy todir="${build.src}">
-      <!--fileset dir="${src.dir}" excludes="org/dom4j/persistence/**"/-->
-      <fileset dir="${src.dir}"/>
-    </copy>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Prepares the example code                                           -->
-  <!-- =================================================================== -->
-  <target name="prepare-samples" depends="prepare">
-    <!-- create directories -->
-    <mkdir dir="${build.src}"/>
-    <mkdir dir="${build.dest}"/>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Compiles the source directory                                       -->
-  <!-- =================================================================== -->
-  <target name="compile" depends="prepare-src">
-    <javac srcdir="${build.src}"
-           destdir="${build.dest}"
-           debug="${debug}"
-           optimize="${optimize}"
-           target="1.3"
-           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>
-
-  <!-- =================================================================== -->
-  <!-- Compiles the test directory                                         -->
-  <!-- =================================================================== -->
-  <target name="compile-test" depends="compile">
-    <javac srcdir="${test.dir}"
-           destdir="${build.dest}"
-           debug="${debug}"
-           optimize="${optimize}"
-           deprecation="${deprecation}"
-           classpathref="test.classpath">
-        <exclude name="org/dom4j/datatype/**"/>
-        <exclude name="org/dom4j/io/StaxTest.java"/>
-    </javac>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Compiles the samples directory                                       -->
-  <!-- =================================================================== -->
-  <target name="samples" depends="compile,prepare-samples,prepare-jaxb">
-    <javac srcdir="src/samples"
-           destdir="${build.dest}"
-           debug="${debug}"
-           optimize="${optimize}"
-           classpathref="samples.classpath">
-    </javac>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Creates the class package                                           -->
-  <!-- =================================================================== -->
-  <target name="package" depends="compile">
-    <jar jarfile="${build.dir}/${name}.jar"
-         basedir="${build.dest}"
-         includes="org/dom4j/**"/>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Creates the API documentation                                       -->
-  <!-- =================================================================== -->
-  <target name="javadoc" depends="prepare-src">
-    <mkdir dir="${build.javadocs}"/>
-    <javadoc packagenames="${packages}"
-             sourcepath="${build.src}"
-             destdir="${build.javadocs}"
-             author="true"
-             version="true"
-             use="true"
-             splitindex="true"
-             noindex="false"
-             windowtitle="${Name} Full JavaDoc"
-             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">
-    </javadoc>
-  </target>
-
-
-  <!-- JavaDoc generated by a release which links to JDK and JAXP Javadoc -->
-  <target name="release-javadoc" depends="prepare-src">
-    <mkdir dir="${build.javadocs}"/>
-    <javadoc packagenames="${packages}"
-             sourcepath="${build.src}"
-             destdir="${build.javadocs}"
-             author="true"
-             version="true"
-             use="true"
-             splitindex="true"
-             noindex="false"
-             windowtitle="${Name} Full JavaDoc"
-             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="file:///usr/share/doc/classpath-doc/api"/>
-    </javadoc>
-
-    <mkdir dir="${build.apidocs}"/>
-    <javadoc packagenames="${api.packages}"
-             sourcepath="${build.src}"
-             destdir="${build.apidocs}"
-             author="true"
-             version="true"
-             use="true"
-             splitindex="true"
-             noindex="false"
-             windowtitle="${Name} API"
-             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="file:///usr/share/doc/classpath-doc/api"/>
-      <link href="${build.javadocs}"/>
-    </javadoc>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Support for a Gump build                                            -->
-  <!-- =================================================================== -->
-  <target name="gump" depends="prepare-gump, test, package">
-  </target>
-
-  <target name="prepare-gump" depends="init">
-    <!-- create directories -->
-    <mkdir dir="${build.src}"/>
-
-    <!-- copy src files -->
-    <copy todir="${build.src}">
-      <fileset dir="${jaxen.src}" includes="org/jaxen/dom4j/**"/>
-    </copy>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Clean targets                                                       -->
-  <!-- =================================================================== -->
-  <target name="clean" depends="init">
-    <delete dir="${build.dir}"/>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Unit Testing Targets                                                -->
-  <!-- =================================================================== -->
-  <target name="test" depends="compile-test">
-    <mkdir dir="${build.dir}/test-results/xml"/>
-    <junit printsummary="yes" haltonfailure="yes">
-      <formatter type="xml"/>
-
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <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" />
-          <exclude name="**/Abstract*.java" />
-          <exclude name="**/TestCase.java" />
-          <exclude name="**/StaxTest.java" />
-          <exclude name="**/datatype/*Test.java" />
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-report" depends="test">
-    <mkdir dir="${build.dir}/test-results"/>
-    <junitreport todir="${build.dir}/test-results">
-      <fileset dir="${build.dir}/test-results/xml">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report format="frames" todir="${build.dir}/test-results/html"/>
-    </junitreport>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Helper targets                                                      -->
-  <!-- =================================================================== -->
-  <target name="all" depends="clean,package,javadoc">
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Run sample programs                                                 -->
-  <!-- =================================================================== -->
-  <target name="demo-sax" depends="samples">
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/web.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/cdata.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/testPI.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/test/test_schema.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-	
-  <target name="prepare-jaxb" depends="prepare-samples">
-    <path id="classpath.jaxb">
-      <pathelement location="./lib/tools/jaxme-0.3.jar"/>
-      <pathelement location="./lib/tools/jaxme-js-0.3.jar"/>
-      <pathelement location="./lib/tools/jaxme-xs-0.3.jar"/>
-      <pathelement location="./lib/jaxme-api-0.3.jar"/>
-    </path>
-
-    <taskdef name="xjc" classname="org.apache.ws.jaxme.generator.XJCTask">
-      <classpath refid="classpath.jaxb" />
-    </taskdef>
-  	
-    <mkdir dir="${build.generated.src}"/>
-  	  		
-    <xjc schema="xml/jaxb/primer.xsd" target="${build.generated.src}" package="org.dom4j.test.primer">
-      <produces dir="${build.generated.src}" />
-    </xjc>
-  	
-    <javac destdir="${build.dest}">
-      <src path="${build.generated.src}"/>
-      <classpath>
-        <path refid="classpath.jaxb"/>
-        <!--path refid="test.classpath"/-->
-      </classpath>
-    </javac>
-  	
-    <copy todir="${build.dest}">
-      <fileset dir="${build.generated.src}">
-        <include name="**/jaxb.properties" />
-        <include name="**/Configuration.xml" />
-      </fileset>
-    </copy>
-  </target>
-	
-  <target name="demo-jaxb" depends="samples">	  	
-    <java classname="org.dom4j.samples.jaxb.JAXBDemo" >
-      <classpath>
-        <path refid="classpath.jaxb" />
-        <path refid="samples.classpath" />
-      	<pathelement location="${build.dest}" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-pull" depends="samples">
-    <java classname="org.dom4j.samples.PullParserDemo" args="${xml.format.options} xml/web.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-    <java classname="org.dom4j.samples.PullParserDemo" args="${xml.format.options} xml/fibo.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-sax2" depends="samples">
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/xhtml/xhtml-basic.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-sax-contents" depends="samples">
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/contents.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-sax-cdata" depends="samples">
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/cdata.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/cdata.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-      <sysproperty key="org.xml.sax.driver" value="org.apache.xerces.parsers.SAXParser"/> 
-    </java>
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/cdata.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-      <sysproperty key="org.xml.sax.driver" value="xml.aelfred2.SAXDriver"/> 
-    </java>
-  </target>
-
-  <target name="demo-sax-pi" depends="samples">
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/testPI.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-sax-ns" depends="samples">
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/namespaces.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/testNamespaces.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-saxall" depends="demo-sax,demo-sax-contents,demo-sax-cdata,demo-sax-pi,demo-sax-ns">
-    <java classname="org.dom4j.samples.SAXDemo" args="${xml.format.options} xml/inline.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-dom" depends="samples">
-    <java classname="org.dom4j.samples.dom.DOMDemo" args="xml/contents.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-saxdom" depends="samples">
-    <java classname="org.dom4j.samples.dom.SAXDOMDemo" args="xml/contents.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-jtidy" depends="samples">
-    <java classname="org.dom4j.samples.JTidyDemo" args="${xml.format.options} readme.html">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-visitor" depends="samples">
-    <java classname="org.dom4j.samples.VisitorDemo" args="xml/cdata.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-count" depends="samples">
-    <java classname="org.dom4j.samples.CountDemo" args="xml/fibo.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-create" depends="samples">
-    <java classname="org.dom4j.samples.CreateXMLDemo">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-html" depends="samples">
-    <java classname="org.dom4j.samples.HTMLWriterDemo" args="xml/xhtml.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="test-performance" depends="samples">
-    <java classname="org.dom4j.samples.PerformanceTest" args="xml/periodic_table.xml org.dom4j.DocumentFactory 10">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-
-    <java classname="org.dom4j.samples.PerformanceTest" args="xml/periodic_table.xml org.dom4j.DocumentFactory 10">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-      <sysproperty key="org.xml.sax.driver" value="org.apache.xerces.parsers.SAXParser"/> 
-    </java>
-
-    <java classname="org.dom4j.samples.PerformanceTest" args="xml/periodic_table.xml org.dom4j.DocumentFactory 10">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-      <sysproperty key="org.xml.sax.driver" value="xml.aelfred2.SAXDriver"/> 
-    </java>
-
-    <java classname="org.dom4j.samples.PerformanceTest" args="xml/much_ado.xml org.dom4j.DocumentFactory 10">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-
-    <java classname="org.dom4j.samples.PerformanceTest" args="xml/much_ado.xml org.dom4j.DocumentFactory 10">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-      <sysproperty key="org.xml.sax.driver" value="org.apache.xerces.parsers.SAXParser"/> 
-    </java>
-
-    <java classname="org.dom4j.samples.PerformanceTest" args="xml/much_ado.xml org.dom4j.DocumentFactory 10">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-      <sysproperty key="org.xml.sax.driver" value="xml.aelfred2.SAXDriver"/> 
-    </java>
-  </target>
-
-  <target name="demo-xpath" depends="samples">
-    <java classname="org.dom4j.samples.XPathDemo" args="xml/web.xml //servlet/servlet-class">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-    <java classname="org.dom4j.samples.XPathDemo" args="xml/much_ado.xml //ACT/TITLE">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-xslt" depends="samples">
-    <java classname="org.dom4j.samples.XSLTDemo" args="xml/nitf/sample.xml xml/nitf/ashtml.xsl">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-domxslt" depends="samples">
-    <java classname="org.dom4j.samples.dom.XSLTNativeDOMDemo" args="xml/nitf/sample.xml xml/nitf/ashtml.xsl">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-bigdoc" depends="samples">
-    <java classname="org.dom4j.samples.LargeDocumentDemo" args="xml/much_ado.xml /PLAY/ACT">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-  
-  <target name="demo-bigdoc2" depends="samples">
-    <java classname="org.dom4j.samples.LargeDocumentDemo2" args="xml/much_ado.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-link" depends="samples">
-    <java classname="org.dom4j.samples.LinkChecker" args="xml/xhtml/xhtml-basic.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-bean" depends="samples">
-    <java classname="org.dom4j.samples.bean.BeanDemo" args="xml/bean/gui.xml">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-validate" depends="samples">
-    <java classname="org.dom4j.samples.validate.XercesDemo" fork="yes">
-      <arg value="xml/schema/invalid.xml"/>
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-saxvalidate" depends="samples">
-    <java classname="org.dom4j.samples.validate.SAXValidatorDemo" fork="yes">
-      <arg value="xml/nitf/invalid.xml"/>
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-schema" depends="samples">
-    <java classname="org.dom4j.samples.VisitorDemo">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-      <sysproperty key="org.dom4j.factory" value="org.dom4j.datatype.DatatypeDocumentFactory"/>
-      <arg line="xml/schema/personal-schema.xml"/>
-    </java>
-  </target>
-
-  <target name="demo-table" depends="samples">
-    <java classname="org.dom4j.samples.swing.JTableDemo" args="xml/web.xml" fork="yes">
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-  <target name="demo-tabletool" depends="samples">
-    <java classname="org.dom4j.samples.swing.JTableTool" fork="yes">
-      <arg line="xml/swing/tableForAtoms.xml"/>
-      <arg line="xml/periodic_table.xml"/>
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-
-  <target name="demo-swing" depends="samples">
-    <java classname="org.dom4j.samples.swing.JTreeDemo" fork="true">
-      <arg line="xml/web.xml"/>
-      <classpath>
-        <pathelement location="${build.dest}" />
-        <path refid="samples.classpath" />
-      </classpath>
-    </java>
-  </target>
-
-
-  <target name="demo-all" depends="demo-sax,demo-visitor,demo-count,demo-xpath,demo-html,demo-schema"/>
-</project>


Property changes on: trunk/dom4j/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/dom4j/debian/changelog
===================================================================
--- trunk/dom4j/debian/changelog	2011-08-17 16:20:40 UTC (rev 14268)
+++ trunk/dom4j/debian/changelog	2011-08-17 16:36:56 UTC (rev 14269)
@@ -1,3 +1,11 @@
+dom4j (1.6.1+dfsg.2-5) unstable; urgency=low
+
+  UNRELEASED
+  * Team upload.
+  * Remove Java runtime from Depends.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 17 Aug 2011 18:34:19 +0200
+
 dom4j (1.6.1+dfsg.2-4) unstable; urgency=low
 
   * debian/control, debian/rules: Build with default-jdk

Modified: trunk/dom4j/debian/control
===================================================================
--- trunk/dom4j/debian/control	2011-08-17 16:20:40 UTC (rev 14268)
+++ trunk/dom4j/debian/control	2011-08-17 16:36:56 UTC (rev 14269)
@@ -12,7 +12,7 @@
 
 Package: libdom4j-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libbackport-util-concurrent-java
+Depends: ${misc:Depends}, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libbackport-util-concurrent-java
 Suggests: libdom4j-java-doc
 Description: flexible XML framework for Java
  dom4j is a library for working with XML, XPath and XSLT on the Java

Added: trunk/dom4j/debian/patches/oldchanges.patch
===================================================================
--- trunk/dom4j/debian/patches/oldchanges.patch	                        (rev 0)
+++ trunk/dom4j/debian/patches/oldchanges.patch	2011-08-17 16:36:56 UTC (rev 14269)
@@ -0,0 +1,1157 @@
+Description: Upstream changes introduced in version 1.6.1+dfsg.2-4
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ dom4j (1.6.1+dfsg.2-4) unstable; urgency=low
+ .
+   * debian/control, debian/rules: Build with default-jdk
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Thierry Carrez <thierry.carrez at ubuntu.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- dom4j-1.6.1+dfsg.2.orig/build.xml
++++ dom4j-1.6.1+dfsg.2/build.xml
+@@ -16,13 +16,13 @@
+     </path>
+ 
+     <path id="test.classpath">
+-        <path refid="compile.classpath" />
+-        <fileset dir="./lib/test">
+-            <include name="**/*.jar" />
+-        </fileset>
+-        <fileset dir="./lib/tools">
+-            <include name="xalan*.jar" />
+-            <include name="xerces*.jar" />
++        <fileset dir="/usr/share/java">
++            <include name="backport-util-concurrent.jar" />
++            <include name="jaxen.jar" />
++            <include name="junitperf.jar" />
++            <include name="xalan2.jar" />
++            <include name="xercesImpl.jar" />
++            <include name="xpp3.jar" />
+         </fileset>
+     </path>
+ 
+@@ -146,6 +146,9 @@
+            source="1.3"
+            deprecation="${deprecation}"
+            classpathref="compile.classpath">
++	<exclude name="org/dom4j/datatype/**"/>
++        <exclude name="org/dom4j/io/STAXEventReader.java"/>
++        <exclude name="org/dom4j/io/STAXEventWriter.java"/>
+     </javac>
+   </target>
+ 
+@@ -159,6 +162,8 @@
+            optimize="${optimize}"
+            deprecation="${deprecation}"
+            classpathref="test.classpath">
++        <exclude name="org/dom4j/datatype/**"/>
++        <exclude name="org/dom4j/io/StaxTest.java"/>
+     </javac>
+   </target>
+ 
+@@ -219,8 +224,7 @@
+              doctitle="${Name}"
+              bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
+              stylesheetfile="${doc.dir}/style/javadoc.css">
+-      <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
+-      <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
++      <link href="file:///usr/share/doc/classpath-doc/api"/>
+     </javadoc>
+ 
+     <mkdir dir="${build.apidocs}"/>
+@@ -236,8 +240,7 @@
+              doctitle="${Name}"
+              bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
+              stylesheetfile="${doc.dir}/style/javadoc.css">
+-      <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
+-      <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
++      <link href="file:///usr/share/doc/classpath-doc/api"/>
+       <link href="${build.javadocs}"/>
+     </javadoc>
+   </target>
+@@ -278,10 +281,17 @@
+         <path refid="test.classpath" />
+       </classpath>
+ 
++      <sysproperty key="org.xml.sax.driver"
++                   value="org.apache.xerces.parsers.SAXParser"/>
++
+       <batchtest fork="yes" todir="${build.dir}/test-results/xml">
+         <fileset dir="${test.dir}">
+           <include name="**/*Test.java" />
+-          <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" />
++          <exclude name="**/AllTests.java" />
++          <exclude name="**/Abstract*.java" />
++          <exclude name="**/TestCase.java" />
++          <exclude name="**/StaxTest.java" />
++          <exclude name="**/datatype/*Test.java" />
+         </fileset>
+       </batchtest>
+     </junit>
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMDocumentType.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMDocumentType.java
+@@ -12,7 +12,9 @@ import org.dom4j.tree.DefaultDocumentTyp
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -177,6 +179,66 @@ public class DOMDocumentType extends Def
+     public String getInternalSubset() {
+         return getElementName();
+     }
++
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String arg0, String arg1) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ /*
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMProcessingInstruction.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMProcessingInstruction.java
+@@ -15,7 +15,9 @@ import org.dom4j.tree.DefaultProcessingI
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -177,6 +179,66 @@ public class DOMProcessingInstruction ex
+         }
+     }
+ 
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String arg0, String arg1) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
+     // Implementation methods
+     // -------------------------------------------------------------------------
+ }
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMAttribute.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMAttribute.java
+@@ -14,7 +14,10 @@ import org.dom4j.tree.DefaultAttribute;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.TypeInfo;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -179,6 +182,76 @@ public class DOMAttribute extends Defaul
+     public org.w3c.dom.Element getOwnerElement() {
+         return DOMNodeHelper.asDOMElement(getParent());
+     }
++
++    public TypeInfo getSchemaTypeInfo() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isId() {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node other) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String textContent) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node other) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String namespaceURI) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String namespaceURI) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String prefix) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String feature, String version) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String key, Object data, UserDataHandler handler) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String key) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ /*
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMDocumentFactory.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMDocumentFactory.java
+@@ -174,6 +174,11 @@ public class DOMDocumentFactory extends
+                     docType.getPublicId(), docType.getSystemId());
+         }
+     }
++
++    public Object getFeature(String arg0, String arg1) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ 
+@@ -213,4 +218,4 @@ public class DOMDocumentFactory extends
+  * POSSIBILITY OF SUCH DAMAGE.
+  * 
+  * Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+- */
+\ No newline at end of file
++ */
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMComment.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMComment.java
+@@ -13,7 +13,9 @@ import org.dom4j.tree.DefaultComment;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -187,6 +189,66 @@ public class DOMComment extends DefaultC
+             throws DOMException {
+         DOMNodeHelper.replaceData(this, offset, count, arg);
+     }
++
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node other) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String textContent) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node other) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String namespaceURI) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String namespaceURI) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String prefix) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String feature, String version) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String key, Object data, UserDataHandler handler) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String key) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ /*
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMNamespace.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMNamespace.java
+@@ -13,7 +13,9 @@ import org.dom4j.tree.DefaultNamespace;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -140,6 +142,66 @@ public class DOMNamespace extends Defaul
+     public boolean hasAttributes() {
+         return DOMNodeHelper.hasAttributes(this);
+     }
++
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String arg0, String arg1) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ /*
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMDocument.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMDocument.java
+@@ -15,12 +15,15 @@ import org.dom4j.tree.DefaultDocument;
+ 
+ import org.w3c.dom.Attr;
+ import org.w3c.dom.CDATASection;
++import org.w3c.dom.DOMConfiguration;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.EntityReference;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
+ import org.w3c.dom.ProcessingInstruction;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -301,6 +304,136 @@ public class DOMDocument extends Default
+             return super.getDocumentFactory();
+         }
+     }
++
++    public String getInputEncoding() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public String getXmlEncoding() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean getXmlStandalone() {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public void setXmlStandalone(boolean arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public String getXmlVersion() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setXmlVersion(String arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean getStrictErrorChecking() {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public void setStrictErrorChecking(boolean arg0) {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public String getDocumentURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setDocumentURI(String arg0) {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public Node adoptNode(Node arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public DOMConfiguration getDomConfig() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void normalizeDocument() {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public Node renameNode(Node arg0, String arg1, String arg2) throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String arg0, String arg1) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ /*
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMEntityReference.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMEntityReference.java
+@@ -13,7 +13,9 @@ import org.dom4j.tree.DefaultEntity;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -166,6 +168,66 @@ public class DOMEntityReference extends
+     public boolean hasAttributes() {
+         return DOMNodeHelper.hasAttributes(this);
+     }
++
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String arg0, String arg1) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ /*
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMText.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMText.java
+@@ -14,7 +14,9 @@ import org.dom4j.tree.DefaultText;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -224,6 +226,81 @@ public class DOMText extends DefaultText
+     protected Text createText(String text) {
+         return new DOMText(text);
+     }
++
++    public boolean isElementContentWhitespace() {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String getWholeText() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public org.w3c.dom.Text replaceWholeText(String arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String arg0, String arg1) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ /*
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMCDATA.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMCDATA.java
+@@ -14,7 +14,10 @@ import org.dom4j.tree.DefaultCDATA;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.Text;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -225,6 +228,81 @@ public class DOMCDATA extends DefaultCDA
+     protected CDATA createCDATA(String text) {
+         return new DOMCDATA(text);
+     }
++
++    public boolean isElementContentWhitespace() {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String getWholeText() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Text replaceWholeText(String content) throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node other) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String textContent) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node other) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String namespaceURI) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String namespaceURI) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String prefix) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String feature, String version) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String key, Object data, UserDataHandler handler) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String key) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ /*
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/dom/DOMElement.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/dom/DOMElement.java
+@@ -16,11 +16,14 @@ import org.dom4j.Namespace;
+ import org.dom4j.QName;
+ import org.dom4j.tree.DefaultElement;
+ 
++import org.w3c.dom.Attr;
+ import org.w3c.dom.DOMException;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
+ import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
++import org.w3c.dom.TypeInfo;
++import org.w3c.dom.UserDataHandler;
+ 
+ /**
+  * <p>
+@@ -389,6 +392,86 @@ public class DOMElement extends DefaultE
+ 
+         return getDocumentFactory().createQName(localName, prefix, namespace);
+     }
++
++    public TypeInfo getSchemaTypeInfo() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setIdAttribute(String arg0, boolean arg1) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public void setIdAttributeNS(String arg0, String arg1, boolean arg2) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public void setIdAttributeNode(Attr arg0, boolean arg1) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public String getBaseURI() {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public short compareDocumentPosition(Node arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      return 0;
++    }
++
++    public String getTextContent() throws DOMException {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public void setTextContent(String arg0) throws DOMException {
++      // TODO Auto-generated method stub
++      
++    }
++
++    public boolean isSameNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupPrefix(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isDefaultNamespace(String arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public String lookupNamespaceURI(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public boolean isEqualNode(Node arg0) {
++      // TODO Auto-generated method stub
++      return false;
++    }
++
++    public Object getFeature(String arg0, String arg1) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
++      // TODO Auto-generated method stub
++      return null;
++    }
++
++    public Object getUserData(String arg0) {
++      // TODO Auto-generated method stub
++      return null;
++    }
+ }
+ 
+ /*
+--- dom4j-1.6.1+dfsg.2.orig/src/java/org/dom4j/tree/NamespaceCache.java
++++ dom4j-1.6.1+dfsg.2/src/java/org/dom4j/tree/NamespaceCache.java
+@@ -26,42 +26,46 @@ import org.dom4j.Namespace;
+  * @version $Revision: 1.15 $
+  */
+ public class NamespaceCache {
+-    private static final String CONCURRENTREADERHASHMAP_CLASS
+-            = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap";
++    private static final String BACKPORT_CONCURRENTHASHMAP_CLASS
++        = "edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap";
++    private static final String OSWEGO_CONCURRENTHASHMAP_CLASS
++        = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap";
+ 
+     /**
+      * Cache of {@link Map}instances indexed by URI which contain caches of
+      * {@link Namespace}for each prefix
+      */
+-    protected static Map cache;
++    protected static Map cache = newConcurrentHashMap();
+ 
+     /**
+      * Cache of {@link Namespace}instances indexed by URI for default
+      * namespaces with no prefixes
+      */
+-    protected static Map noPrefixCache;
++    protected static Map noPrefixCache = newConcurrentHashMap();
+ 
+-    static {
++    protected static Map newConcurrentHashMap()
++    {
+         /* Try the java.util.concurrent.ConcurrentHashMap first. */
+         try {
+             Class clazz = Class
+                     .forName("java.util.concurrent.ConcurrentHashMap");
+             Constructor construct = clazz.getConstructor(new Class[] {
+                     Integer.TYPE, Float.TYPE, Integer.TYPE });
+-            cache = (Map) construct.newInstance(new Object[] {new Integer(11),
++            return (Map) construct.newInstance(new Object[] {new Integer(11),
+                     new Float(0.75f), new Integer(1) });
+-            noPrefixCache = (Map) construct.newInstance(new Object[] {
+-                    new Integer(11), new Float(0.75f), new Integer(1) });
+         } catch (Throwable t1) {
+-            /* Try to use the util.concurrent library (if in classpath) */
+             try {
+-                Class clazz = Class.forName(CONCURRENTREADERHASHMAP_CLASS);
+-                cache = (Map) clazz.newInstance();
+-                noPrefixCache = (Map) clazz.newInstance();
++                /* Try to use the backport-util-concurrent library */
++                Class clazz = Class.forName(BACKPORT_CONCURRENTHASHMAP_CLASS);
++                return (Map) clazz.newInstance();
+             } catch (Throwable t2) {
+-                /* If previous implementations fail, use internal one */
+-                cache = new ConcurrentReaderHashMap();
+-                noPrefixCache = new ConcurrentReaderHashMap();
++                try {
++                    /* Try to use the oswego concurrent library */
++                    Class clazz = Class.forName(OSWEGO_CONCURRENTHASHMAP_CLASS);
++                    return (Map) clazz.newInstance();
++                } catch (Throwable t3) {
++                    return null;
++                }
+             }
+         }
+     }
+@@ -154,7 +158,7 @@ public class NamespaceCache {
+                 answer = (Map) cache.get(uri);
+ 
+                 if (answer == null) {
+-                    answer = new ConcurrentReaderHashMap();
++                    answer = newConcurrentHashMap();
+                     cache.put(uri, answer);
+                 }
+             }
+--- dom4j-1.6.1+dfsg.2.orig/src/test/org/dom4j/xpath/MatrixConcatTest.java
++++ dom4j-1.6.1+dfsg.2/src/test/org/dom4j/xpath/MatrixConcatTest.java
+@@ -33,9 +33,11 @@ public class MatrixConcatTest extends Ab
+ 
+         String[] exp2 = {"EQUITY_BAR_CF1", "EQUITY_BAR_CF2", "EQUITY_BAR_CF3"};
+ 
++	/* Disabled. Doesn't wor k with any JVM I found.
+         testMatrixConcat("'EQUITY_',/product/cashflows/CashFlow/XREF", exp1);
+         testMatrixConcat("'EQUITY_','BAR_',/product/cashflows/CashFlow/XREF",
+                 exp2);
++	*/
+     }
+ 
+     // Implementation methods
+--- dom4j-1.6.1+dfsg.2.orig/xml/bean/gui.xml
++++ dom4j-1.6.1+dfsg.2/xml/bean/gui.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <widgets>
+-  <window class="javax.swing.JFrame" title="Frame #1"/>
+-  <window class="javax.swing.JFrame" title="Frame #2"/>
++  <window class="java.awt.Canvas" title="Frame #1"/>
++  <window class="java.awt.Canvas" title="Frame #2"/>
+ </widgets>

Added: trunk/dom4j/debian/patches/series
===================================================================
--- trunk/dom4j/debian/patches/series	                        (rev 0)
+++ trunk/dom4j/debian/patches/series	2011-08-17 16:36:56 UTC (rev 14269)
@@ -0,0 +1 @@
+oldchanges.patch

Deleted: trunk/dom4j/dom4j-1.6.1.jar
===================================================================
(Binary files differ)

Deleted: trunk/dom4j/maven.xml
===================================================================
--- trunk/dom4j/maven.xml	2011-08-17 16:20:40 UTC (rev 14268)
+++ trunk/dom4j/maven.xml	2011-08-17 16:36:56 UTC (rev 14269)
@@ -1,54 +0,0 @@
-<project default="dist:build-bin" 
-         xmlns:j="jelly:core" 
-         xmlns:ant="jelly:ant"
-         xmlns:doc="doc"
-         xmlns:maven="jelly:maven" >
-
-    <!-- define the classpath used to run examples -->
-    <goal name="create-classpath" prereqs="java:compile,test:compile">
-        <path id="test.classpath">
-            <pathelement path="${maven.build.dest}"/>
-            <pathelement path="target/classes"/>
-            <pathelement path="target/test-classes"/>
-            <pathelement path="src/"/>
-            <path refid="maven.dependency.classpath"/>
-        </path>
-    </goal>
-
-    <postGoal name="clean:clean">
-        <delete>
-            <fileset dir="${basedir}" includes="junit*.properties"/>
-            <fileset dir="${basedir}" includes="javadoc*"/>
-        </delete>
-    </postGoal>
-
-    <postGoal name="dist:prepare-bin-filesystem">
-        <ant:copy todir="${maven.dist.bin.assembly.dir}">
-            <fileset dir=".">
-                <include name="build.xml" />
-                <include name="maven.xml" />
-                <include name="project.properties" />
-                <include name="project.xml" />
-                <include name="LICENSE*" />
-                <include name="lib/**" />
-                <include name="src/**" />
-                <include name="xdocs/**" />
-                <include name="xml/**" />
-            </fileset>
-        </ant:copy>
-        <ant:copy todir="${maven.dist.bin.assembly.dir}/docs">
-            <fileset dir="target/docs"/>
-        </ant:copy>
-    </postGoal>
-
-    <postGoal name="dist:prepare-src-filesystem">
-        <ant:copy todir="${maven.dist.src.assembly.dir}/lib">
-            <fileset dir="lib"/>
-        </ant:copy>
-    </postGoal>
-
-    <preGoal name="site">
-        <attainGoal name="docbook:transform"/>
-    </preGoal>
-
-</project>

Deleted: trunk/dom4j/project.properties
===================================================================
--- trunk/dom4j/project.properties	2011-08-17 16:20:40 UTC (rev 14268)
+++ trunk/dom4j/project.properties	2011-08-17 16:36:56 UTC (rev 14269)
@@ -1,61 +0,0 @@
-# -------------------------------------------------------------------
-# P R O J E C T  P R O P E R T I E S
-# -------------------------------------------------------------------
-maven.repo.remote=http://www.ibiblio.org/maven
-
-maven.junit.fork=true
-
-maven.compile.debug = on
-maven.compile.optimize = off
-maven.compile.deprecation = on
-maven.compile.target = 1.3
-maven.compile.source = 1.3
-
-maven.jarResources.basedir = ${basedir}/src/java
-
-# ------------------------------------------------------------------------
-# M A V E N  J A R  O V E R R I D E
-# ------------------------------------------------------------------------
-maven.jar.override = on
-
-# ------------------------------------------------------------------------
-# J A L O P Y  S E T T I N G S
-# ------------------------------------------------------------------------
-maven.jalopy.style = jalopy.xml
-maven.jalopy.filesetExclude = org/dom4j/tree/ConcurrentReaderHashMap.java
-
-maven.checkstyle.properties = ${basedir}/checkstyle.xml
-maven.checkstyle.excludes = org/dom4j/tree/ConcurrentReaderHashMap.java
-
-# ------------------------------------------------------------------------
-# Jars set explicity by path.
-# ------------------------------------------------------------------------
-maven.jar.stax = ${basedir}/lib/jsr173_1.0_api.jar
-maven.jar.stax-ri = ${basedir}/lib/test/jsr173_1.0_ri.jar
-maven.jar.pull-parser = ${basedir}/lib/pull-parser-2.1.10.jar
-
-# -------------------------------------------------------------------
-# J A V A D O C  P R O P E R T I E S
-# -------------------------------------------------------------------
-
-# Display the date on the Maven web site
-maven.xdoc.date = left
-
-# Display the maven version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
-
-maven.javadoc.links = http://java.sun.com/j2se/1.3/docs/api/, http://java.sun.com/xml/jaxp/dist/1.1/docs/api/
-
-# -------------------------------------------------------------------
-# D O C  P R O P E R T I E S
-# -------------------------------------------------------------------
-
-maven.ui.banner.background = #fff
-maven.ui.banner.foreground = #000
-
-
-# -------------------------------------------------------------------
-# C L O V E R   P R O P E R T I E S
-# -------------------------------------------------------------------
-maven.clover.license.path = ${basedir}/lib/tools/clover.license
-maven.clover.excludes = org/dom4j/persistence/**
\ No newline at end of file

Deleted: trunk/dom4j/project.xml
===================================================================
--- trunk/dom4j/project.xml	2011-08-17 16:20:40 UTC (rev 14268)
+++ trunk/dom4j/project.xml	2011-08-17 16:36:56 UTC (rev 14269)
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project>
-  <pomVersion>3</pomVersion>
-  <name>dom4j</name>
-  <id>dom4j</id>
-  <currentVersion>1.6.1</currentVersion>
-  
-  <organization>
-    <name>MetaStuff Ltd.</name>
-    <url>http://sourceforge.net/projects/dom4j</url>
-    <logo>http://sourceforge.net/sflogo.php?group_id=16035</logo>
-  </organization>
-  <logo>/images/logo.gif</logo>
-  
-  <inceptionYear>2001</inceptionYear>
- 
-  <package>org.dom4j</package>
-   <packageGroups>
-    <packageGroup>
-      <title>Core Developer API</title>
-      <packages>org.dom4j,org.dom4j.io</packages>
-    </packageGroup>
-    <packageGroup>
-      <title>Utility classes</title>
-      <packages>org.dom4j.util</packages>
-    </packageGroup>
-    <packageGroup>
-      <title>XRule engine for declarative XSLT style processing</title>
-      <packages>org.dom4j.rule,org.dom4j.rule.*</packages>
-    </packageGroup>
-    <packageGroup>
-      <title>Alternative dom4j implementations</title>
-      <packages>org.dom4j.datatype,org.dom4j.dom,org.dom4j.bean</packages>
-    </packageGroup>
-    <packageGroup>
-      <title>Swing helper classes</title>
-      <packages>org.dom4j.swing</packages>
-    </packageGroup>
-    <packageGroup>
-      <title>Implementation classes</title>
-      <packages>org.dom4j.tree,org.dom4j.dtd,org.dom4j.xpp,org.dom4j.xpath</packages>
-    </packageGroup>
-  </packageGroups>
-  
-  
-  <shortDescription>dom4j : XML framework for Java</shortDescription>
-  <gumpRepositoryId>dom4j</gumpRepositoryId>
-
-  <description>dom4j: the flexible XML framework for Java</description>
-  <url>http://dom4j.org</url>
-
-  <cvsWebUrl>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dom4j/dom4j/</cvsWebUrl>
-  <cvsModule>dom4j/dom4j</cvsModule>
-  <issueTrackingUrl>http://sourceforge.net/tracker/?group_id=16035</issueTrackingUrl>
-
-  <siteAddress>dom4j.org</siteAddress>
-  <siteDirectory>/home/groups/d/do/dom4j/htdocs</siteDirectory>
-
-  <repository>
-    <connection>scm:cvs:pserver:anonymous at cvs.sourceforge.net:/cvsroot/dom4j:dom4j</connection>
-    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/dom4j:dom4j</developerConnection>
-    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dom4j/dom4j/</url>
-  </repository>
-
-  <branches>
-    <branch>
-      <tag>DOM4J_1_X_BRANCH</tag>
-    </branch>
-  </branches>
-   
-  <mailingLists>
-  
-    <mailingList>
-      <name>dom4j user list</name>
-      <subscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-user</subscribe>
-      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-user</unsubscribe>
-      <archive>http://www.mail-archive.com/dom4j-user%40lists.sourceforge.net/</archive>
-    </mailingList>
-
-    <mailingList>
-      <name>dom4j developer list</name>
-      <subscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-dev</subscribe>
-      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-dev</unsubscribe>
-      <archive>http://www.mail-archive.com/dom4j-dev%40lists.sourceforge.net/</archive>
-    </mailingList>
-  
-    <mailingList>
-      <name>dom4j commits list</name>
-      <subscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-commits</subscribe>
-      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-commits</unsubscribe>
-    </mailingList>
-    
-  </mailingLists>
-
-  
-  <developers>
-    <developer>
-      <name>Curt Arnold</name>
-      <id>carnold</id>
-      <email>carnold at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>David Lucas</name>
-      <id>ddlucas</id>
-      <email>ddlucas at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>David White</name>
-      <id>drwhite</id>
-      <email>drwhite at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>Jakob Jenkov</name>
-      <id>jjenkov</id>
-      <email>jjenkov at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>James Strachan</name>
-      <id>jstrachan</id>
-      <email>jstrachan at apache.org</email>
-      <organization>SpiritSoft, Inc.</organization>
-    </developer>
-    <developer>
-      <name>Laramie Crocker</name>
-      <id>laramiec</id>
-      <email>laramiec at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>Maarten Coene</name>
-      <id>maartenc</id>
-      <email>maartenc at users.sourceforge.net</email>
-      <organization>Cronos</organization>
-    </developer>
-    <developer>
-      <name>Michael Skells</name>
-      <id>mskells</id>
-      <email>mskells at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>Nick Sanderson</name>
-      <id>nicksanderson</id>
-      <email>nicksanderson at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>Steen Lehmann</name>
-      <id>slehmann</id>
-      <email>slehmann at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>Tobias Rademacher</name>
-      <id>tradem</id>
-      <email>tradem at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>Bob McWhirter</name>
-      <id>werken</id>
-      <email>werken at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>Todd Wolff</name>
-      <id>wolfftw</id>
-      <email>wolfftw at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>OuYang Chen</name>
-      <id>yeekee</id>
-      <email>yeekee at users.sourceforge.net</email>
-    </developer>
-    <developer>
-      <name>Yuxin Ruan</name>
-      <id>yruan2</id>
-      <email>yruan2 at users.sourceforge.net</email>
-    </developer>
-  </developers>
-  
-  <dependencies>
-
-    <!-- compilation dependencies -->
-
-    <dependency>
-      <groupId>jaxme</groupId>
-      <artifactId>jaxme-api</artifactId>
-      <version>0.3</version>
-      <url>http://ws.apache.org/jaxme/index.html</url>
-    </dependency>
-
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen</artifactId>
-      <version>1.1-beta-6</version>
-      <url>http://jaxen.codehaus.org/</url>
-    </dependency>
-
-    <dependency>
-      <groupId>msv</groupId>
-      <artifactId>xsdlib</artifactId>
-      <version>20030807</version>
-      <url>https://msv.dev.java.net/</url>
-    </dependency>
-
-    <dependency>
-      <groupId>msv</groupId>
-      <artifactId>relaxngDatatype</artifactId>
-      <version>20030807</version>
-      <url>https://msv.dev.java.net/</url>
-    </dependency>
-
-    <dependency>
-      <groupId>pull-parser</groupId>
-      <artifactId>pull-parser</artifactId>
-      <version>2</version>
-      <url>http://www.extreme.indiana.edu/xgws/xsoap/xpp/</url>
-    </dependency>
-    
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
-      <version>1.1.3.3</version>
-      <url>http://www.extreme.indiana.edu/xgws/xsoap/xpp/</url>
-    </dependency>
-
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax</artifactId>
-      <version>1.0</version>
-      <url>http://jcp.org/aboutJava/communityprocess/final/jsr173/index.html</url>
-    </dependency>
-
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>2.0.2</version>
-      <url>http://xml.apache.org/xerces2-j/index.html</url>
-    </dependency>
-
-    <!-- testing dependencies -->
-    
-    <dependency>
-      <groupId>junitperf</groupId>
-      <artifactId>junitperf</artifactId>
-      <version>1.8</version>
-      <url>http://www.clarkware.com/software/JUnitPerf.html</url>
-    </dependency>
-    
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-ri</artifactId>
-      <version>1.0</version>
-      <url>http://dev2dev.bea.com/technologies/stax/index.jsp</url>
-    </dependency>
-
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.2</version>
-      <url>http://xml.apache.org/xerces2-j/index.html</url>
-    </dependency>
-
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.5.1</version>
-      <url>http://xml.apache.org/xalan-j/index.html</url>
-    </dependency>
-
-  </dependencies>
-  
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
-    <!-- Unit test classes -->
-    <unitTest>
-      <includes>
-        <include>**/*Test.java</include>
-      </includes>
-    </unitTest>
-    
-    <nagEmailAddress>dom4j-dev at lists.sourceforge.net</nagEmailAddress>
-  </build>
-
-  <reports>
-     <report>maven-changelog-plugin</report>
-     <report>maven-changes-plugin</report>
-     <report>maven-checkstyle-plugin</report>
-     <report>maven-clover-plugin</report>
-     <report>maven-developer-activity-plugin</report>
-     <report>maven-faq-plugin</report>
-     <report>maven-file-activity-plugin</report>
-     <report>maven-javadoc-plugin</report>
-     <report>maven-jdepend-plugin</report>
-     <report>maven-junit-report-plugin</report>
-     <report>maven-jxr-plugin</report>
-     <report>maven-license-plugin</report>
-  </reports>
-
-</project>




More information about the pkg-java-commits mailing list