FELIX-2679 : Detect AnnotationTagProvider's through META-INF/services
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1029826 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
index 957521d..fe53da7 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
@@ -82,7 +82,7 @@
this.processAnnotations = processAnnotations;
this.parseJavadocs = parseJavadocs;
this.log = log;
- this.annotationTagProviderManager = new AnnotationTagProviderManager( log, annotationTagProviders, classLoader );
+ this.annotationTagProviderManager = new AnnotationTagProviderManager( annotationTagProviders, classLoader );
this.classloader = classLoader;
ClassUtil.classLoader = this.classloader;
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
index cc8ae26..1d0e1f9 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
@@ -23,7 +23,6 @@
import javax.imageio.spi.ServiceRegistry;
-import org.apache.felix.scrplugin.Log;
import org.apache.felix.scrplugin.SCRDescriptorFailureException;
import org.apache.felix.scrplugin.tags.JavaField;
import org.apache.felix.scrplugin.tags.JavaTag;
@@ -47,20 +46,16 @@
*/
private final Map<String, AnnotationTagProvider> annotationTagProviders = new LinkedHashMap<String, AnnotationTagProvider>();
- private final Log log;
-
/**
* @param annotationTagProviderClasses List of classes that implements
* {@link AnnotationTagProvider} interface.
* @throws SCRDescriptorFailureException
*/
- public AnnotationTagProviderManager( final Log log,
+ public AnnotationTagProviderManager(
final String[] annotationTagProviderClasses,
final ClassLoader classLoader )
throws SCRDescriptorFailureException
{
- this.log = log;
-
// search for providers
final Iterator<AnnotationTagProvider> serviceIter = ServiceRegistry.lookupProviders(AnnotationTagProvider.class, classLoader);
while ( serviceIter.hasNext() )