This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libjaxen-java.
commit ae3d3f80119cfb1f37db501b6972398a7331a28d
Author: Marcus Better <mar...@better.se>
Date: Wed Jun 6 15:37:40 2007 +0000
Re-enable dom4j support. We no longer split out dom4j support to the dom4j
package. This introduces a circular build- and runtime dependency on dom4j,
which is ok.
---
build.xml | 3 --
debian/README.Debian | 14 ++----
debian/changelog | 1 +
debian/control | 8 ++--
...0_BuildXml_DisableXomDom4J_CompileAndTest.patch | 56 ----------------------
debian/patches/01_RemoveXomDom4jTests.patch | 38 ---------------
debian/rules | 2 +-
src/java/test/org/jaxen/test/JaxenTests.java | 1 +
8 files changed, 11 insertions(+), 112 deletions(-)
diff --git a/build.xml b/build.xml
index fdc37d0..8850a6a 100644
--- a/build.xml
+++ b/build.xml
@@ -44,7 +44,6 @@
<mkdir dir="${classesdir}">
</mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
- <exclude name="org/jaxen/dom4j/*"/>
<exclude name="org/jaxen/xom/*"/>
<src>
<pathelement location="src/java/main">
@@ -100,7 +99,6 @@
<batchtest todir="${testreportdir}">
<fileset dir="src/java/test">
<include name="**/*Test.java"/>
- <exclude name="org/jaxen/test/DOM4J*.java"/>
<exclude name="org/jaxen/test/XOM*.java"/>
</fileset>
</batchtest>
@@ -115,7 +113,6 @@
<mkdir dir="${testclassesdir}">
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
- <exclude name="org/jaxen/test/DOM4J*.java"/>
<exclude name="org/jaxen/test/XOM*.java"/>
<src>
<pathelement location="src/java/test">
diff --git a/debian/README.Debian b/debian/README.Debian
index 3b4100c..a04d622 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,14 +1,8 @@
libjaxen-java for Debian
------------------------
-Jaxen in Debian supports JDOM, DOM out of the box.
+Jaxen in Debian supports JDOM, DOM and dom4j out of the box. Support
+for XOM is disabled for the time being, since XOM has not yet been
+packaged for Debian.
-Due to circular dependencies which need to be solved upstream we split
-the XOM and DOM4J XPath support parts out to their respective packages
-in debian (currently there is only a dom4j package).
-
-As one needs the dom4j jar is one wants to use jaxen with dom4j there is
-no difference from a user point of view if some classes are in the dom4j jar
-instead of the jaxen jar.
-
- -- Arnaud Vandyck <av...@debian.org>, Fri Apr 15 16:31:06 2005
+ -- Marcus Better <mar...@better.se>, Wed, 6 Jun 2007 17:35:58 +0200
diff --git a/debian/changelog b/debian/changelog
index 1b83b11..6d0ec09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libjaxen-java (1.1.1-1) unstable; urgency=low
* New upstream release. (Closes: #427224)
+ * Build-depend on libdom4j-java and re-enable DOM4J unit tests.
* debian/control: Add XS-Vcs-* fields.
-- Marcus Better <mar...@better.se> Wed, 06 Jun 2007 17:21:05 +0200
diff --git a/debian/control b/debian/control
index 79f7833..10f531c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,16 @@ Source: libjaxen-java
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <av...@debian.org>, Wolfgang Baer <wb...@gmx.de>,
Marcus Better <mar...@better.se>
-Build-Depends: debhelper (>= 5.0.0), ant, ant-optional
-Build-Depends-Indep: java-gcj-compat-dev, junit, libjdom1-java, libxerces2-java
+Uploaders: Arnaud Vandyck <av...@debian.org>, Marcus Better <mar...@better.se>
+Build-Depends: debhelper (>= 5), ant, ant-optional
+Build-Depends-Indep: java-gcj-compat-dev, junit, libjdom1-java,
libxerces2-java, libdom4j-java
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjaxen-java
XS-Vcs-Browse: http://svn.debian.org/wsvn/pkg-java/trunk/libjaxen-java/
Package: libjaxen-java
Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libjdom1-java, libxerces2-java
+Depends: kaffe | java1-runtime | java2-runtime, libjdom1-java,
libxerces2-java, libdom4j-java
Suggests: java-virtual-machine
Conflicts: libsaxpath-java
Replaces: libsaxpath-java
diff --git a/debian/patches/00_BuildXml_DisableXomDom4J_CompileAndTest.patch
b/debian/patches/00_BuildXml_DisableXomDom4J_CompileAndTest.patch
deleted file mode 100644
index f17ad3b..0000000
--- a/debian/patches/00_BuildXml_DisableXomDom4J_CompileAndTest.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- build.xml.orig 2006-02-12 18:03:46.000000000 +0100
-+++ build.xml 2006-02-12 16:10:59.000000000 +0100
-@@ -44,6 +44,8 @@
- <mkdir dir="${classesdir}">
- </mkdir>
- <javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
-+ <exclude name="org/jaxen/dom4j/*"/>
-+ <exclude name="org/jaxen/xom/*"/>
- <src>
- <pathelement location="src/java/main">
- </pathelement>
-@@ -79,7 +81,7 @@
- <target name="internal-test" if="Junit.present"
depends="junit-present,compile-tests">
- <mkdir dir="${testreportdir}">
- </mkdir>
-- <junit dir="./" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
-+ <junit dir="./" failureproperty="false" printSummary="yes" fork="true"
haltonerror="false">
- <sysproperty key="basedir" value=".">
- </sysproperty>
- <formatter type="xml">
-@@ -87,6 +89,7 @@
- <formatter usefile="false" type="plain">
- </formatter>
- <classpath>
-+ <pathelement location="/usr/share/java/jdom1.jar"/>
- <path refid="build.classpath">
- </path>
- <pathelement path="${testclassesdir}">
-@@ -98,8 +101,9 @@
- <fileset dir="src/java/test">
- <include name="**/*Test.java">
- </include>
-- <exclude name="org/jaxen/jdom/XPathTest.java">
-- </exclude>
-+ <exclude name="org/jaxen/jdom/XPathTest.java"/>
-+ <exclude name="org/jaxen/dom4j/*.java"/>
-+ <exclude name="org/jaxen/xom/*.java"/>
- </fileset>
- </batchtest>
- </junit>
-@@ -113,6 +117,8 @@
- <mkdir dir="${testclassesdir}">
- </mkdir>
- <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
-+ <exclude name="org/jaxen/dom4j/*"/>
-+ <exclude name="org/jaxen/xom/*"/>
- <src>
- <pathelement location="src/java/test">
- </pathelement>
-@@ -169,4 +175,4 @@
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
- </target>
--</project>
-\ Kein Zeilenumbruch am Dateiende.
-+</project>
diff --git a/debian/patches/01_RemoveXomDom4jTests.patch
b/debian/patches/01_RemoveXomDom4jTests.patch
deleted file mode 100644
index 21b3dac..0000000
--- a/debian/patches/01_RemoveXomDom4jTests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/java/test/org/jaxen/JaxenTests.java.orig 2006-02-12
15:33:02.000000000 +0100
-+++ src/java/test/org/jaxen/JaxenTests.java 2006-02-12 15:48:10.000000000
+0100
-@@ -63,7 +63,7 @@
- package org.jaxen;
-
- import org.jaxen.dom.DOMTests;
--import org.jaxen.dom4j.DOM4JTests;
-+//import org.jaxen.dom4j.DOM4JTests;
- import org.jaxen.expr.ExprTests;
- import org.jaxen.function.FunctionTests;
- import org.jaxen.javabean.JavaBeanTests;
-@@ -73,7 +73,7 @@
- import org.jaxen.saxpath.base.BaseTests;
- import org.jaxen.saxpath.helpers.HelpersTests;
- import org.jaxen.util.UtilTests;
--import org.jaxen.xom.XOMTests;
-+//import org.jaxen.xom.XOMTests;
-
- import junit.framework.Test;
- import junit.framework.TestSuite;
-@@ -98,8 +98,8 @@
- result.addTest(CoreTests.suite());
- result.addTest(DOMTests.suite());
- result.addTest(JDOMTests.suite());
-- result.addTest(DOM4JTests.suite());
-- result.addTest(XOMTests.suite());
-+ //result.addTest(DOM4JTests.suite());
-+ //result.addTest(XOMTests.suite());
- result.addTest(JavaBeanTests.suite());
- result.addTest(PatternTests.suite());
- result.addTest(BaseTests.suite());
-@@ -111,4 +111,4 @@
- }
-
-
--}
-\ Kein Zeilenumbruch am Dateiende.
-+}
diff --git a/debian/rules b/debian/rules
index 6d6ad75..48ef9f1 100755
--- a/debian/rules
+++ b/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 jdom1 ant-junit junit xercesImpl
+DEB_JARS := ant ant-launcher jdom1 dom4j ant-junit junit xercesImpl
DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
diff --git a/src/java/test/org/jaxen/test/JaxenTests.java
b/src/java/test/org/jaxen/test/JaxenTests.java
index 4e2b172..0a42953 100644
--- a/src/java/test/org/jaxen/test/JaxenTests.java
+++ b/src/java/test/org/jaxen/test/JaxenTests.java
@@ -72,6 +72,7 @@ public class JaxenTests {
result.addTest(CoreTests.suite());
result.addTest(DOMTests.suite());
result.addTest(JDOMTests.suite());
+ result.addTest(DOM4JTests.suite());
result.addTest(JavaBeanTests.suite());
result.addTest(PatternTests.suite());
result.addTest(BaseTests.suite());
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libjaxen-java.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
