[pkg-java] r10816 - in trunk/libgroboutils-java: . debian debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Mon Oct 12 22:26:53 UTC 2009
Author: drazzib
Date: 2009-10-12 22:26:53 +0000 (Mon, 12 Oct 2009)
New Revision: 10816
Added:
trunk/libgroboutils-java/debian/README.source
trunk/libgroboutils-java/debian/patches/01_reduce_junit_logging.diff
trunk/libgroboutils-java/debian/patches/02_dont_stop_on_junit_failure.diff
trunk/libgroboutils-java/debian/patches/03_easymock_upgrade.diff
trunk/libgroboutils-java/debian/patches/04_coverage_zip_archives.diff
trunk/libgroboutils-java/debian/patches/05_rename_subprojects.diff
trunk/libgroboutils-java/debian/patches/series
Removed:
trunk/libgroboutils-java/.pc/
trunk/libgroboutils-java/debian/patches/00list
trunk/libgroboutils-java/debian/patches/01_reduce_junit_logging.dpatch
trunk/libgroboutils-java/debian/patches/02_dont_stop_on_junit_failure.dpatch
trunk/libgroboutils-java/debian/patches/03_easymock_upgrade.dpatch
trunk/libgroboutils-java/debian/patches/04_coverage_zip_archives.dpatch
trunk/libgroboutils-java/debian/patches/05_rename_subprojects.dpatch
Modified:
trunk/libgroboutils-java/debian/changelog
trunk/libgroboutils-java/debian/control
trunk/libgroboutils-java/debian/rules
Log:
Update groboutils packaging
Added: trunk/libgroboutils-java/debian/README.source
===================================================================
--- trunk/libgroboutils-java/debian/README.source (rev 0)
+++ trunk/libgroboutils-java/debian/README.source 2009-10-12 22:26:53 UTC (rev 10816)
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
Modified: trunk/libgroboutils-java/debian/changelog
===================================================================
--- trunk/libgroboutils-java/debian/changelog 2009-10-12 21:57:10 UTC (rev 10815)
+++ trunk/libgroboutils-java/debian/changelog 2009-10-12 22:26:53 UTC (rev 10816)
@@ -2,4 +2,4 @@
* Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 08 Oct 2009 23:13:36 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 13 Oct 2009 00:00:14 +0200
Modified: trunk/libgroboutils-java/debian/control
===================================================================
--- trunk/libgroboutils-java/debian/control 2009-10-12 21:57:10 UTC (rev 10815)
+++ trunk/libgroboutils-java/debian/control 2009-10-12 22:26:53 UTC (rev 10816)
@@ -2,13 +2,20 @@
Section: java
Priority: optional
Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, dpatch
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, quilt
Build-Depends-Indep: ant-optional, junit4 (>= 4.5), liblog4j1.2-java, libeasymock-java, libbcel-java
Standards-Version: 3.8.3
Homepage: http://groboutils.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgroboutils-java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgroboutils-java/
Package: libgroboutils-java
Architecture: all
Depends: ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+Description: Java-based testing tools and JUnit extensions
+ GroboUtils is a group of Java-based testing tools and JUnit extensions aimed at
+ increasing quality awareness and ease of introduction of testing tools into the
+ development cycle.
+ .
+ GroboUtils include, for example, multi-threaded tests, hierarchial unit tests,
+ and a code coverage tool.
Deleted: trunk/libgroboutils-java/debian/patches/00list
===================================================================
--- trunk/libgroboutils-java/debian/patches/00list 2009-10-12 21:57:10 UTC (rev 10815)
+++ trunk/libgroboutils-java/debian/patches/00list 2009-10-12 22:26:53 UTC (rev 10816)
@@ -1,6 +0,0 @@
-01_reduce_junit_logging
-02_dont_stop_on_junit_failure
-03_easymock_upgrade
-04_coverage_zip_archives
-05_rename_subprojects
-
Added: trunk/libgroboutils-java/debian/patches/01_reduce_junit_logging.diff
===================================================================
--- trunk/libgroboutils-java/debian/patches/01_reduce_junit_logging.diff (rev 0)
+++ trunk/libgroboutils-java/debian/patches/01_reduce_junit_logging.diff 2009-10-12 22:26:53 UTC (rev 10816)
@@ -0,0 +1,219 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_reduce_junit_logging.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- a/codecoverage/log4j.properties
++++ b/codecoverage/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.codecoverage=DEBUG
++log4j.category.net.sourceforge.groboutils.codecoverage=ERROR
+
+--- a/pmti/log4j.properties
++++ b/pmti/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.pmti=DEBUG
++log4j.category.net.sourceforge.groboutils.pmti=ERROR
+
+--- a/testing-autodoc/log4j.properties
++++ b/testing-autodoc/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,6 +7,6 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.testing.autodoc=DEBUG
+-log4j.category.net.sourceforge.groboutils.util.classes=DEBUG
++log4j.category.net.sourceforge.groboutils.testing.autodoc=ERROR
++log4j.category.net.sourceforge.groboutils.util.classes=ERROR
+
+--- a/testing-junit/log4j.properties
++++ b/testing-junit/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.junit=DEBUG
++log4j.category.net.sourceforge.groboutils.junit=ERROR
+
+--- a/testing-mbtf/log4j.properties
++++ b/testing-mbtf/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.testing.mbtf=DEBUG
++log4j.category.net.sourceforge.groboutils.testing.mbtf=ERROR
+
+--- a/testing-tp/log4j.properties
++++ b/testing-tp/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.tp=DEBUG
++log4j.category.net.sourceforge.groboutils.tp=ERROR
+
+--- a/uicapture/log4j.properties
++++ b/uicapture/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.uicapture=DEBUG
++log4j.category.net.sourceforge.groboutils.uicapture=ERROR
+
+--- a/util-classes/log4j.properties
++++ b/util-classes/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.util.classes=DEBUG
++log4j.category.net.sourceforge.groboutils.util.classes=ERROR
+
+--- a/util-datastruct/log4j.properties
++++ b/util-datastruct/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.util.datastruct=DEBUG
++log4j.category.net.sourceforge.groboutils.util.datastruct=ERROR
+
+--- a/util-io/log4j.properties
++++ b/util-io/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.util.io=DEBUG
++log4j.category.net.sourceforge.groboutils.util.io=ERROR
+
+--- a/util-states/log4j.properties
++++ b/util-states/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.util.states=DEBUG
++log4j.category.net.sourceforge.groboutils.util.states=ERROR
+
+--- a/util-thread/log4j.properties
++++ b/util-thread/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.util.thread=DEBUG
++log4j.category.net.sourceforge.groboutils.util.thread=ERROR
+
+--- a/util-xml/log4j.properties
++++ b/util-xml/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.util.xml=DEBUG
++log4j.category.net.sourceforge.groboutils.util.xml=ERROR
+
+--- a/website/log4j.properties
++++ b/website/log4j.properties
+@@ -1,4 +1,4 @@
+-log4j.rootCategory=WARN, stdout
++log4j.rootCategory=ERROR, stdout
+
+
+ # A1 is set to be a ConsoleAppender.
+@@ -7,5 +7,5 @@
+ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+
+-log4j.category.net.sourceforge.groboutils.website=DEBUG
++log4j.category.net.sourceforge.groboutils.website=ERROR
+
Deleted: trunk/libgroboutils-java/debian/patches/01_reduce_junit_logging.dpatch
===================================================================
--- trunk/libgroboutils-java/debian/patches/01_reduce_junit_logging.dpatch 2009-10-12 21:57:10 UTC (rev 10815)
+++ trunk/libgroboutils-java/debian/patches/01_reduce_junit_logging.dpatch 2009-10-12 22:26:53 UTC (rev 10816)
@@ -1,233 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_reduce_junit_logging.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad libgroboutils-java-5~/codecoverage/log4j.properties libgroboutils-java-5/codecoverage/log4j.properties
---- libgroboutils-java-5~/codecoverage/log4j.properties 2002-07-29 00:43:33.000000000 +0200
-+++ libgroboutils-java-5/codecoverage/log4j.properties 2009-03-23 15:54:47.884786891 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.codecoverage=DEBUG
-+log4j.category.net.sourceforge.groboutils.codecoverage=ERROR
-
-diff -urNad libgroboutils-java-5~/pmti/log4j.properties libgroboutils-java-5/pmti/log4j.properties
---- libgroboutils-java-5~/pmti/log4j.properties 2002-07-29 00:43:47.000000000 +0200
-+++ libgroboutils-java-5/pmti/log4j.properties 2009-03-23 15:56:54.852287125 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.pmti=DEBUG
-+log4j.category.net.sourceforge.groboutils.pmti=ERROR
-
-diff -urNad libgroboutils-java-5~/testing-autodoc/log4j.properties libgroboutils-java-5/testing-autodoc/log4j.properties
---- libgroboutils-java-5~/testing-autodoc/log4j.properties 2009-03-23 15:54:10.000000000 +0100
-+++ libgroboutils-java-5/testing-autodoc/log4j.properties 2009-03-23 15:54:11.713287297 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,6 +7,6 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.testing.autodoc=DEBUG
--log4j.category.net.sourceforge.groboutils.util.classes=DEBUG
-+log4j.category.net.sourceforge.groboutils.testing.autodoc=ERROR
-+log4j.category.net.sourceforge.groboutils.util.classes=ERROR
-
-diff -urNad libgroboutils-java-5~/testing-junit/log4j.properties libgroboutils-java-5/testing-junit/log4j.properties
---- libgroboutils-java-5~/testing-junit/log4j.properties 2009-03-23 15:54:10.000000000 +0100
-+++ libgroboutils-java-5/testing-junit/log4j.properties 2009-03-23 15:54:11.713287297 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.junit=DEBUG
-+log4j.category.net.sourceforge.groboutils.junit=ERROR
-
-diff -urNad libgroboutils-java-5~/testing-mbtf/log4j.properties libgroboutils-java-5/testing-mbtf/log4j.properties
---- libgroboutils-java-5~/testing-mbtf/log4j.properties 2009-03-23 15:54:10.000000000 +0100
-+++ libgroboutils-java-5/testing-mbtf/log4j.properties 2009-03-23 15:54:11.713287297 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.testing.mbtf=DEBUG
-+log4j.category.net.sourceforge.groboutils.testing.mbtf=ERROR
-
-diff -urNad libgroboutils-java-5~/testing-tp/log4j.properties libgroboutils-java-5/testing-tp/log4j.properties
---- libgroboutils-java-5~/testing-tp/log4j.properties 2009-03-23 15:54:10.000000000 +0100
-+++ libgroboutils-java-5/testing-tp/log4j.properties 2009-03-23 15:54:11.713287297 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.tp=DEBUG
-+log4j.category.net.sourceforge.groboutils.tp=ERROR
-
-diff -urNad libgroboutils-java-5~/uicapture/log4j.properties libgroboutils-java-5/uicapture/log4j.properties
---- libgroboutils-java-5~/uicapture/log4j.properties 2002-07-29 00:44:06.000000000 +0200
-+++ libgroboutils-java-5/uicapture/log4j.properties 2009-03-23 15:56:42.181086719 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.uicapture=DEBUG
-+log4j.category.net.sourceforge.groboutils.uicapture=ERROR
-
-diff -urNad libgroboutils-java-5~/util-classes/log4j.properties libgroboutils-java-5/util-classes/log4j.properties
---- libgroboutils-java-5~/util-classes/log4j.properties 2002-07-29 00:44:10.000000000 +0200
-+++ libgroboutils-java-5/util-classes/log4j.properties 2009-03-23 15:55:00.184286973 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.util.classes=DEBUG
-+log4j.category.net.sourceforge.groboutils.util.classes=ERROR
-
-diff -urNad libgroboutils-java-5~/util-datastruct/log4j.properties libgroboutils-java-5/util-datastruct/log4j.properties
---- libgroboutils-java-5~/util-datastruct/log4j.properties 2002-07-29 00:44:12.000000000 +0200
-+++ libgroboutils-java-5/util-datastruct/log4j.properties 2009-03-23 15:56:00.273577761 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.util.datastruct=DEBUG
-+log4j.category.net.sourceforge.groboutils.util.datastruct=ERROR
-
-diff -urNad libgroboutils-java-5~/util-io/log4j.properties libgroboutils-java-5/util-io/log4j.properties
---- libgroboutils-java-5~/util-io/log4j.properties 2002-07-29 00:44:14.000000000 +0200
-+++ libgroboutils-java-5/util-io/log4j.properties 2009-03-23 15:55:32.540292388 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.util.io=DEBUG
-+log4j.category.net.sourceforge.groboutils.util.io=ERROR
-
-diff -urNad libgroboutils-java-5~/util-states/log4j.properties libgroboutils-java-5/util-states/log4j.properties
---- libgroboutils-java-5~/util-states/log4j.properties 2002-07-29 00:44:19.000000000 +0200
-+++ libgroboutils-java-5/util-states/log4j.properties 2009-03-23 15:55:45.236302530 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.util.states=DEBUG
-+log4j.category.net.sourceforge.groboutils.util.states=ERROR
-
-diff -urNad libgroboutils-java-5~/util-thread/log4j.properties libgroboutils-java-5/util-thread/log4j.properties
---- libgroboutils-java-5~/util-thread/log4j.properties 2002-07-29 00:44:19.000000000 +0200
-+++ libgroboutils-java-5/util-thread/log4j.properties 2009-03-23 15:56:14.896286971 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.util.thread=DEBUG
-+log4j.category.net.sourceforge.groboutils.util.thread=ERROR
-
-diff -urNad libgroboutils-java-5~/util-xml/log4j.properties libgroboutils-java-5/util-xml/log4j.properties
---- libgroboutils-java-5~/util-xml/log4j.properties 2002-07-29 00:44:20.000000000 +0200
-+++ libgroboutils-java-5/util-xml/log4j.properties 2009-03-23 15:55:17.080291966 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.util.xml=DEBUG
-+log4j.category.net.sourceforge.groboutils.util.xml=ERROR
-
-diff -urNad libgroboutils-java-5~/website/log4j.properties libgroboutils-java-5/website/log4j.properties
---- libgroboutils-java-5~/website/log4j.properties 2002-07-29 00:44:20.000000000 +0200
-+++ libgroboutils-java-5/website/log4j.properties 2009-03-23 15:56:29.004286948 +0100
-@@ -1,4 +1,4 @@
--log4j.rootCategory=WARN, stdout
-+log4j.rootCategory=ERROR, stdout
-
-
- # A1 is set to be a ConsoleAppender.
-@@ -7,5 +7,5 @@
- log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-
--log4j.category.net.sourceforge.groboutils.website=DEBUG
-+log4j.category.net.sourceforge.groboutils.website=ERROR
-
Added: trunk/libgroboutils-java/debian/patches/02_dont_stop_on_junit_failure.diff
===================================================================
--- trunk/libgroboutils-java/debian/patches/02_dont_stop_on_junit_failure.diff (rev 0)
+++ trunk/libgroboutils-java/debian/patches/02_dont_stop_on_junit_failure.diff 2009-10-12 22:26:53 UTC (rev 10816)
@@ -0,0 +1,227 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_dont_stop_on_junit_failure.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- a/_shared/common-ant/common-ant-tasks-deploy.ant-inc.xml
++++ b/_shared/common-ant/common-ant-tasks-deploy.ant-inc.xml
+@@ -7,7 +7,7 @@
+
+ <target name="_shared.common.deploy"
+ depends="_shared.common.deploy-setup,
+- javac,jar,test-all,doc,java-doc" >
++ javac,jar,doc,java-doc" >
+ <!-- deploy structure was setup in jar task -->
+
+ <zip zipfile="${output.doc-zip}" basedir="${dirs.deploy.docs}"
+--- a/_shared/common-ant/common-ant-tasks-test.ant-inc.xml
++++ b/_shared/common-ant/common-ant-tasks-test.ant-inc.xml
+@@ -40,11 +40,9 @@
+
+
+ <target name="_shared.common.test-failed" if="tests.failure" >
+- <fail message="jUnit failure(s)" />
+ </target>
+
+ <target name="_shared.common.test-errored" if="tests.error" >
+- <fail message="jUnit error(s)" />
+ </target>
+
+
+@@ -84,7 +82,6 @@
+ <source destdir="work/coverage/report"
+ title="GroboUtils Coverage for ${product}-${version}"
+ srcdir="${dirs.sources.dev}" />
+- <failon percentage="60" />
+ </grobo-report>
+ </target>
+
+--- a/build.xml
++++ b/build.xml
+@@ -107,6 +107,15 @@
+ <property name="GroboUtils.main.target" value="main" />
+ </ant>
+ </target>
++
++
++ <target name="test-all">
++ <!-- reload this build file to allow the whole dependency tree
++ to be executed -->
++ <ant target="GroboUtils.main.all-targets" dir="${basedir}">
++ <property name="GroboUtils.main.target" value="test-all" />
++ </ant>
++ </target>
+
+
+ <!-- ****************************************************************** -->
+--- a/codecoverage/build.xml
++++ b/codecoverage/build.xml
+@@ -100,8 +100,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/pmti/build.xml
++++ b/pmti/build.xml
+@@ -83,8 +83,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/testing-autodoc/build.xml
++++ b/testing-autodoc/build.xml
+@@ -70,8 +70,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/testing-junit/build.xml
++++ b/testing-junit/build.xml
+@@ -79,8 +79,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/testing-mbtf/build.xml
++++ b/testing-mbtf/build.xml
+@@ -77,8 +77,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/testing-tp/build.xml
++++ b/testing-tp/build.xml
+@@ -74,8 +74,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/uicapture/build.xml
++++ b/uicapture/build.xml
+@@ -75,8 +75,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/util-classes/build.xml
++++ b/util-classes/build.xml
+@@ -67,8 +67,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc,deploy" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/util-datastruct/build.xml
++++ b/util-datastruct/build.xml
+@@ -75,8 +75,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/util-io/build.xml
++++ b/util-io/build.xml
+@@ -75,8 +75,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/util-states/build.xml
++++ b/util-states/build.xml
+@@ -75,8 +75,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/util-thread/build.xml
++++ b/util-thread/build.xml
+@@ -77,8 +77,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc,deploy" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
+--- a/util-xml/build.xml
++++ b/util-xml/build.xml
+@@ -73,8 +73,8 @@
+
+ <!-- Targets -->
+
+- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
+- <target name="main" depends="init,javac,jar,test-all" />
++ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
++ <target name="main" depends="init,javac,jar" />
+
+ <target name="deploy" depends="init,_shared.common.deploy" />
+ <target name="init" depends="_shared.common.init" />
Deleted: trunk/libgroboutils-java/debian/patches/02_dont_stop_on_junit_failure.dpatch
===================================================================
--- trunk/libgroboutils-java/debian/patches/02_dont_stop_on_junit_failure.dpatch 2009-10-12 21:57:10 UTC (rev 10815)
+++ trunk/libgroboutils-java/debian/patches/02_dont_stop_on_junit_failure.dpatch 2009-10-12 22:26:53 UTC (rev 10816)
@@ -1,243 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_dont_stop_on_junit_failure.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad libgroboutils-java-5~/_shared/common-ant/common-ant-tasks-deploy.ant-inc.xml libgroboutils-java-5/_shared/common-ant/common-ant-tasks-deploy.ant-inc.xml
---- libgroboutils-java-5~/_shared/common-ant/common-ant-tasks-deploy.ant-inc.xml 2002-07-29 01:13:29.000000000 +0200
-+++ libgroboutils-java-5/_shared/common-ant/common-ant-tasks-deploy.ant-inc.xml 2009-03-23 18:18:00.816915193 +0100
-@@ -7,7 +7,7 @@
-
- <target name="_shared.common.deploy"
- depends="_shared.common.deploy-setup,
-- javac,jar,test-all,doc,java-doc" >
-+ javac,jar,doc,java-doc" >
- <!-- deploy structure was setup in jar task -->
-
- <zip zipfile="${output.doc-zip}" basedir="${dirs.deploy.docs}"
-diff -urNad libgroboutils-java-5~/_shared/common-ant/common-ant-tasks-test.ant-inc.xml libgroboutils-java-5/_shared/common-ant/common-ant-tasks-test.ant-inc.xml
---- libgroboutils-java-5~/_shared/common-ant/common-ant-tasks-test.ant-inc.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/_shared/common-ant/common-ant-tasks-test.ant-inc.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -40,11 +40,9 @@
-
-
- <target name="_shared.common.test-failed" if="tests.failure" >
-- <fail message="jUnit failure(s)" />
- </target>
-
- <target name="_shared.common.test-errored" if="tests.error" >
-- <fail message="jUnit error(s)" />
- </target>
-
-
-@@ -84,7 +82,6 @@
- <source destdir="work/coverage/report"
- title="GroboUtils Coverage for ${product}-${version}"
- srcdir="${dirs.sources.dev}" />
-- <failon percentage="60" />
- </grobo-report>
- </target>
-
-diff -urNad libgroboutils-java-5~/build.xml libgroboutils-java-5/build.xml
---- libgroboutils-java-5~/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -107,6 +107,15 @@
- <property name="GroboUtils.main.target" value="main" />
- </ant>
- </target>
-+
-+
-+ <target name="test-all">
-+ <!-- reload this build file to allow the whole dependency tree
-+ to be executed -->
-+ <ant target="GroboUtils.main.all-targets" dir="${basedir}">
-+ <property name="GroboUtils.main.target" value="test-all" />
-+ </ant>
-+ </target>
-
-
- <!-- ****************************************************************** -->
-diff -urNad libgroboutils-java-5~/codecoverage/build.xml libgroboutils-java-5/codecoverage/build.xml
---- libgroboutils-java-5~/codecoverage/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/codecoverage/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -100,8 +100,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/pmti/build.xml libgroboutils-java-5/pmti/build.xml
---- libgroboutils-java-5~/pmti/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/pmti/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -83,8 +83,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/testing-autodoc/build.xml libgroboutils-java-5/testing-autodoc/build.xml
---- libgroboutils-java-5~/testing-autodoc/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/testing-autodoc/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -70,8 +70,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/testing-junit/build.xml libgroboutils-java-5/testing-junit/build.xml
---- libgroboutils-java-5~/testing-junit/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/testing-junit/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -79,8 +79,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/testing-mbtf/build.xml libgroboutils-java-5/testing-mbtf/build.xml
---- libgroboutils-java-5~/testing-mbtf/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/testing-mbtf/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -77,8 +77,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/testing-tp/build.xml libgroboutils-java-5/testing-tp/build.xml
---- libgroboutils-java-5~/testing-tp/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/testing-tp/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -74,8 +74,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/uicapture/build.xml libgroboutils-java-5/uicapture/build.xml
---- libgroboutils-java-5~/uicapture/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/uicapture/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -75,8 +75,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/util-classes/build.xml libgroboutils-java-5/util-classes/build.xml
---- libgroboutils-java-5~/util-classes/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/util-classes/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -67,8 +67,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc,deploy" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/util-datastruct/build.xml libgroboutils-java-5/util-datastruct/build.xml
---- libgroboutils-java-5~/util-datastruct/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/util-datastruct/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -75,8 +75,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/util-io/build.xml libgroboutils-java-5/util-io/build.xml
---- libgroboutils-java-5~/util-io/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/util-io/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -75,8 +75,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/util-states/build.xml libgroboutils-java-5/util-states/build.xml
---- libgroboutils-java-5~/util-states/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/util-states/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -75,8 +75,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/util-thread/build.xml libgroboutils-java-5/util-thread/build.xml
---- libgroboutils-java-5~/util-thread/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/util-thread/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -77,8 +77,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc,deploy" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
-diff -urNad libgroboutils-java-5~/util-xml/build.xml libgroboutils-java-5/util-xml/build.xml
---- libgroboutils-java-5~/util-xml/build.xml 2009-03-23 18:16:40.000000000 +0100
-+++ libgroboutils-java-5/util-xml/build.xml 2009-03-23 18:16:41.960292563 +0100
-@@ -73,8 +73,8 @@
-
- <!-- Targets -->
-
-- <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-- <target name="main" depends="init,javac,jar,test-all" />
-+ <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
-+ <target name="main" depends="init,javac,jar" />
-
- <target name="deploy" depends="init,_shared.common.deploy" />
- <target name="init" depends="_shared.common.init" />
Added: trunk/libgroboutils-java/debian/patches/03_easymock_upgrade.diff
===================================================================
--- trunk/libgroboutils-java/debian/patches/03_easymock_upgrade.diff (rev 0)
+++ trunk/libgroboutils-java/debian/patches/03_easymock_upgrade.diff 2009-10-12 22:26:53 UTC (rev 10816)
@@ -0,0 +1,247 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_easymock_upgrade.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerJDK13UTest.java
++++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerJDK13UTest.java
+@@ -76,7 +76,7 @@
+ super.setUp();
+
+ // set ourself up
+- this.testControl = EasyMock.controlFor( Test.class );
++ this.testControl = MockControl.createControl( Test.class );
+ this.mockTest = (Test)this.testControl.getMock();
+ }
+
+@@ -121,7 +121,7 @@
+
+ public void testAddFailure3()
+ {
+- this.testControl.activate();
++ this.testControl.replay();
+
+ createListener().addFailure( this.mockTest,
+ new AssertionFailedError( "ignore error") );
+@@ -166,7 +166,7 @@
+
+ public void testAddError3()
+ {
+- this.testControl.activate();
++ this.testControl.replay();
+
+ createListener().addError( this.mockTest,
+ new Throwable( "ignore error") );
+--- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java
++++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java
+@@ -82,16 +82,16 @@
+ super.setUp();
+
+ // set ourself up
+- this.factoryControl = EasyMock.controlFor( AutoDocFactory.class );
++ this.factoryControl = MockControl.createControl( AutoDocFactory.class );
+ this.mockFactory = (AutoDocFactory)this.factoryControl.getMock();
+
+- this.logControl = EasyMock.controlFor( AutoDocLog.class );
++ this.logControl = MockControl.createControl( AutoDocLog.class );
+ this.mockLog = (AutoDocLog)this.logControl.getMock();
+
+- this.itControl = EasyMock.controlFor( AutoDocIT.class );
++ this.itControl = MockControl.createControl( AutoDocIT.class );
+ this.mockIT = (AutoDocIT)this.itControl.getMock();
+
+- this.tpControl = EasyMock.controlFor( AutoDocTP.class );
++ this.tpControl = MockControl.createControl( AutoDocTP.class );
+ this.mockTP = (AutoDocTP)this.tpControl.getMock();
+ }
+
+@@ -131,10 +131,10 @@
+ this.mockFactory.createTP( this.getClass() );
+ this.factoryControl.setReturnValue( this.mockTP, 1 );
+
+- this.factoryControl.activate();
+- this.logControl.activate();
+- this.itControl.activate();
+- this.tpControl.activate();
++ this.factoryControl.replay();
++ this.logControl.replay();
++ this.itControl.replay();
++ this.tpControl.replay();
+
+ MockAutoDoc mad = new MockAutoDoc( this.getClass(),
+ this.mockFactory );
+--- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerJDK13UTest.java
++++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerJDK13UTest.java
+@@ -75,7 +75,7 @@
+ super.setUp();
+
+ // set ourself up
+- this.testControl = EasyMock.controlFor( Test.class );
++ this.testControl = MockControl.createControl( Test.class );
+ this.mockTest = (Test)this.testControl.getMock();
+ }
+
+--- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerUTestI.java
++++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerUTestI.java
+@@ -78,7 +78,7 @@
+ super.setUp();
+
+ // set ourself up
+- this.testControl = EasyMock.controlFor( Test.class );
++ this.testControl = MockControl.createControl( Test.class );
+ this.mockTest = (Test)this.testControl.getMock();
+ }
+
+@@ -105,7 +105,7 @@
+
+ public void testAddFailure3()
+ {
+- this.testControl.activate();
++ this.testControl.replay();
+
+ // failures can occur without a startTest being called!
+ createListener().addFailure( this.mockTest,
+@@ -117,7 +117,7 @@
+
+ public void testAddFailure4()
+ {
+- this.testControl.activate();
++ this.testControl.replay();
+
+ AutoDocJUnitListener adjul = createListener();
+ adjul.startTest( this.mockTest );
+@@ -148,7 +148,7 @@
+
+ public void testAddError3()
+ {
+- this.testControl.activate();
++ this.testControl.replay();
+
+ // errors can occur without a startTest being called!
+ createListener().addError( this.mockTest,
+@@ -160,7 +160,7 @@
+
+ public void testAddError4()
+ {
+- this.testControl.activate();
++ this.testControl.replay();
+
+ AutoDocJUnitListener adjul = createListener();
+ adjul.startTest( this.mockTest );
+--- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestInfoJDK13UTest.java
++++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestInfoJDK13UTest.java
+@@ -79,13 +79,13 @@
+ super.setUp();
+
+ // set ourself up
+- this.logControl = EasyMock.controlFor( AutoDocLog.class );
++ this.logControl = MockControl.createControl( AutoDocLog.class );
+ this.mockLog = (AutoDocLog)this.logControl.getMock();
+
+- this.itControl = EasyMock.controlFor( AutoDocIT.class );
++ this.itControl = MockControl.createControl( AutoDocIT.class );
+ this.mockIT = (AutoDocIT)this.itControl.getMock();
+
+- this.tpControl = EasyMock.controlFor( AutoDocTP.class );
++ this.tpControl = MockControl.createControl( AutoDocTP.class );
+ this.mockTP = (AutoDocTP)this.tpControl.getMock();
+ }
+
+--- a/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorImplJDK13UTest.java
++++ b/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorImplJDK13UTest.java
+@@ -70,7 +70,7 @@
+ super.setUp();
+
+ // set ourself up
+- this.phControl = EasyMock.controlFor( IPathHistory.class );
++ this.phControl = MockControl.createControl( IPathHistory.class );
+ this.mockPH = (IPathHistory)this.phControl.getMock();
+ }
+
+@@ -99,7 +99,7 @@
+ {
+ String msg = "blah";
+ Throwable t = new Throwable();
+- this.phControl.activate();
++ this.phControl.replay();
+
+ ErrorImpl ei = new ErrorImpl( msg, t, this.mockPH );
+
+--- a/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorsImplJDK13UTest.java
++++ b/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorsImplJDK13UTest.java
+@@ -71,7 +71,7 @@
+ super.setUp();
+
+ // set ourself up
+- this.phControl = EasyMock.controlFor( IPathHistory.class );
++ this.phControl = MockControl.createControl( IPathHistory.class );
+ this.mockPH = (IPathHistory)this.phControl.getMock();
+ }
+
+@@ -131,7 +131,7 @@
+ ErrorsImpl ei = new ErrorsImpl();
+ this.mockPH.copy();
+ this.phControl.setReturnValue( this.mockPH, 1 );
+- this.phControl.activate();
++ this.phControl.replay();
+
+
+ ei.setCurrentPathHistory( this.mockPH );
+@@ -179,7 +179,7 @@
+ ErrorsImpl ei = new ErrorsImpl();
+ this.mockPH.copy();
+ this.phControl.setReturnValue( this.mockPH, 1 );
+- this.phControl.activate();
++ this.phControl.replay();
+
+
+ ei.setCurrentPathHistory( this.mockPH );
+@@ -222,7 +222,7 @@
+ ErrorsImpl ei = new ErrorsImpl();
+ this.mockPH.copy();
+ this.phControl.setReturnValue( this.mockPH, 1 );
+- this.phControl.activate();
++ this.phControl.replay();
+
+
+ ei.setCurrentPathHistory( this.mockPH );
+@@ -265,7 +265,7 @@
+ ErrorsImpl ei = new ErrorsImpl();
+ this.mockPH.copy();
+ this.phControl.setReturnValue( this.mockPH, 1 );
+- this.phControl.activate();
++ this.phControl.replay();
+
+
+ ei.setCurrentPathHistory( this.mockPH );
+@@ -308,7 +308,7 @@
+ ErrorsImpl ei = new ErrorsImpl();
+ this.mockPH.copy();
+ this.phControl.setReturnValue( this.mockPH, 1 );
+- this.phControl.activate();
++ this.phControl.replay();
+
+
+ ei.setCurrentPathHistory( this.mockPH );
+--- a/uicapture/sources/ut/net/sourceforge/groboutils/uicapture/v1/ScriptGeneratorUTest.java
++++ b/uicapture/sources/ut/net/sourceforge/groboutils/uicapture/v1/ScriptGeneratorUTest.java
+@@ -77,7 +77,7 @@
+ super.setUp();
+
+ // set ourself up
+- this.scriptmakerControl = EasyMock.controlFor( IScriptMaker.class );
++ this.scriptmakerControl = MockControl.createControl( IScriptMaker.class );
+ this.mockScriptmaker = (IScriptMaker)this.scriptmakerControl.getMock();
+ }
+
+@@ -99,7 +99,7 @@
+ //this.mockScriptmaker.removeText("Text");
+ //this.scriptmakerControl.setVoidCallable();
+
+- this.scriptmakerControl.activate();
++ this.scriptmakerControl.replay();
+ ScriptGenerator sg = new ScriptGenerator( null, null,
+ this.mockScriptmaker, "base" );
+ MouseWheelCaptureEvent mwce = new MouseWheelCaptureEvent( 10 );
Deleted: trunk/libgroboutils-java/debian/patches/03_easymock_upgrade.dpatch
===================================================================
--- trunk/libgroboutils-java/debian/patches/03_easymock_upgrade.dpatch 2009-10-12 21:57:10 UTC (rev 10815)
+++ trunk/libgroboutils-java/debian/patches/03_easymock_upgrade.dpatch 2009-10-12 22:26:53 UTC (rev 10816)
@@ -1,255 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_easymock_upgrade.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad libgroboutils-java-5~/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerJDK13UTest.java libgroboutils-java-5/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerJDK13UTest.java
---- libgroboutils-java-5~/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerJDK13UTest.java 2009-03-23 16:16:55.000000000 +0100
-+++ libgroboutils-java-5/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerJDK13UTest.java 2009-03-23 16:17:17.197423158 +0100
-@@ -76,7 +76,7 @@
- super.setUp();
-
- // set ourself up
-- this.testControl = EasyMock.controlFor( Test.class );
-+ this.testControl = MockControl.createControl( Test.class );
- this.mockTest = (Test)this.testControl.getMock();
- }
-
-@@ -121,7 +121,7 @@
-
- public void testAddFailure3()
- {
-- this.testControl.activate();
-+ this.testControl.replay();
-
- createListener().addFailure( this.mockTest,
- new AssertionFailedError( "ignore error") );
-@@ -166,7 +166,7 @@
-
- public void testAddError3()
- {
-- this.testControl.activate();
-+ this.testControl.replay();
-
- createListener().addError( this.mockTest,
- new Throwable( "ignore error") );
-diff -urNad libgroboutils-java-5~/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java libgroboutils-java-5/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java
---- libgroboutils-java-5~/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java 2009-03-23 16:16:55.000000000 +0100
-+++ libgroboutils-java-5/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java 2009-03-23 16:17:56.169877805 +0100
-@@ -82,16 +82,16 @@
- super.setUp();
-
- // set ourself up
-- this.factoryControl = EasyMock.controlFor( AutoDocFactory.class );
-+ this.factoryControl = MockControl.createControl( AutoDocFactory.class );
- this.mockFactory = (AutoDocFactory)this.factoryControl.getMock();
-
-- this.logControl = EasyMock.controlFor( AutoDocLog.class );
-+ this.logControl = MockControl.createControl( AutoDocLog.class );
- this.mockLog = (AutoDocLog)this.logControl.getMock();
-
-- this.itControl = EasyMock.controlFor( AutoDocIT.class );
-+ this.itControl = MockControl.createControl( AutoDocIT.class );
- this.mockIT = (AutoDocIT)this.itControl.getMock();
-
-- this.tpControl = EasyMock.controlFor( AutoDocTP.class );
-+ this.tpControl = MockControl.createControl( AutoDocTP.class );
- this.mockTP = (AutoDocTP)this.tpControl.getMock();
- }
-
-@@ -131,10 +131,10 @@
- this.mockFactory.createTP( this.getClass() );
- this.factoryControl.setReturnValue( this.mockTP, 1 );
-
-- this.factoryControl.activate();
-- this.logControl.activate();
-- this.itControl.activate();
-- this.tpControl.activate();
-+ this.factoryControl.replay();
-+ this.logControl.replay();
-+ this.itControl.replay();
-+ this.tpControl.replay();
-
- MockAutoDoc mad = new MockAutoDoc( this.getClass(),
- this.mockFactory );
-diff -urNad libgroboutils-java-5~/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerJDK13UTest.java libgroboutils-java-5/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerJDK13UTest.java
---- libgroboutils-java-5~/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerJDK13UTest.java 2009-03-23 16:16:55.000000000 +0100
-+++ libgroboutils-java-5/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerJDK13UTest.java 2009-03-23 16:16:57.140788552 +0100
-@@ -75,7 +75,7 @@
- super.setUp();
-
- // set ourself up
-- this.testControl = EasyMock.controlFor( Test.class );
-+ this.testControl = MockControl.createControl( Test.class );
- this.mockTest = (Test)this.testControl.getMock();
- }
-
-diff -urNad libgroboutils-java-5~/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerUTestI.java libgroboutils-java-5/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerUTestI.java
---- libgroboutils-java-5~/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerUTestI.java 2009-03-23 16:16:55.000000000 +0100
-+++ libgroboutils-java-5/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerUTestI.java 2009-03-23 16:16:57.140788552 +0100
-@@ -78,7 +78,7 @@
- super.setUp();
-
- // set ourself up
-- this.testControl = EasyMock.controlFor( Test.class );
-+ this.testControl = MockControl.createControl( Test.class );
- this.mockTest = (Test)this.testControl.getMock();
- }
-
-@@ -105,7 +105,7 @@
-
- public void testAddFailure3()
- {
-- this.testControl.activate();
-+ this.testControl.replay();
-
- // failures can occur without a startTest being called!
- createListener().addFailure( this.mockTest,
-@@ -117,7 +117,7 @@
-
- public void testAddFailure4()
- {
-- this.testControl.activate();
-+ this.testControl.replay();
-
- AutoDocJUnitListener adjul = createListener();
- adjul.startTest( this.mockTest );
-@@ -148,7 +148,7 @@
-
- public void testAddError3()
- {
-- this.testControl.activate();
-+ this.testControl.replay();
-
- // errors can occur without a startTest being called!
- createListener().addError( this.mockTest,
-@@ -160,7 +160,7 @@
-
- public void testAddError4()
- {
-- this.testControl.activate();
-+ this.testControl.replay();
-
- AutoDocJUnitListener adjul = createListener();
- adjul.startTest( this.mockTest );
-diff -urNad libgroboutils-java-5~/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestInfoJDK13UTest.java libgroboutils-java-5/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestInfoJDK13UTest.java
---- libgroboutils-java-5~/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestInfoJDK13UTest.java 2009-03-23 16:16:55.000000000 +0100
-+++ libgroboutils-java-5/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestInfoJDK13UTest.java 2009-03-23 16:16:57.140788552 +0100
-@@ -79,13 +79,13 @@
- super.setUp();
-
- // set ourself up
-- this.logControl = EasyMock.controlFor( AutoDocLog.class );
-+ this.logControl = MockControl.createControl( AutoDocLog.class );
- this.mockLog = (AutoDocLog)this.logControl.getMock();
-
-- this.itControl = EasyMock.controlFor( AutoDocIT.class );
-+ this.itControl = MockControl.createControl( AutoDocIT.class );
- this.mockIT = (AutoDocIT)this.itControl.getMock();
-
-- this.tpControl = EasyMock.controlFor( AutoDocTP.class );
-+ this.tpControl = MockControl.createControl( AutoDocTP.class );
- this.mockTP = (AutoDocTP)this.tpControl.getMock();
- }
-
-diff -urNad libgroboutils-java-5~/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorImplJDK13UTest.java libgroboutils-java-5/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorImplJDK13UTest.java
---- libgroboutils-java-5~/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorImplJDK13UTest.java 2009-03-23 16:16:55.000000000 +0100
-+++ libgroboutils-java-5/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorImplJDK13UTest.java 2009-03-23 16:18:50.428942359 +0100
-@@ -70,7 +70,7 @@
- super.setUp();
-
- // set ourself up
-- this.phControl = EasyMock.controlFor( IPathHistory.class );
-+ this.phControl = MockControl.createControl( IPathHistory.class );
- this.mockPH = (IPathHistory)this.phControl.getMock();
- }
-
-@@ -99,7 +99,7 @@
- {
- String msg = "blah";
- Throwable t = new Throwable();
-- this.phControl.activate();
-+ this.phControl.replay();
-
- ErrorImpl ei = new ErrorImpl( msg, t, this.mockPH );
-
-diff -urNad libgroboutils-java-5~/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorsImplJDK13UTest.java libgroboutils-java-5/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorsImplJDK13UTest.java
---- libgroboutils-java-5~/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorsImplJDK13UTest.java 2009-03-23 16:16:55.000000000 +0100
-+++ libgroboutils-java-5/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorsImplJDK13UTest.java 2009-03-23 16:18:25.016308386 +0100
-@@ -71,7 +71,7 @@
- super.setUp();
-
- // set ourself up
-- this.phControl = EasyMock.controlFor( IPathHistory.class );
-+ this.phControl = MockControl.createControl( IPathHistory.class );
- this.mockPH = (IPathHistory)this.phControl.getMock();
- }
-
-@@ -131,7 +131,7 @@
- ErrorsImpl ei = new ErrorsImpl();
- this.mockPH.copy();
- this.phControl.setReturnValue( this.mockPH, 1 );
-- this.phControl.activate();
-+ this.phControl.replay();
-
-
- ei.setCurrentPathHistory( this.mockPH );
-@@ -179,7 +179,7 @@
- ErrorsImpl ei = new ErrorsImpl();
- this.mockPH.copy();
- this.phControl.setReturnValue( this.mockPH, 1 );
-- this.phControl.activate();
-+ this.phControl.replay();
-
-
- ei.setCurrentPathHistory( this.mockPH );
-@@ -222,7 +222,7 @@
- ErrorsImpl ei = new ErrorsImpl();
- this.mockPH.copy();
- this.phControl.setReturnValue( this.mockPH, 1 );
-- this.phControl.activate();
-+ this.phControl.replay();
-
-
- ei.setCurrentPathHistory( this.mockPH );
-@@ -265,7 +265,7 @@
- ErrorsImpl ei = new ErrorsImpl();
- this.mockPH.copy();
- this.phControl.setReturnValue( this.mockPH, 1 );
-- this.phControl.activate();
-+ this.phControl.replay();
-
-
- ei.setCurrentPathHistory( this.mockPH );
-@@ -308,7 +308,7 @@
- ErrorsImpl ei = new ErrorsImpl();
- this.mockPH.copy();
- this.phControl.setReturnValue( this.mockPH, 1 );
-- this.phControl.activate();
-+ this.phControl.replay();
-
-
- ei.setCurrentPathHistory( this.mockPH );
-diff -urNad libgroboutils-java-5~/uicapture/sources/ut/net/sourceforge/groboutils/uicapture/v1/ScriptGeneratorUTest.java libgroboutils-java-5/uicapture/sources/ut/net/sourceforge/groboutils/uicapture/v1/ScriptGeneratorUTest.java
---- libgroboutils-java-5~/uicapture/sources/ut/net/sourceforge/groboutils/uicapture/v1/ScriptGeneratorUTest.java 2009-03-23 16:16:55.000000000 +0100
-+++ libgroboutils-java-5/uicapture/sources/ut/net/sourceforge/groboutils/uicapture/v1/ScriptGeneratorUTest.java 2009-03-23 16:18:38.072286739 +0100
-@@ -77,7 +77,7 @@
- super.setUp();
-
- // set ourself up
-- this.scriptmakerControl = EasyMock.controlFor( IScriptMaker.class );
-+ this.scriptmakerControl = MockControl.createControl( IScriptMaker.class );
- this.mockScriptmaker = (IScriptMaker)this.scriptmakerControl.getMock();
- }
-
-@@ -99,7 +99,7 @@
- //this.mockScriptmaker.removeText("Text");
- //this.scriptmakerControl.setVoidCallable();
-
-- this.scriptmakerControl.activate();
-+ this.scriptmakerControl.replay();
- ScriptGenerator sg = new ScriptGenerator( null, null,
- this.mockScriptmaker, "base" );
- MouseWheelCaptureEvent mwce = new MouseWheelCaptureEvent( 10 );
Added: trunk/libgroboutils-java/debian/patches/04_coverage_zip_archives.diff
===================================================================
--- trunk/libgroboutils-java/debian/patches/04_coverage_zip_archives.diff (rev 0)
+++ trunk/libgroboutils-java/debian/patches/04_coverage_zip_archives.diff 2009-10-12 22:26:53 UTC (rev 10816)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_coverage_zip_archives.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- a/codecoverage/build.xml
++++ b/codecoverage/build.xml
+@@ -162,8 +162,6 @@
+ <zipfileset src="${output.jar-name.dev}"/>
+ <zipfileset src="${libs.groboutils.util-io}"/>
+ <zipfileset src="${libs.groboutils.util-datastruct}"/>
+- <zipfileset src="${libs.log4j}"/>
+- <zipfileset src="${libs.bcel}"/>
+ <fileset dir="${dirs.classes}">
+ <include name="log4j.properties" />
+ </fileset>
Deleted: trunk/libgroboutils-java/debian/patches/04_coverage_zip_archives.dpatch
===================================================================
--- trunk/libgroboutils-java/debian/patches/04_coverage_zip_archives.dpatch 2009-10-12 21:57:10 UTC (rev 10815)
+++ trunk/libgroboutils-java/debian/patches/04_coverage_zip_archives.dpatch 2009-10-12 22:26:53 UTC (rev 10816)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_coverage_zip_archives.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad libgroboutils-java-5~/codecoverage/build.xml libgroboutils-java-5/codecoverage/build.xml
---- libgroboutils-java-5~/codecoverage/build.xml 2004-07-08 05:32:23.000000000 +0200
-+++ libgroboutils-java-5/codecoverage/build.xml 2009-03-23 16:42:08.661752772 +0100
-@@ -162,8 +162,6 @@
- <zipfileset src="${output.jar-name.dev}"/>
- <zipfileset src="${libs.groboutils.util-io}"/>
- <zipfileset src="${libs.groboutils.util-datastruct}"/>
-- <zipfileset src="${libs.log4j}"/>
-- <zipfileset src="${libs.bcel}"/>
- <fileset dir="${dirs.classes}">
- <include name="log4j.properties" />
- </fileset>
Added: trunk/libgroboutils-java/debian/patches/05_rename_subprojects.diff
===================================================================
--- trunk/libgroboutils-java/debian/patches/05_rename_subprojects.diff (rev 0)
+++ trunk/libgroboutils-java/debian/patches/05_rename_subprojects.diff 2009-10-12 22:26:53 UTC (rev 10816)
@@ -0,0 +1,331 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_rename_subprojects.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- a/codecoverage/build.xml
++++ b/codecoverage/build.xml
+@@ -15,7 +15,7 @@
+ <project name="CodeCoverage" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboCodeCoverage" />
++ <property name="product" value="groboutils-codecoverage" />
+ <property name="version" value="1.1.0" />
+ <property name="basepackage" value="net/sourceforge/groboutils/codecoverage/v1" />
+
+--- a/codecoverage/deployed.ant-inc.xml
++++ b/codecoverage/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.codecoverage"
+- value="${basedir}/../codecoverage/GroboCodeCoverage-1.1.0-core.jar" />
++ value="${basedir}/../codecoverage/groboutils-codecoverage-1.1.0-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/pmti/build.xml
++++ b/pmti/build.xml
+@@ -12,7 +12,7 @@
+ <project name="PMTI" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboPMTI" />
++ <property name="product" value="groboutils-pmti" />
+ <property name="version" value="1.0.0alpha3" />
+ <property name="basepackage" value="net/sourceforge/groboutils/pmti/v1" />
+
+--- a/pmti/deployed.ant-inc.xml
++++ b/pmti/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.pmti"
+- value="${basedir}/../pmti/GroboPMTI-1.0.0alpha2-core.jar" />
++ value="${basedir}/../pmti/groboutils-pmti-1.0.0alpha2-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/testing-autodoc/build.xml
++++ b/testing-autodoc/build.xml
+@@ -12,7 +12,7 @@
+ <project name="TestingAutodoc" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboTestingAutodoc" />
++ <property name="product" value="groboutils-testingautodoc" />
+ <property name="version" value="1.0.0alpha2" />
+ <property name="basepackage" value="net/sourceforge/groboutils/autodoc/v1" />
+
+--- a/testing-autodoc/deployed.ant-inc.xml
++++ b/testing-autodoc/deployed.ant-inc.xml
+@@ -1,9 +1,9 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.testing-autodoc"
+- value="${basedir}/../testing-autodoc/GroboTestingAutodoc-1.0.0alpha2-core.jar" />
++ value="${basedir}/../testing-autodoc/groboutils-testingautodoc-1.0.0alpha2-core.jar" />
+
+ <property name="libs.groboutils.testing-autodoc.ut"
+- value="${basedir}/../testing-autodoc/deploy/GroboTestingAutodoc-1.0.0alpha2/lib/GroboTestingAutodoc-1.0.0alpha2-utests.jar" />
++ value="${basedir}/../testing-autodoc/deploy/groboutils-testingautodoc-1.0.0alpha2/lib/groboutils-testingautodoc-1.0.0alpha2-utests.jar" />
++
+
+-
+\ No newline at end of file
+--- a/testing-junit/build.xml
++++ b/testing-junit/build.xml
+@@ -12,7 +12,7 @@
+ <project name="TestingJUnit" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboTestingJUnit" />
++ <property name="product" value="groboutils-testingjunit" />
+ <property name="version" value="1.2.1" />
+ <property name="basepackage" value="net/sourceforge/groboutils/junit/v1" />
+
+--- a/testing-junit/deployed.ant-inc.xml
++++ b/testing-junit/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.testing-junit"
+- value="${basedir}/../testing-junit/GroboTestingJUnit-1.2.1-core.jar" />
++ value="${basedir}/../testing-junit/groboutils-testingjunit-1.2.1-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/testing-mbtf/build.xml
++++ b/testing-mbtf/build.xml
+@@ -12,7 +12,7 @@
+ <project name="TestingMBTF" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboTestingMBTF" />
++ <property name="product" value="groboutils-testingmbtf" />
+ <property name="version" value="1.0.0alpha2" />
+ <property name="basepackage" value="net/sourceforge/groboutils/mbtf/v1" />
+
+--- a/testing-mbtf/deployed.ant-inc.xml
++++ b/testing-mbtf/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.testing-mbtf"
+- value="${basedir}/../testing-mbtf/GroboTestingMBTF-1.0.0alpha2-core.jar" />
++ value="${basedir}/../testing-mbtf/groboutils-testingmbtf-1.0.0alpha2-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/testing-tp/build.xml
++++ b/testing-tp/build.xml
+@@ -12,7 +12,7 @@
+ <project name="TestingTP" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboTestingTP" />
++ <property name="product" value="groboutils-testingtp" />
+ <property name="version" value="1.0.0alpha2" />
+ <property name="basepackage" value="net/sourceforge/groboutils/tp/v1" />
+
+--- a/testing-tp/deployed.ant-inc.xml
++++ b/testing-tp/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.testing-tp"
+- value="${basedir}/../testing-tp/GroboTestingTP-1.0.0alpha2-core.jar" />
++ value="${basedir}/../testing-tp/groboutils-testingtp-1.0.0alpha2-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/uicapture/build.xml
++++ b/uicapture/build.xml
+@@ -12,7 +12,7 @@
+ <project name="UICapture" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboUICapture" />
++ <property name="product" value="groboutils-uicapture" />
+ <property name="version" value="1.0.0alpha2" />
+ <property name="basepackage" value="net/sourceforge/groboutils/uicapture/v1" />
+
+--- a/uicapture/deployed.ant-inc.xml
++++ b/uicapture/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.uicapture"
+- value="${basedir}/../uicapture/GroboUICapture-1.0.0alpha2-core.jar" />
++ value="${basedir}/../uicapture/grobotesting-uicapture-1.0.0alpha2-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/util-classes/build.xml
++++ b/util-classes/build.xml
+@@ -12,7 +12,7 @@
+ <project name="UtilClasses" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboUtilClasses" />
++ <property name="product" value="groboutils-classes" />
+ <property name="version" value="1.0.0" />
+ <property name="basepackage" value="net/sourceforge/groboutils/util/classes/v1" />
+
+--- a/util-classes/deployed.ant-inc.xml
++++ b/util-classes/deployed.ant-inc.xml
+@@ -1,10 +1,10 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.util-classes"
+- value="${basedir}/../util-classes/GroboUtilClasses-1.0.0-core.jar" />
++ value="${basedir}/../util-classes/groboutils-classes-1.0.0-core.jar" />
+
+
+ <property name="libs.groboutils.util-classes.ut"
+- value="${basedir}/../util-classes/deploy/GroboUtilClasses-1.0.0/lib/GroboUtilClasses-1.0.0-utests.jar" />
++ value="${basedir}/../util-classes/deploy/groboutils-classes-1.0.0/lib/groboutils-classes-1.0.0-utests.jar" />
++
+
+-
+\ No newline at end of file
+--- a/util-datastruct/build.xml
++++ b/util-datastruct/build.xml
+@@ -12,7 +12,7 @@
+ <project name="UtilDatastruct" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboUtilDatastruct" />
++ <property name="product" value="groboutils-datastruct" />
+ <property name="version" value="1.0.0alpha3" />
+ <property name="basepackage" value="net/sourceforge/groboutils/util/datastruct/v1" />
+
+--- a/util-datastruct/deployed.ant-inc.xml
++++ b/util-datastruct/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.util-datastruct"
+- value="${basedir}/../util-datastruct/GroboUtilDatastruct-1.0.0alpha3-core.jar" />
++ value="${basedir}/../util-datastruct/groboutils-datastruct-1.0.0alpha3-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/util-io/build.xml
++++ b/util-io/build.xml
+@@ -12,7 +12,7 @@
+ <project name="UtilIO" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboUtilIO" />
++ <property name="product" value="groboutils-io" />
+ <property name="version" value="1.0.0alpha2" />
+ <property name="basepackage" value="net/sourceforge/groboutils/util/io/v1" />
+
+--- a/util-io/deployed.ant-inc.xml
++++ b/util-io/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.util-io"
+- value="${basedir}/../util-io/GroboUtilIO-1.0.0alpha2-core.jar" />
++ value="${basedir}/../util-io/groboutils-io-1.0.0alpha2-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/util-states/build.xml
++++ b/util-states/build.xml
+@@ -12,7 +12,7 @@
+ <project name="UtilStates" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboUtilStates" />
++ <property name="product" value="groboutils-states" />
+ <property name="version" value="1.0.0alpha2" />
+ <property name="basepackage" value="net/sourceforge/groboutils/util/states/v1" />
+
+--- a/util-states/deployed.ant-inc.xml
++++ b/util-states/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.util-states"
+- value="${basedir}/../util-states/GroboUtilStates-1.0.0alpha2-core.jar" />
++ value="${basedir}/../util-states/groboutils-states-1.0.0alpha2-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/util-thread/build.xml
++++ b/util-thread/build.xml
+@@ -12,7 +12,7 @@
+ <project name="UtilThread" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboUtilThread" />
++ <property name="product" value="groboutils-thread" />
+ <property name="version" value="1.0.0alpha2" />
+ <property name="basepackage" value="net/sourceforge/groboutils/util/thread/v1" />
+
+--- a/util-thread/deployed.ant-inc.xml
++++ b/util-thread/deployed.ant-inc.xml
+@@ -1,8 +1,8 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.util-thread"
+- value="${basedir}/../util-thread/GroboUtilThread-1.0.0alpha2-core.jar" />
++ value="${basedir}/../util-thread/groboutils-thread-1.0.0alpha2-core.jar" />
+
+
+
+-
+\ No newline at end of file
++
+--- a/util-xml/build.xml
++++ b/util-xml/build.xml
+@@ -12,7 +12,7 @@
+ <project name="UtilXML" default="main" basedir=".">
+
+ <!-- Property Defines -->
+- <property name="product" value="GroboUtilXML" />
++ <property name="product" value="groboutils-xml" />
+ <property name="version" value="1.1.0" />
+ <property name="basepackage" value="net/sourceforge/groboutils/util/xml/v1" />
+
+--- a/util-xml/deployed.ant-inc.xml
++++ b/util-xml/deployed.ant-inc.xml
+@@ -1,4 +1,4 @@
+ <!-- ANT includes for the deployed files in this project -->
+
+ <property name="libs.groboutils.util-xml"
+- value="${basedir}/../util-xml/GroboUtilXML-1.1.0-core.jar" />
++ value="${basedir}/../util-xml/groboutils-xml-1.1.0-core.jar" />
Deleted: trunk/libgroboutils-java/debian/patches/05_rename_subprojects.dpatch
===================================================================
--- trunk/libgroboutils-java/debian/patches/05_rename_subprojects.dpatch 2009-10-12 21:57:10 UTC (rev 10815)
+++ trunk/libgroboutils-java/debian/patches/05_rename_subprojects.dpatch 2009-10-12 22:26:53 UTC (rev 10816)
@@ -1,357 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_rename_subprojects.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad libgroboutils-java-5~/codecoverage/build.xml libgroboutils-java-5/codecoverage/build.xml
---- libgroboutils-java-5~/codecoverage/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/codecoverage/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -15,7 +15,7 @@
- <project name="CodeCoverage" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboCodeCoverage" />
-+ <property name="product" value="groboutils-codecoverage" />
- <property name="version" value="1.1.0" />
- <property name="basepackage" value="net/sourceforge/groboutils/codecoverage/v1" />
-
-diff -urNad libgroboutils-java-5~/codecoverage/deployed.ant-inc.xml libgroboutils-java-5/codecoverage/deployed.ant-inc.xml
---- libgroboutils-java-5~/codecoverage/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/codecoverage/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.codecoverage"
-- value="${basedir}/../codecoverage/GroboCodeCoverage-1.1.0-core.jar" />
-+ value="${basedir}/../codecoverage/groboutils-codecoverage-1.1.0-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/pmti/build.xml libgroboutils-java-5/pmti/build.xml
---- libgroboutils-java-5~/pmti/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/pmti/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="PMTI" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboPMTI" />
-+ <property name="product" value="groboutils-pmti" />
- <property name="version" value="1.0.0alpha3" />
- <property name="basepackage" value="net/sourceforge/groboutils/pmti/v1" />
-
-diff -urNad libgroboutils-java-5~/pmti/deployed.ant-inc.xml libgroboutils-java-5/pmti/deployed.ant-inc.xml
---- libgroboutils-java-5~/pmti/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/pmti/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.pmti"
-- value="${basedir}/../pmti/GroboPMTI-1.0.0alpha2-core.jar" />
-+ value="${basedir}/../pmti/groboutils-pmti-1.0.0alpha2-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/testing-autodoc/build.xml libgroboutils-java-5/testing-autodoc/build.xml
---- libgroboutils-java-5~/testing-autodoc/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/testing-autodoc/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="TestingAutodoc" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboTestingAutodoc" />
-+ <property name="product" value="groboutils-testingautodoc" />
- <property name="version" value="1.0.0alpha2" />
- <property name="basepackage" value="net/sourceforge/groboutils/autodoc/v1" />
-
-diff -urNad libgroboutils-java-5~/testing-autodoc/deployed.ant-inc.xml libgroboutils-java-5/testing-autodoc/deployed.ant-inc.xml
---- libgroboutils-java-5~/testing-autodoc/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/testing-autodoc/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,9 +1,9 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.testing-autodoc"
-- value="${basedir}/../testing-autodoc/GroboTestingAutodoc-1.0.0alpha2-core.jar" />
-+ value="${basedir}/../testing-autodoc/groboutils-testingautodoc-1.0.0alpha2-core.jar" />
-
- <property name="libs.groboutils.testing-autodoc.ut"
-- value="${basedir}/../testing-autodoc/deploy/GroboTestingAutodoc-1.0.0alpha2/lib/GroboTestingAutodoc-1.0.0alpha2-utests.jar" />
-+ value="${basedir}/../testing-autodoc/deploy/groboutils-testingautodoc-1.0.0alpha2/lib/groboutils-testingautodoc-1.0.0alpha2-utests.jar" />
-+
-
--
-\ No newline at end of file
-diff -urNad libgroboutils-java-5~/testing-junit/build.xml libgroboutils-java-5/testing-junit/build.xml
---- libgroboutils-java-5~/testing-junit/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/testing-junit/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="TestingJUnit" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboTestingJUnit" />
-+ <property name="product" value="groboutils-testingjunit" />
- <property name="version" value="1.2.1" />
- <property name="basepackage" value="net/sourceforge/groboutils/junit/v1" />
-
-diff -urNad libgroboutils-java-5~/testing-junit/deployed.ant-inc.xml libgroboutils-java-5/testing-junit/deployed.ant-inc.xml
---- libgroboutils-java-5~/testing-junit/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/testing-junit/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.testing-junit"
-- value="${basedir}/../testing-junit/GroboTestingJUnit-1.2.1-core.jar" />
-+ value="${basedir}/../testing-junit/groboutils-testingjunit-1.2.1-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/testing-mbtf/build.xml libgroboutils-java-5/testing-mbtf/build.xml
---- libgroboutils-java-5~/testing-mbtf/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/testing-mbtf/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="TestingMBTF" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboTestingMBTF" />
-+ <property name="product" value="groboutils-testingmbtf" />
- <property name="version" value="1.0.0alpha2" />
- <property name="basepackage" value="net/sourceforge/groboutils/mbtf/v1" />
-
-diff -urNad libgroboutils-java-5~/testing-mbtf/deployed.ant-inc.xml libgroboutils-java-5/testing-mbtf/deployed.ant-inc.xml
---- libgroboutils-java-5~/testing-mbtf/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/testing-mbtf/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.testing-mbtf"
-- value="${basedir}/../testing-mbtf/GroboTestingMBTF-1.0.0alpha2-core.jar" />
-+ value="${basedir}/../testing-mbtf/groboutils-testingmbtf-1.0.0alpha2-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/testing-tp/build.xml libgroboutils-java-5/testing-tp/build.xml
---- libgroboutils-java-5~/testing-tp/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/testing-tp/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="TestingTP" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboTestingTP" />
-+ <property name="product" value="groboutils-testingtp" />
- <property name="version" value="1.0.0alpha2" />
- <property name="basepackage" value="net/sourceforge/groboutils/tp/v1" />
-
-diff -urNad libgroboutils-java-5~/testing-tp/deployed.ant-inc.xml libgroboutils-java-5/testing-tp/deployed.ant-inc.xml
---- libgroboutils-java-5~/testing-tp/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/testing-tp/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.testing-tp"
-- value="${basedir}/../testing-tp/GroboTestingTP-1.0.0alpha2-core.jar" />
-+ value="${basedir}/../testing-tp/groboutils-testingtp-1.0.0alpha2-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/uicapture/build.xml libgroboutils-java-5/uicapture/build.xml
---- libgroboutils-java-5~/uicapture/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/uicapture/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="UICapture" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboUICapture" />
-+ <property name="product" value="groboutils-uicapture" />
- <property name="version" value="1.0.0alpha2" />
- <property name="basepackage" value="net/sourceforge/groboutils/uicapture/v1" />
-
-diff -urNad libgroboutils-java-5~/uicapture/deployed.ant-inc.xml libgroboutils-java-5/uicapture/deployed.ant-inc.xml
---- libgroboutils-java-5~/uicapture/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/uicapture/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.uicapture"
-- value="${basedir}/../uicapture/GroboUICapture-1.0.0alpha2-core.jar" />
-+ value="${basedir}/../uicapture/grobotesting-uicapture-1.0.0alpha2-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/util-classes/build.xml libgroboutils-java-5/util-classes/build.xml
---- libgroboutils-java-5~/util-classes/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/util-classes/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="UtilClasses" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboUtilClasses" />
-+ <property name="product" value="groboutils-classes" />
- <property name="version" value="1.0.0" />
- <property name="basepackage" value="net/sourceforge/groboutils/util/classes/v1" />
-
-diff -urNad libgroboutils-java-5~/util-classes/deployed.ant-inc.xml libgroboutils-java-5/util-classes/deployed.ant-inc.xml
---- libgroboutils-java-5~/util-classes/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/util-classes/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,10 +1,10 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.util-classes"
-- value="${basedir}/../util-classes/GroboUtilClasses-1.0.0-core.jar" />
-+ value="${basedir}/../util-classes/groboutils-classes-1.0.0-core.jar" />
-
-
- <property name="libs.groboutils.util-classes.ut"
-- value="${basedir}/../util-classes/deploy/GroboUtilClasses-1.0.0/lib/GroboUtilClasses-1.0.0-utests.jar" />
-+ value="${basedir}/../util-classes/deploy/groboutils-classes-1.0.0/lib/groboutils-classes-1.0.0-utests.jar" />
-+
-
--
-\ No newline at end of file
-diff -urNad libgroboutils-java-5~/util-datastruct/build.xml libgroboutils-java-5/util-datastruct/build.xml
---- libgroboutils-java-5~/util-datastruct/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/util-datastruct/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="UtilDatastruct" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboUtilDatastruct" />
-+ <property name="product" value="groboutils-datastruct" />
- <property name="version" value="1.0.0alpha3" />
- <property name="basepackage" value="net/sourceforge/groboutils/util/datastruct/v1" />
-
-diff -urNad libgroboutils-java-5~/util-datastruct/deployed.ant-inc.xml libgroboutils-java-5/util-datastruct/deployed.ant-inc.xml
---- libgroboutils-java-5~/util-datastruct/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/util-datastruct/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.util-datastruct"
-- value="${basedir}/../util-datastruct/GroboUtilDatastruct-1.0.0alpha3-core.jar" />
-+ value="${basedir}/../util-datastruct/groboutils-datastruct-1.0.0alpha3-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/util-io/build.xml libgroboutils-java-5/util-io/build.xml
---- libgroboutils-java-5~/util-io/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/util-io/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="UtilIO" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboUtilIO" />
-+ <property name="product" value="groboutils-io" />
- <property name="version" value="1.0.0alpha2" />
- <property name="basepackage" value="net/sourceforge/groboutils/util/io/v1" />
-
-diff -urNad libgroboutils-java-5~/util-io/deployed.ant-inc.xml libgroboutils-java-5/util-io/deployed.ant-inc.xml
---- libgroboutils-java-5~/util-io/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/util-io/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.util-io"
-- value="${basedir}/../util-io/GroboUtilIO-1.0.0alpha2-core.jar" />
-+ value="${basedir}/../util-io/groboutils-io-1.0.0alpha2-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/util-states/build.xml libgroboutils-java-5/util-states/build.xml
---- libgroboutils-java-5~/util-states/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/util-states/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="UtilStates" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboUtilStates" />
-+ <property name="product" value="groboutils-states" />
- <property name="version" value="1.0.0alpha2" />
- <property name="basepackage" value="net/sourceforge/groboutils/util/states/v1" />
-
-diff -urNad libgroboutils-java-5~/util-states/deployed.ant-inc.xml libgroboutils-java-5/util-states/deployed.ant-inc.xml
---- libgroboutils-java-5~/util-states/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/util-states/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.util-states"
-- value="${basedir}/../util-states/GroboUtilStates-1.0.0alpha2-core.jar" />
-+ value="${basedir}/../util-states/groboutils-states-1.0.0alpha2-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/util-thread/build.xml libgroboutils-java-5/util-thread/build.xml
---- libgroboutils-java-5~/util-thread/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/util-thread/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="UtilThread" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboUtilThread" />
-+ <property name="product" value="groboutils-thread" />
- <property name="version" value="1.0.0alpha2" />
- <property name="basepackage" value="net/sourceforge/groboutils/util/thread/v1" />
-
-diff -urNad libgroboutils-java-5~/util-thread/deployed.ant-inc.xml libgroboutils-java-5/util-thread/deployed.ant-inc.xml
---- libgroboutils-java-5~/util-thread/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/util-thread/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,8 +1,8 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.util-thread"
-- value="${basedir}/../util-thread/GroboUtilThread-1.0.0alpha2-core.jar" />
-+ value="${basedir}/../util-thread/groboutils-thread-1.0.0alpha2-core.jar" />
-
-
-
--
-\ No newline at end of file
-+
-diff -urNad libgroboutils-java-5~/util-xml/build.xml libgroboutils-java-5/util-xml/build.xml
---- libgroboutils-java-5~/util-xml/build.xml 2009-03-23 19:39:22.000000000 +0100
-+++ libgroboutils-java-5/util-xml/build.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -12,7 +12,7 @@
- <project name="UtilXML" default="main" basedir=".">
-
- <!-- Property Defines -->
-- <property name="product" value="GroboUtilXML" />
-+ <property name="product" value="groboutils-xml" />
- <property name="version" value="1.1.0" />
- <property name="basepackage" value="net/sourceforge/groboutils/util/xml/v1" />
-
-diff -urNad libgroboutils-java-5~/util-xml/deployed.ant-inc.xml libgroboutils-java-5/util-xml/deployed.ant-inc.xml
---- libgroboutils-java-5~/util-xml/deployed.ant-inc.xml 2009-03-23 19:39:02.000000000 +0100
-+++ libgroboutils-java-5/util-xml/deployed.ant-inc.xml 2009-03-23 19:39:22.477286540 +0100
-@@ -1,4 +1,4 @@
- <!-- ANT includes for the deployed files in this project -->
-
- <property name="libs.groboutils.util-xml"
-- value="${basedir}/../util-xml/GroboUtilXML-1.1.0-core.jar" />
-+ value="${basedir}/../util-xml/groboutils-xml-1.1.0-core.jar" />
Added: trunk/libgroboutils-java/debian/patches/series
===================================================================
--- trunk/libgroboutils-java/debian/patches/series (rev 0)
+++ trunk/libgroboutils-java/debian/patches/series 2009-10-12 22:26:53 UTC (rev 10816)
@@ -0,0 +1,5 @@
+01_reduce_junit_logging.diff
+02_dont_stop_on_junit_failure.diff
+03_easymock_upgrade.diff
+04_coverage_zip_archives.diff
+05_rename_subprojects.diff
Modified: trunk/libgroboutils-java/debian/rules
===================================================================
--- trunk/libgroboutils-java/debian/rules 2009-10-12 21:57:10 UTC (rev 10815)
+++ trunk/libgroboutils-java/debian/rules 2009-10-12 22:26:53 UTC (rev 10816)
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
@@ -10,7 +10,7 @@
DEB_JARS := ant-junit junit4 ant-nodeps log4j-1.2 easymock ant-trax bcel ant-apache-bcel
DEB_ANT_BUILD_TARGET := main
-DEB_ANT_CHECK_TARGET := test-all
+####DEB_ANT_CHECK_TARGET := test-all
DEB_ANT_CLEAN_TARGET := clean
ALL_JARS = $(wildcard */*.jar)
More information about the pkg-java-commits
mailing list