felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1029826 - in /felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin: JavaClassDescriptorManager.java tags/annotation/AnnotationTagProviderManager.java
Date Mon, 01 Nov 2010 20:44:18 GMT
Author: cziegeler
Date: Mon Nov  1 20:44:17 2010
New Revision: 1029826

URL: http://svn.apache.org/viewvc?rev=1029826&view=rev
Log:
FELIX-2679 : Detect AnnotationTagProvider's through META-INF/services

Modified:
    felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
    felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java

Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java?rev=1029826&r1=1029825&r2=1029826&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
(original)
+++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
Mon Nov  1 20:44:17 2010
@@ -82,7 +82,7 @@ public abstract class JavaClassDescripto
         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;

Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java?rev=1029826&r1=1029825&r2=1029826&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
(original)
+++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
Mon Nov  1 20:44:17 2010
@@ -23,7 +23,6 @@ import java.util.*;
 
 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 @@ public class AnnotationTagProviderManage
      */
     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() )



Mime
View raw message