debian/0000775000000000000000000000000011760722615007177 5ustar debian/rules0000775000000000000000000000105311756657740010271 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := ant-junit4 ant-junit DEB_ANT_BUILD_TARGET := dist test.discovery LIBRARY := commons-discovery install/lib$(LIBRARY)-java:: mh_installpoms -plib$(LIBRARY)-java mh_installjar -plib$(LIBRARY)-java -l pom.xml dist/$(LIBRARY).jar clean:: -rm -rf debian/tmp get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename debian/manifest0000664000000000000000000000110511756657740010740 0ustar usr/share/java/commons-discovery.jar: Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.apache.commons.discovery Bundle-Version: 0.5 Bundle-Name: Apache Service Discovery component Bundle-Vendor: Apache Software Foundation Export-Package: org.apache.commons.discovery,org.apache.commons.discovery.ant,org.apache.commons.discovery.jdk,org.apache.commons.discovery.log,org.apache.commons.discovery.resource,org.apache.commons.discovery.resource.classes,org.apache.commons.discovery.resource.names,org.apache.commons.discovery.tools Require-Bundle: org.apache.commons.logging debian/README.source0000664000000000000000000000046511756657740011376 0ustar Information about libcommons-discovery-java ------------------------------ This package was debianized using the mh_make command from the maven-debian-helper package. The build system uses Maven but prevents it from downloading anything from the Internet, making the build compliant with the Debian policy. debian/maven.rules0000664000000000000000000000200711756657740011373 0ustar # Maven rules - transform Maven dependencies and plugins # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # - a regular expression of the form s/match/replace/ # in this case, elements that match are transformed using # the regex rule. # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ commons-discovery commons-discovery jar s/.*/debian/ * * junit junit jar s/4\..*/4.x/ * * commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * * debian/control0000664000000000000000000000576711760722614010620 0ustar Source: libcommons-discovery-java Section: java Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Damien Raude-Morvan , Kumar Appaiah , Varun Hiremath , Jakub Adam Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk Build-Depends-Indep: ant-optional, libcommons-logging-java, junit4, default-jdk-doc, libcommons-logging-java-doc, maven-repo-helper, javahelper Standards-Version: 3.9.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java/ Homepage: http://commons.apache.org/discovery/ Package: libcommons-discovery-java Architecture: all Depends: ${misc:Depends}, libcommons-logging-java Suggests: libcommons-discovery-java-doc Description: locates classes that implement a given Java interface The Discovery Component is about discovering, or finding, implementations for pluggable interfaces. It provides facilities instantiating classes in general, and for lifecycle management of singleton (factory) classes. . Fundamentally, Discovery locates classes that implement a given Java interface. The discovery pattern, though not necessarily this package, is used in many projects including JAXP (SaxParserFactory and others) and commons-logging (LogFactory). By extracting this pattern, other projects can (re)use it and take advantage of improvements to the pattern as Discovery evolves. . Discovery improves over previous implementations by establishing facilities for working within managed environments. These allow configuration and property overrides without appealing to the global System properties (which are scoped across an entire JVM). Package: libcommons-discovery-java-doc Section: doc Architecture: all Depends: ${misc:Depends}, libcommons-logging-java-doc Suggests: libcommons-discovery-java Description: locates classes that implement a given Java interface (documentation) The Discovery Component is about discovering, or finding, implementations for pluggable interfaces. It provides facilities instantiating classes in general, and for lifecycle management of singleton (factory) classes. . Fundamentally, Discovery locates classes that implement a given Java interface. The discovery pattern, though not necessarily this package, is used in many projects including JAXP (SaxParserFactory and others) and commons-logging (LogFactory). By extracting this pattern, other projects can (re)use it and take advantage of improvements to the pattern as Discovery evolves. . Discovery improves over previous implementations by establishing facilities for working within managed environments. These allow configuration and property overrides without appealing to the global System properties (which are scoped across an entire JVM). . This package contains the documentation. debian/copyright0000664000000000000000000000134711756657740011152 0ustar This package was debianized by Arnaud Vandyck on Fri, 12 Mar 2004 23:53:29 +0100. It was downloaded from http://commons.apache.org/discovery/ Upstream Authors: Richard Sitze, Craig R. McClanahan, Costin Manolache, James Strachan , Matthew Hawthorne , Davanum Srinivas , Rory Winston , Robert Burrell Donkin Copyright: © 2002-2011 The Apache Software Foundation License: Apache-2.0 On Debian systems the full text of the Apache License can be found in `/usr/share/common-licenses/Apache-2.0'. debian/maven.publishedRules0000664000000000000000000000164211756657740013237 0ustar # Maven published rules - additional rules to publish, to help # the packaging work of Debian maintainers using mh_make # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # - a regular expression of the form s/match/replace/ # in this case, elements that match are transformed using # the regex rule. # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ debian/libcommons-discovery-java-doc.install0000664000000000000000000000007511756657740016435 0ustar dist/docs/api/* usr/share/doc/libcommons-discovery-java/api debian/maven.ignoreRules0000664000000000000000000000171411756657740012543 0ustar # Maven ignore rules - ignore some Maven dependencies and plugins # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM # junit junit jar s/3\\..*/3.x/ org.apache.maven.plugins maven-assembly-plugin * * * * org.apache.maven.plugins maven-changes-plugin * * * * org.apache.maven.plugins maven-checkstyle-plugin * * * * org.codehaus.mojo findbugs-maven-plugin * * * * debian/maven.properties0000664000000000000000000000023111756657740012432 0ustar # Include here properties to pass to Maven during the build. # For example: # maven.test.skip=true maven.compiler.source=1.5 maven.compiler.target=1.5 debian/orig-tar.sh0000775000000000000000000000066611756657740011305 0ustar #!/bin/sh set -eu VERSION=$2 TAR=../libcommons-discovery-java_$VERSION.orig.tar.gz DIR=commons-discovery-$VERSION TAG=$(echo "DISCOVERY_$VERSION" | sed -re's,\.,_,g') svn export http://svn.apache.org/repos/asf/commons/proper/discovery/tags/${TAG}/ $DIR tar -c -z -f $TAR $DIR rm -rf $DIR ../$TAG # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout mv $TAR $origDir && echo "moved $TAR to $origDir" fi debian/watch0000664000000000000000000000024311756657740010242 0ustar version=3 opts="uversionmangle=s/_/./g" \ http://svn.apache.org/repos/asf/commons/proper/discovery/tags/ \ DISCOVERY_([\d_]*)/ debian debian/orig-tar.sh debian/libcommons-discovery-java-doc.doc-base.api0000664000000000000000000000054111756657740017212 0ustar Document: libcommons-discovery-java Title: API Javadoc for Commons Discovery Author: Commons Discovery developers Abstract: This is the API Javadoc provided for the libcommons-discovery-java library. Section: Programming Format: HTML Index: /usr/share/doc/libcommons-discovery-java/api/index.html Files: /usr/share/doc/libcommons-discovery-java/api/* debian/changelog0000664000000000000000000002101011760722577011052 0ustar libcommons-discovery-java (0.5-3ubuntu1) quantal; urgency=low * Merge from Debian testing. Remaining changes: - d/control: Switch Build-Deps from maven to ant, fix Depends on binary packages. - d/rules: Switch from maven to ant cdbs build and ensure that junit4 is used to execute unit tests. - d/ant.properties: Specify build overrides for upstream build.xml to support use of system Java libraries. - d/libcommons-discovery-java-doc.install: install API docs from ant build output. - d/patches/fix_junit4_tests.diff: fix build process to execute tests using the junit ant task rather than executing junit directly in order to support use of JUnit4 annotations. -- James Page Mon, 28 May 2012 17:18:46 +0100 libcommons-discovery-java (0.5-3) unstable; urgency=low * Team upload. * Add --java-lib option to pom file to fix FTBFS. (Closes: #663106) * Bump standards version to 3.9.3 (no changes). * Remove Michael Koch from Uploaders. (Closes: #654053) -- tony mancill Thu, 08 Mar 2012 08:06:54 -0800 libcommons-discovery-java (0.5-2ubuntu2) quantal; urgency=low * No-change rebuild with openjdk-7 as default-jdk. -- James Page Fri, 18 May 2012 11:42:14 +0100 libcommons-discovery-java (0.5-2ubuntu1) precise; urgency=low * Merge from Debian testing. Remaining changes: - d/control: Switch Build-Deps from maven to ant, fix Depends on binary packages. - d/rules: Switch from maven to ant cdbs build and ensure that junit4 is used to execute unit tests. - d/ant.properties: Specify build overrides for upstream build.xml to support use of system Java libraries. - d/libcommons-discovery-java-doc.install: install API docs from ant build output. - d/patches/fix_junit4_tests.diff: fix build process to execute tests using the junit ant task rather than executing junit directly in order to support use of JUnit4 annotations. -- James Page Thu, 09 Feb 2012 16:15:30 +0000 libcommons-discovery-java (0.5-2) unstable; urgency=low * Add OSGi metadata to jar manifest -- Jakub Adam Tue, 15 Nov 2011 00:34:22 +0100 libcommons-discovery-java (0.5-1ubuntu1) precise; urgency=low * Switch build system to ant to support continued inclusion in Ubuntu main: - d/control: Switch Build-Deps from maven to ant, fix Depends on binary packages. - d/rules: Switch from maven to ant cdbs build and ensure that junit4 is used to execute unit tests. - d/ant.properties: Specify build overrides for upstream build.xml to support use of system Java libraries. - d/libcommons-discovery-java-doc.install: install API docs from ant build output. - d/patches/fix_junit4_tests.diff: fix build process to execute tests using the junit ant task rather than executing junit directly in order to support use of JUnit4 annotations. -- James Page Wed, 23 Nov 2011 11:51:23 +0000 libcommons-discovery-java (0.5-1) unstable; urgency=low * Team upload. [ Damien Raude-Morvan ] * d/patches/java6_incompatible_types{,_tests}.diff: Fix FTBFS on openjdk-6. * d/control: Drop Depends on any JRE as a Java library don't need to depends on a runtime (Java Policy). * d/patches/0001-set-source-and-target-version-1.5.patch: Dropped. * d/maven.properties: Set source and target for javac to 1.5. [ Torsten Werner ] * Update Standards-Version: 3.9.2. * New upstream version. * Update debian/copyright. * Use Maven to build the package. * Drop old patch which is not needed anymore. * Update debian/watch to create orig tarball from upstreams svn repository. -- Damien Raude-Morvan Tue, 01 Nov 2011 15:14:06 +0100 libcommons-discovery-java (0.4-4) unstable; urgency=low [ Emmanuel Bourg ] * Update of the URLs * Rename Jakarta Commons to Apache Commons [ Damien Raude-Morvan ] * Add myself to Uploaders * Remove Arnaud from Uploaders (retired from Debian) * Add Maven support: - debian/control: Build-Depends-Indep on maven-repo-helper - debian/rules: mh_installpoms and mh_installjar - debian/pom.xml: POM for commons-dicovery * Use 3.0 (quilt) source format: - debian/rules: Remove simple-patchsys.mk - Refresh all debian/patches * Updated Standards-Version 3.8.4 (no changes needed) * debian/ant.properties: Compile for Java 1.3 * Install Javadoc HTML to /usr/share/doc/libcommons-discovery-java/api/ -- Damien Raude-Morvan Thu, 25 Mar 2010 22:45:40 +0100 libcommons-discovery-java (0.4-3) unstable; urgency=low * Update the license to Apache License 2.0 (Closes: #532890) -- Varun Hiremath Tue, 16 Jun 2009 17:38:09 -0400 libcommons-discovery-java (0.4-2) unstable; urgency=low [ Matthias Klose ] * (Build-)depend on default-jre/-jdk. [ Varun Hiremath ] * Split out api docs into a separate -doc package (Closes: #506359) -- Varun Hiremath Sat, 06 Dec 2008 20:58:55 -0500 libcommons-discovery-java (0.4-1) unstable; urgency=low [ Kumar Appaiah ] * debian/control: + Add XS-Vcs-{Svn,Browser} to debian/control + Add Homepage field. * Update watch file. [ Varun Hiremath ] * New upstream release * debian/control: + Add myself and Kumar Appaiah to Uploaders. + move cdbs and debhelper to Build-Depends. + modify Description. * debian/compat: switch to 5 * remove links file from debian/ * debian/rules: + Use DEB_UPSTREAM_VERSION to install jar + Create a versioned symbolic link to the jar. + implement get-orig-source * debian/patches: + remove 02_jikes_target_1_3.patch, builds without setting target to 1.3 + remove 03_gjdoc_crash_fix.patch, gjdoc bug has been fixed and no longer needed. * Add debian/orig-tar.sh to move tarball to deb-layout's tarballs dir. * Update debian/watch to call debian/orig-tar.sh * debian/docs: remove adc-guidelines.html and best-practices.html as upstream provides only Maven xdocs XMLs. -- Varun Hiremath Thu, 20 Sep 2007 23:27:45 +0530 libcommons-discovery-java (0.2-10) unstable; urgency=low * Use java-gcj-compat instead of kaffe. * Moved Build-Depends-Indep to Build-Depends. * Updated Standards-Version. * Removed Wolfgang from Uploaders and added myself. * Fixed Homepage: tag in package description. -- Michael Koch Sun, 17 Jun 2007 13:56:27 -0100 libcommons-discovery-java (0.2-9) unstable; urgency=low * kaffe compiler transition -- Wolfgang Baer Sun, 15 Jan 2006 17:00:07 +0100 libcommons-discovery-java (0.2-8) unstable; urgency=low * Additional ant-optional dependency due to ant reorganization and enabled unit tests during build time * Added java1-runtime dependency to allow all free runtimes * Added patch to fix gjdoc crash on one source file (reported upstream) * Removed junit as dependency - only needed at build time * Register documenation with doc-base * Removed empty README.Debian * Standards-Version 3.6.2 (no changes) -- Wolfgang Baer Wed, 5 Oct 2005 10:01:59 +0000 libcommons-discovery-java (0.2-7) unstable; urgency=low * libant1.6-java to ant transition -- Arnaud Vandyck Sat, 20 Aug 2005 19:37:55 +0200 libcommons-discovery-java (0.2-6) unstable; urgency=low * building with kaffe because of a failure in sablevm * building javadoc -- Arnaud Vandyck Wed, 2 Mar 2005 22:47:22 +0100 libcommons-discovery-java (0.2-5) unstable; urgency=low * added kaffe to the build-dep, but finally built with SableVM. The javadoc is no more generated at the moment. -- Arnaud Vandyck Sun, 15 Aug 2004 02:33:19 +0200 libcommons-discovery-java (0.2-4) unstable; urgency=low * added libant1.6-java and jikes (closes: #265661). -- Arnaud Vandyck Sat, 14 Aug 2004 16:22:02 +0200 libcommons-discovery-java (0.2-3) unstable; urgency=low * added cdbs to the build-depends, thanks to Daniel Schepler (closes: #251908). -- Arnaud Vandyck Mon, 31 May 2004 21:34:17 +0200 libcommons-discovery-java (0.2-2) unstable; urgency=low * Move to main: libcommons-logging-java is now in main. -- Arnaud Vandyck Thu, 13 May 2004 00:51:00 +0200 libcommons-discovery-java (0.2-1) unstable; urgency=low * Initial Release (closes: #237507). -- Arnaud Vandyck Fri, 12 Mar 2004 23:53:29 +0100 debian/ant.properties0000664000000000000000000000021211663151655012074 0ustar junit.jar=/usr/share/java/junit4.jar logger.jar=/usr/share/java/commons-logging.jar ant.build.javac.source=1.5 ant.build.javac.target=1.5 debian/compat0000664000000000000000000000000211756657740010410 0ustar 7 debian/maven.cleanIgnoreRules0000664000000000000000000000150111756657740013500 0ustar # Maven clean ignore rules - ignore some Maven dependencies and plugins # during the clean phase of a Maven build # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM before mvn clean is called # junit junit jar s/3\\..*/3.x/ debian/libcommons-discovery-java.poms0000664000000000000000000000274411756657740015207 0ustar # List of POM files for the package # Format of this file is: # [option]* # where option can be: # --ignore: ignore this POM or # --no-parent: remove the tag from the POM # --package=: an alternative package to use when installing this POM # and its artifact # --has-package-version: to indicate that the original version of the POM is the same as the upstream part # of the version for the package. # --keep-elements=: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=: path to the build artifact associated with this POM, # it will be installed when using the command mh_install # --java-lib: install the jar into /usr/share/java to comply with Debian # packaging guidelines # --usj-name=: name to use when installing the library in /usr/share/java # --usj-version=: version to use when installing the library in /usr/share/java # --no-usj-versionless: don't install the versionless link in /usr/share/java # --dest-jar=: the destination for the real jar # it will be installed with mh_install. # --classifier=: Optional, the classifier for the jar. Empty by default. # --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created # temporarily for certain artifacts such as Javadoc jars. # pom.xml --java-lib --no-parent --has-package-version debian/source/0000775000000000000000000000000011756657740010512 5ustar debian/source/format0000664000000000000000000000001411756657740011720 0ustar 3.0 (quilt) debian/patches/0000775000000000000000000000000011756657740010641 5ustar debian/patches/fix_junit4_tests.diff0000664000000000000000000000257111663156513014772 0ustar Description: Execute JUnit tests using Ant junit task instead of executing junit directory using java as this does not support JUnit4 test annotations. . Upstream have switched build system to maven so this patch will not be forwarded either to Debian or to upstream. Author: James Page Forwarded: not-needed Index: libcommons-discovery-java-0.5/build.xml =================================================================== --- libcommons-discovery-java-0.5.orig/build.xml 2011-11-23 11:13:50.206722656 +0000 +++ libcommons-discovery-java-0.5/build.xml 2011-11-23 11:16:25.095112101 +0000 @@ -221,11 +221,20 @@ - - + + + + + + + + + + debian/patches/java6_incompatible_types.diff0000664000000000000000000000770011756657740016460 0ustar Description: OpenJDK fails to compile commons-discovery 0.5 This works around the compiler problem by adding the type parameters to the calls instead of letting the compiler infer them. Author: Denis Lila Origin: https://issues.apache.org/jira/secure/attachment/12481130/ojdk-javac-workaround.patch Bug: https://issues.apache.org/jira/browse/DISCOVERY-18 Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=706066 Applied-Upstream: 0.6 Index: b/src/java/org/apache/commons/discovery/tools/DiscoverClass.java =================================================================== --- a/src/java/org/apache/commons/discovery/tools/DiscoverClass.java +++ b/src/java/org/apache/commons/discovery/tools/DiscoverClass.java @@ -185,7 +185,7 @@ * the resulting class does not implement (or extend) the SPI. */ public Class find(Class spiClass) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return DiscoverClass.find(getClassLoaders(spiClass), new SPInterface(spiClass), nullProperties, (DefaultClassHolder) null); @@ -204,7 +204,7 @@ * the resulting class does not implement (or extend) the SPI. */ public Class find(Class spiClass, Properties properties) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return DiscoverClass.find(getClassLoaders(spiClass), new SPInterface(spiClass), new PropertiesHolder(properties), (DefaultClassHolder) null); @@ -223,7 +223,7 @@ * the resulting class does not implement (or extend) the SPI. */ public Class find(Class spiClass, String defaultImpl) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return DiscoverClass.find(getClassLoaders(spiClass), new SPInterface(spiClass), nullProperties, new DefaultClassHolder(defaultImpl)); @@ -244,7 +244,7 @@ */ public Class find(Class spiClass, Properties properties, String defaultImpl) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return DiscoverClass.find(getClassLoaders(spiClass), new SPInterface(spiClass), new PropertiesHolder(properties), new DefaultClassHolder(defaultImpl)); @@ -265,7 +265,7 @@ */ public Class find(Class spiClass, String propertiesFileName, String defaultImpl) throws DiscoveryException { - return find(getClassLoaders(spiClass), + return DiscoverClass.find(getClassLoaders(spiClass), new SPInterface(spiClass), new PropertiesHolder(propertiesFileName), new DefaultClassHolder(defaultImpl)); @@ -517,7 +517,7 @@ IllegalAccessException, NoSuchMethodException, InvocationTargetException { - return spi.newInstance(find(loaders, spi, properties, defaultImpl)); + return spi.newInstance(DiscoverClass.find(loaders, spi, properties, defaultImpl)); } /** Index: b/src/java/org/apache/commons/discovery/tools/Service.java =================================================================== --- a/src/java/org/apache/commons/discovery/tools/Service.java +++ b/src/java/org/apache/commons/discovery/tools/Service.java @@ -63,7 +63,7 @@ * @return Enumeration of class instances ({@code S}) */ public static Enumeration providers(Class spiClass) { - return providers(new SPInterface(spiClass), null); + return Service.providers(new SPInterface(spiClass), null); } /** debian/patches/java6_incompatible_types_tests.diff0000664000000000000000000000420211756657740017674 0ustar Index: b/src/test/org/apache/commons/discovery/test/TestAll.java =================================================================== --- a/src/test/org/apache/commons/discovery/test/TestAll.java +++ b/src/test/org/apache/commons/discovery/test/TestAll.java @@ -41,6 +41,7 @@ import org.apache.commons.discovery.tools.ManagedProperties; import org.apache.commons.discovery.tools.PropertiesHolder; import org.apache.commons.discovery.tools.SPInterface; +import org.apache.commons.discovery.tools.Service; import org.apache.commons.logging.Log; import org.junit.Test; @@ -263,7 +264,7 @@ ClassLoaders loaders = ClassLoaders.getAppLoaders(TestInterface2.class, getClass(), false); DiscoverClass discover = new DiscoverClass(loaders); - Class implClass = discover.find(TestInterface2.class); + Class implClass = discover.find(TestInterface2.class); assertTrue("Failed to find an implementation class", implClass != null); assertEquals("org.apache.commons.discovery.test.TestImpl2_1", implClass.getName()); @@ -274,7 +275,7 @@ ClassLoaders loaders = ClassLoaders.getAppLoaders(TestInterface3.class, getClass(), false); DiscoverClass discover = new DiscoverClass(loaders); - Class implClass = discover.find(TestInterface3.class); + Class implClass = discover.find(TestInterface3.class); assertTrue("Failed to find an implementation class", implClass != null); assertEquals("org.apache.commons.discovery.test.TestImpl3$InnerTestImpl", implClass.getName()); @@ -297,7 +298,7 @@ final int expectedLogImplementations = 2; int actualLogImplementations = 0; - Enumeration logImplementations = providers(newSPInterface(Log.class, + Enumeration logImplementations = Service.providers(newSPInterface(Log.class, new Class[]{ String.class }, new Object[]{ getClass().getName() }), null); debian/patches/series0000664000000000000000000000013011756657740012050 0ustar java6_incompatible_types.diff java6_incompatible_types_tests.diff fix_junit4_tests.diff