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

[Marcus Better]

Author: marcusb-guest
Date: 2009-05-18 16:17:54 +0000 (Mon, 18 May 2009)
New Revision: 8274

Added:
   trunk/dom4j/dom4j/debian/ant.properties
Modified:
   trunk/dom4j/dom4j/build.xml
   trunk/dom4j/dom4j/debian/changelog
   trunk/dom4j/dom4j/debian/rules
Log:
Re-enable test case BeansTest by running tests in headless
mode. (Closes: #403052)

Modified: trunk/dom4j/dom4j/build.xml
===================================================================
--- trunk/dom4j/dom4j/build.xml	2009-05-18 16:10:49 UTC (rev 8273)
+++ trunk/dom4j/dom4j/build.xml	2009-05-18 16:17:54 UTC (rev 8274)
@@ -292,7 +292,6 @@
           <exclude name="**/TestCase.java" />
           <exclude name="**/StaxTest.java" />
           <exclude name="**/datatype/*Test.java" />
-          <exclude name="**/bean/*Test.java" />
         </fileset>
       </batchtest>
     </junit>

Added: trunk/dom4j/dom4j/debian/ant.properties
===================================================================
--- trunk/dom4j/dom4j/debian/ant.properties	                        (rev 0)
+++ trunk/dom4j/dom4j/debian/ant.properties	2009-05-18 16:17:54 UTC (rev 8274)
@@ -0,0 +1 @@
+java.awt.headless=true

Modified: trunk/dom4j/dom4j/debian/changelog
===================================================================
--- trunk/dom4j/dom4j/debian/changelog	2009-05-18 16:10:49 UTC (rev 8273)
+++ trunk/dom4j/dom4j/debian/changelog	2009-05-18 16:17:54 UTC (rev 8274)
@@ -4,8 +4,10 @@
   * Change section to java.
   * Remove source files from jaxen since we have (circular) build
     dependency on libjaxen-java. (Closes: #427913)
+  * Re-enable test case BeansTest by running tests in headless
+    mode. (Closes: #403052)
 
- -- Marcus Better <marcus at better.se>  Mon, 18 May 2009 17:55:40 +0200
+ -- Marcus Better <marcus at better.se>  Mon, 18 May 2009 18:05:17 +0200
 
 dom4j (1.6.1+dfsg-3) unstable; urgency=low
 

Modified: trunk/dom4j/dom4j/debian/rules
===================================================================
--- trunk/dom4j/dom4j/debian/rules	2009-05-18 16:10:49 UTC (rev 8273)
+++ trunk/dom4j/dom4j/debian/rules	2009-05-18 16:17:54 UTC (rev 8274)
@@ -15,8 +15,9 @@
 		done; \
 		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
 
+ANT_ARGS	:= -propertyfile debian/ant.properties
 ANT_INVOKE	:= $(JAVACMD) -classpath $(DEB_CLASSPATH) \
-		org.apache.tools.ant.Main $(DEB_ANT_ARGS)
+		org.apache.tools.ant.Main $(ANT_ARGS)
 
 PKGNAME		:= libdom4j-java
 INSTALLDIR	:= $(CURDIR)/debian/$(PKGNAME)