felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r907754 - /felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java
Date Mon, 08 Feb 2010 18:40:05 GMT
Author: pderop
Date: Mon Feb  8 18:39:56 2010
New Revision: 907754

URL: http://svn.apache.org/viewvc?rev=907754&view=rev
Log:
Generate DependencyManager annotation descriptors under OSGI-INF/dependencymanager/ directory.
Don't limit the Bnd class analyzer and parse every classes.

Modified:
    felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java

Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java?rev=907754&r1=907753&r2=907754&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java
(original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java
Mon Feb  8 18:39:56 2010
@@ -82,8 +82,6 @@
             // Try to locate any classes in the wildcarded universe
             // that are annotated with the DependencyManager "Service" annotations.
             Collection<Clazz> expanded = m_analyzer.getClasses("",
-                // Then limit the ones with component annotations.
-                QUERY.ANNOTATION.toString(), Service.class.getName(),
                 // Parse everything
                 QUERY.NAMED.toString(), "*");
 
@@ -100,7 +98,7 @@
                 // And store the generated component descriptors in our resource list.
                 String name = c.getFQN();
                 Resource resource = createComponentResource(reader);
-                m_resources.put("OSGI-INF/" + name + ".dm", resource);
+                m_resources.put("OSGI-INF/dependencymanager/" + name, resource);
                 annotationsFound = true;
             }
 



Mime
View raw message