Bug#309030: java1-runtime, gjdoc, junit
ms419@freezone.co.uk, 309030@bugs.debian.org
ms419@freezone.co.uk, 309030@bugs.debian.org
Fri May 13 21:54:02 2005
--Apple-Mail-32-274262058
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
delsp=yes;
format=flowed
Package: libcommons-beanutils-java
Version: 1.6.1-4
Package: libcommons-collections-java
Version: 2.1.1-3
Package: libcommons-digester-java
Version: 1.5.0.1-4
Package: libcommons-logging-java
Version: 1.0.4-2
I patched libcommons-collections-java, libcommons-digester-java, &
libcommons-logging-java to depend on java1-runtime, so I could install
tomcat4 with only sablevm & not require kaffe (sablevm provides
java1-runtime)
I got the idea from libcommons-beanutils-java, which already depends on
java1-runtime
While I was at it, I made packages build javadocs using gjdoc &
prepared them to run build tests with junit (though all packages' test
currently fails, pending resolution of other bugs - see comments)
The changes I made are attached - these are the packages I built -
http://cgi.sfu.ca/~jdbates/debian/pool/debian-java/commons-beanutils/
http://cgi.sfu.ca/~jdbates/debian/pool/debian-java/libcommons-
collections-java/
http://cgi.sfu.ca/~jdbates/debian/pool/debian-java/libcommons-digester-
java/
http://cgi.sfu.ca/~jdbates/debian/pool/debian-java/libcommons-logging-
java/
I'm happy with them - they work great for me! If they don't offend, I'm
super keen to have these changes applied to the official packages!
Thank you so much for maintaining free java!
Jack
--Apple-Mail-32-274262058
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="commons-beanutils.patch"
Content-Disposition: attachment;
filename=commons-beanutils.patch
diff -Nur commons-beanutils-1.6.1/debian/changelog commons-beanutils-1.6.1.fixed/debian/changelog
--- commons-beanutils-1.6.1/debian/changelog 2005-05-13 11:15:10.472134387 -0700
+++ commons-beanutils-1.6.1.fixed/debian/changelog 2005-05-03 12:28:52.000000000 -0700
@@ -1,3 +1,10 @@
+commons-beanutils (1.6.1-4.1) unstable; urgency=low
+
+ * Run tests
+ * Build javadocs
+
+ -- Jack Bates <ms419@freezone.co.uk> Tue, 3 May 2005 12:28:31 -0700
+
commons-beanutils (1.6.1-4) unstable; urgency=low
* rebuild by jikes with -source 1.3 option.
diff -Nur commons-beanutils-1.6.1/debian/control commons-beanutils-1.6.1.fixed/debian/control
--- commons-beanutils-1.6.1/debian/control 2005-05-13 11:15:10.471134521 -0700
+++ commons-beanutils-1.6.1.fixed/debian/control 2005-05-13 11:18:34.896816036 -0700
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Takashi Okamoto <tora@debian.org>
-Build-Depends-Indep: kaffe (>= 2:1.1.4.PRE1.1.5-7), jikes, debhelper (>> 4.0.0), cdbs, libant1.6-java, libcommons-collections-java, libcommons-logging-java
+Build-Depends-Indep: kaffe (>= 2:1.1.4.PRE1.1.5-7), jikes, debhelper (>> 4.0.0), cdbs, libant1.6-java, gjdoc, junit, libcommons-collections-java, libcommons-logging-java
Standards-Version: 3.5.8
Package: libcommons-beanutils-java
@@ -14,10 +14,10 @@
The BeanUtils Component contains a set of Java classes that provide
static utility methods useful in manipulating Java classes that conform
to the JavaBeans Specification naming patterns for bean properties in a
- dynamic fashion.
+ dynamic fashion.
-#Package: libcommons-beanutils-java-doc
-#Architecture: all
-#Description: Documentation for libcommons-collections-java
-# Documentation for libcommons-collections-java which is utility for
-# manipulating JavaBeans.
+Package: libcommons-beanutils-java-doc
+Architecture: all
+Description: documentation for libcommons-collections-java
+ Documentation for libcommons-collections-java which is utility for
+ manipulating JavaBeans.
diff -Nur commons-beanutils-1.6.1/debian/rules commons-beanutils-1.6.1.fixed/debian/rules
--- commons-beanutils-1.6.1/debian/rules 2005-05-13 11:15:10.472134387 -0700
+++ commons-beanutils-1.6.1.fixed/debian/rules 2005-05-09 13:30:05.000000000 -0700
@@ -6,11 +6,12 @@
# These two must be specified
JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant1.6
+ANT_HOME := /usr/share/ant1.6
+DEB_ANT_ARGS := -Djunit.jar=/usr/share/java/junit.jar -Dcommons-logging.jar=/usr/share/java/commons-logging.jar
# Additional JARs to add to the class path, either full path or just the
# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS := commons-logging commons-collections /usr/share/ant1.6/lib/ant-launcher.jar
+DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar commons-collections commons-logging
# Build compiler
DEB_ANT_COMPILER := jikes
@@ -21,8 +22,10 @@
# Defaults to build.xml (Ant default) in $(DEB_BUILDDIR)
#DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_BUILD_TARGET := jar javadoc
+
+# Disabled pending http://issues.apache.org/bugzilla/show_bug.cgi?id=34824
+#DEB_ANT_TEST_TARGET := test
install/libcommons-beanutils-java::
install -m 644 dist/commons-beanutils.jar debian/libcommons-beanutils-java/usr/share/java/commons-beanutils-1.6.1.jar
-
--Apple-Mail-32-274262058
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
--Apple-Mail-32-274262058
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="commons-collections.patch"
Content-Disposition: attachment;
filename=commons-collections.patch
diff -Nur libcommons-collections-java-2.1.1/debian/changelog libcommons-collections-java-2.1.1.fixed/debian/changelog
--- libcommons-collections-java-2.1.1/debian/changelog 2005-05-13 11:22:01.104217401 -0700
+++ libcommons-collections-java-2.1.1.fixed/debian/changelog 2005-05-03 12:41:34.000000000 -0700
@@ -1,3 +1,11 @@
+libcommons-collections-java (2.1.1-3.1) unstable; urgency=low
+
+ * Depend on java1-runtime so sablevm can satisfy
+ * Run tests
+ * Build javadocs
+
+ -- Jack Bates <ms419@freezone.co.uk> Tue, 3 May 2005 12:22:45 -0700
+
libcommons-collections-java (2.1.1-3) unstable; urgency=low
* rebuild by jikes with -source 1.3 option. This keeps backward
diff -Nur libcommons-collections-java-2.1.1/debian/control libcommons-collections-java-2.1.1.fixed/debian/control
--- libcommons-collections-java-2.1.1/debian/control 2005-05-13 11:22:01.102217249 -0700
+++ libcommons-collections-java-2.1.1.fixed/debian/control 2005-05-13 11:21:36.573354096 -0700
@@ -3,21 +3,21 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Takashi Okamoto <tora@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), libant1.6-java, kaffe (>= 1:1.1.3), jikes (>= 1:1.18-8), cdbs (>= 0.4.21-0.1)
+Build-Depends-Indep: debhelper (>> 4.0.0), kaffe (>= 1:1.1.3), jikes (>= 1:1.18-8), cdbs (>= 0.4.21-0.1), libant1.6-java, gjdoc, junit
Standards-Version: 3.5.8
Package: libcommons-collections-java
Architecture: all
-Depends: kaffe (>= 1:1.1.3) | java2-runtime
+Depends: kaffe (>= 1:1.1.3) | java2-runtime | java1-runtime
Suggests: libcommons-collections-java-doc
-Description: A set of abstract data type interfaces and implementations
+Description: set of abstract data type interfaces and implementations
The Java Collections Framework provides a set of abstract data
type interfaces and implementations that offer both a wealth
of useful functionality, and a solid foundation for extending
that functionality.
-#Package: libcommons-collections-java-doc
-#Architecture: all
-#Description: Documentation for libcommons-collections-java
-# Documentation for libcommons-collections-java which is a set of abstract
-# data type interfaces and implementations.
+Package: libcommons-collections-java-doc
+Architecture: all
+Description: documentation for libcommons-collections-java
+ Documentation for libcommons-collections-java which is a set of abstract
+ data type interfaces and implementations.
diff -Nur libcommons-collections-java-2.1.1/debian/libcommons-collections-java-doc.docs libcommons-collections-java-2.1.1.fixed/debian/libcommons-collections-java-doc.docs
--- libcommons-collections-java-2.1.1/debian/libcommons-collections-java-doc.docs 2005-05-13 11:22:01.103217325 -0700
+++ libcommons-collections-java-2.1.1.fixed/debian/libcommons-collections-java-doc.docs 2005-05-03 11:31:59.000000000 -0700
@@ -1,2 +1 @@
dist/docs/api
-STATUS.html
diff -Nur libcommons-collections-java-2.1.1/debian/rules libcommons-collections-java-2.1.1.fixed/debian/rules
--- libcommons-collections-java-2.1.1/debian/rules 2005-05-13 11:22:01.103217325 -0700
+++ libcommons-collections-java-2.1.1.fixed/debian/rules 2005-05-07 09:38:56.000000000 -0700
@@ -6,12 +6,11 @@
# These two must be specified
JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant1.6
+ANT_HOME := /usr/share/ant1.6
# Additional JARs to add to the class path, either full path or just the
# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar log4j-1.2 logkit servlet-2.3
-
+DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar log4j-1.2 logkit servlet-2.3 junit
# Build compiler
DEB_ANT_COMPILER := jikes
@@ -22,8 +21,10 @@
# Defaults to build.xml (Ant default) in $(DEB_BUILDDIR)
#DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := dist-jar
+DEB_ANT_BUILD_TARGET := dist-jar doc
+
+# Disabled pending http://issues.apache.org/bugzilla/show_bug.cgi?id=34690
+#DEB_ANT_TEST_TARGET := test
install/libcommons-collections-java::
install -m 644 dist/commons-collections-2.1.1.jar debian/libcommons-collections-java/usr/share/java/commons-collections-2.1.1.jar
-
--Apple-Mail-32-274262058
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
--Apple-Mail-32-274262058
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="commons-digester.patch"
Content-Disposition: attachment;
filename=commons-digester.patch
diff -Nur libcommons-digester-java-1.5.0.1/build.xml libcommons-digester-java-1.5.0.1.fixed/build.xml
--- libcommons-digester-java-1.5.0.1/build.xml 2004-08-12 09:59:07.000000000 -0700
+++ libcommons-digester-java-1.5.0.1.fixed/build.xml 2005-05-13 11:31:06.594651550 -0700
@@ -151,7 +151,7 @@
<target name="static" depends="prepare"
description="Copy static files to build directory">
-<!-- <tstamp/> -->
+ <tstamp/>
<copy todir="${build.home}/conf" filtering="on">
<fileset dir="${conf.home}" includes="*.MF"/>
</copy>
@@ -162,10 +162,10 @@
description="Compile shareable components">
<javac srcdir="${source.home}"
destdir="${build.home}/classes"
- source="1.3"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="1.3">
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${build.home}/classes" filtering="on">
@@ -204,12 +204,10 @@
<target name="javadoc" depends="compile"
description="Create component Javadoc documentation">
-<!--
<mkdir dir="${dist.home}"/>
<mkdir dir="${dist.home}/docs"/>
<mkdir dir="${dist.home}/docs/api"/>
-
-
+ <javadoc sourcepath="${source.home}"
destdir="${dist.home}/docs/api"
packagenames="org.apache.commons.*"
author="true"
@@ -226,8 +224,7 @@
<link offline="true" packagelistLoc="${commons-logging.api}"
href="http://jakarta.apache.org/commons/logging/api/"/>
<classpath refid="compile.classpath"/>
- </gjdoc>
--->
+ </javadoc>
</target>
diff -Nur libcommons-digester-java-1.5.0.1/debian/changelog libcommons-digester-java-1.5.0.1.fixed/debian/changelog
--- libcommons-digester-java-1.5.0.1/debian/changelog 2005-05-13 11:25:12.000000000 -0700
+++ libcommons-digester-java-1.5.0.1.fixed/debian/changelog 2005-05-13 11:29:38.771980750 -0700
@@ -1,3 +1,11 @@
+libcommons-digester-java (1.5.0.1-4.1) unstable; urgency=low
+
+ * Depend on java1-runtime so sablevm can satisfy
+ * Build javadocs
+ * Run tests
+
+ -- Jack Bates <ms419@freezone.co.uk> Tue, 3 May 2005 12:38:35 -0700
+
libcommons-digester-java (1.5.0.1-4) unstable; urgency=low
* Made it a non-native package
diff -Nur libcommons-digester-java-1.5.0.1/debian/control libcommons-digester-java-1.5.0.1.fixed/debian/control
--- libcommons-digester-java-1.5.0.1/debian/control 2005-04-05 01:08:19.000000000 -0700
+++ libcommons-digester-java-1.5.0.1.fixed/debian/control 2005-05-13 11:27:08.264548566 -0700
@@ -3,13 +3,19 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Takashi Okamoto <tora@debian.org>, Michael Koch <konqueror@gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.11), cdbs (>= 0.4.21), libant1.6-java , jikes (>= 1.15), kaffe (>= 2:1.1.4.PRECVS12-1), libcommons-beanutils-java, libcommons-logging-java , gjdoc (>=0.6.1-12)
+Build-Depends-Indep: debhelper (>= 4.2.11), cdbs (>= 0.4.21), jikes (>= 1.15), kaffe (>= 2:1.1.4.PRECVS12-1), libant1.6-java, gjdoc (>=0.6.1-12), junit, libcommons-beanutils-java, libcommons-logging-java
Standards-Version: 3.6.1
Package: libcommons-digester-java
Architecture: all
-Depends: kaffe (>= 2:1.1.4.PRECVS12-1) | java2-runtime , libcommons-beanutils-java (>= 1.3), libcommons-logging-java
+Depends: kaffe (>= 2:1.1.4.PRECVS12-1) | java2-runtime | java1-runtime, libcommons-beanutils-java (>= 1.3), libcommons-logging-java
Suggests: libcommons-digester-java-doc
-Description: Rule based XML Java object mapping tool
- Commons-Digester convert XML to Java object by mapping rule. A rich set of
+Description: rule based XML Java object mapping tool
+ Commons-Digester convert XML to Java object by mapping rule. A rich set of
predefined rules is available for your use, or you can also create your own.
+
+Package: libcommons-digester-java-doc
+Architecture: all
+Description: documentation for libcommons-digester-java
+ Documentation for libcommons-digester-java which is rule based XML Java object
+ mapping tool.
diff -Nur libcommons-digester-java-1.5.0.1/debian/libcommons-digester-java-doc.docs libcommons-digester-java-1.5.0.1.fixed/debian/libcommons-digester-java-doc.docs
--- libcommons-digester-java-1.5.0.1/debian/libcommons-digester-java-doc.docs 2004-07-26 09:20:04.000000000 -0700
+++ libcommons-digester-java-1.5.0.1.fixed/debian/libcommons-digester-java-doc.docs 2005-05-03 11:26:23.000000000 -0700
@@ -1,2 +1 @@
dist/docs/api
-STATUS.html
diff -Nur libcommons-digester-java-1.5.0.1/debian/rules libcommons-digester-java-1.5.0.1.fixed/debian/rules
--- libcommons-digester-java-1.5.0.1/debian/rules 2004-07-30 20:19:44.000000000 -0700
+++ libcommons-digester-java-1.5.0.1.fixed/debian/rules 2005-05-09 08:39:51.000000000 -0700
@@ -6,8 +6,8 @@
# These two must be specified
JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant1.6
-DEB_ANT_ARGS := -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl
+ANT_HOME := /usr/share/ant1.6
+DEB_ANT_ARGS := -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl -Djunit.jar=/usr/share/java/junit.jar -Dcommons-beanutils.jar=/usr/share/java/commons-beanutils.jar -Dcommons-collections.jar=/usr/share/java/commons-collections.jar -Dcommons-logging.jar=/usr/share/java/commons-logging.jar
# Additional JARs to add to the class path, either full path or just the
# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
@@ -22,7 +22,10 @@
# Defaults to build.xml (Ant default) in $(DEB_BUILDDIR)
#DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := dist #javadoc
+DEB_ANT_BUILD_TARGET := dist
+
+# Disabled pending http://issues.apache.org/bugzilla/show_bug.cgi?id=34819
+#DEB_ANT_TEST_TARGET := test
install/libcommons-digester-java::
install -m 644 dist/commons-digester.jar debian/libcommons-digester-java/usr/share/java/commons-digester-1.5.jar
--Apple-Mail-32-274262058
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
--Apple-Mail-32-274262058
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="commons-logging.patch"
Content-Disposition: attachment;
filename=commons-logging.patch
diff -Nur libcommons-logging-java-1.0.4/debian/changelog libcommons-logging-java-1.0.4.fixed/debian/changelog
--- libcommons-logging-java-1.0.4/debian/changelog 2005-05-13 11:34:24.847710379 -0700
+++ libcommons-logging-java-1.0.4.fixed/debian/changelog 2005-05-13 11:36:29.998463875 -0700
@@ -1,3 +1,11 @@
+libcommons-logging-java (1.0.4-2.1) unstable; urgency=low
+
+ * Depend on java1-runtime, so sablevm can satisfy
+ * Build javadocs
+ * Run tests
+
+ -- Jack Bates <ms419@freezone.co.uk> Tue, 3 May 2005 12:17:54 -0700
+
libcommons-logging-java (1.0.4-2) unstable; urgency=low
* rebuild with -source 1.3 option to keep compatibility for j2sdk1.3.
diff -Nur libcommons-logging-java-1.0.4/debian/control libcommons-logging-java-1.0.4.fixed/debian/control
--- libcommons-logging-java-1.0.4/debian/control 2005-05-13 11:34:24.846710303 -0700
+++ libcommons-logging-java-1.0.4.fixed/debian/control 2005-05-13 11:33:47.547877173 -0700
@@ -1,16 +1,23 @@
-Source:libcommons-logging-java
+Source: libcommons-logging-java
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Takashi Okamoto <tora@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, libant1.6-java , liblogkit-java, liblog4j1.2-java, jikes (>= 1.15), kaffe (>= 1.0.6)
+Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, jikes (>= 1.15), kaffe (>= 1.0.6), libant1.6-java, gjdoc, junit, liblogkit-java, liblog4j1.2-java
Standards-Version: 3.6.1
Package: libcommons-logging-java
Architecture: all
-Depends: kaffe (>= 1:1.1.3) | java2-runtime
-Description: The commmon wrapper interface for several logging API
+Depends: kaffe (>= 1:1.1.3) | java2-runtime | java1-runtime
+Suggests: libcommons-logging-java-doc
+Description: commmon wrapper interface for several logging APIs
The commons-logging package provides a simple, component oriented
interface (org.apache.commons.logging.Log) together with wrappers for
logging systems. The user can choose at runtime which system they want
- to use.
+ to use.
+
+Package: libcommons-logging-java-doc
+Architecture: all
+Description: documentation for libcommons-logging-java
+ Documentation for libcommons-logging-java which is the common wrapper
+ interface for several logging APIs
diff -Nur libcommons-logging-java-1.0.4/debian/libcommons-logging-java-doc.docs libcommons-logging-java-1.0.4.fixed/debian/libcommons-logging-java-doc.docs
--- libcommons-logging-java-1.0.4/debian/libcommons-logging-java-doc.docs 1969-12-31 16:00:00.000000000 -0800
+++ libcommons-logging-java-1.0.4.fixed/debian/libcommons-logging-java-doc.docs 2005-05-03 11:42:31.000000000 -0700
@@ -0,0 +1 @@
+dist/docs/api
diff -Nur libcommons-logging-java-1.0.4/debian/rules libcommons-logging-java-1.0.4.fixed/debian/rules
--- libcommons-logging-java-1.0.4/debian/rules 2005-05-13 11:34:24.847710379 -0700
+++ libcommons-logging-java-1.0.4.fixed/debian/rules 2005-05-06 19:32:50.000000000 -0700
@@ -6,7 +6,7 @@
# These two must be specified
JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant1.6
+ANT_HOME := /usr/share/ant1.6
# Additional JARs to add to the class path, either full path or just the
# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
@@ -21,11 +21,13 @@
# Defaults to build.xml (Ant default) in $(DEB_BUILDDIR)
#DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := compile
+DEB_ANT_BUILD_TARGET := compile javadoc
+
+# Disabled pending bug #307983
+#DEB_ANT_TEST_TARGET := test
install/libcommons-logging-java::
install -m 644 target/commons-logging.jar debian/libcommons-logging-java/usr/share/java/commons-logging-1.0.4.jar
install -m 644 target/commons-logging-api.jar debian/libcommons-logging-java/usr/share/java/commons-logging-api-1.0.4.jar
-# ${JAVA_HOME}/bin/jar debian/libcommons-logging-java/usr/share/java/commons-logging-1.0.3.jar -C build/servletapi/classes javax
-
+ #${JAVA_HOME}/bin/jar debian/libcommons-logging-java/usr/share/java/commons-logging-1.0.3.jar -C build/servletapi/classes javax
diff -Nur libcommons-logging-java-1.0.4/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java libcommons-logging-java-1.0.4.fixed/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
--- libcommons-logging-java-1.0.4/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java 2004-02-28 13:46:45.000000000 -0800
+++ libcommons-logging-java-1.0.4.fixed/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java 2005-05-06 19:09:17.000000000 -0700
@@ -276,10 +276,7 @@
parent = parent.getParent();
}
handlers = parent.getHandlers();
- if ((handlers != null) && (handlers.length == 1) &&
- (handlers[0] instanceof TestHandler)) {
- handler = (TestHandler) handlers[0];
- }
+ handler = (TestHandler) handlers[0];
}
--Apple-Mail-32-274262058--