Generate DependencyManager annotation descriptors under OSGI-INF/dependencymanager/ directory. Don't limit the Bnd class analyzer and parse every classes.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@907754 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java b/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java
index 55dad6f..5fd5c17 100644
--- a/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java
+++ b/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java
@@ -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;
}