Author: clement
Date: Tue Mar 13 06:57:12 2012
New Revision: 1299986
URL: http://svn.apache.org/viewvc?rev=1299986&view=rev
Log:
Apply patch to fix FELIX-3389.
Modified:
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
Modified:
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java?rev=1299986&r1=1299985&r2=1299986&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
(original)
+++
felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/src/main/java/org/apache/felix/ipojo/bnd/BndJarResourceStore.java
Tue Mar 13 06:57:12 2012
@@ -24,7 +24,6 @@ import aQute.lib.osgi.Jar;
import aQute.lib.osgi.Resource;
import aQute.libg.reporter.Reporter;
import org.apache.felix.ipojo.annotations.Component;
-import org.apache.felix.ipojo.annotations.Handler;
import org.apache.felix.ipojo.manipulator.Pojoization;
import org.apache.felix.ipojo.manipulator.ResourceStore;
import org.apache.felix.ipojo.manipulator.ResourceVisitor;
@@ -67,7 +66,7 @@ public class BndJarResourceStore impleme
try {
// Only visit classes annotated with @Component or @Handler
- String annotations = Component.class.getName() + "|" +
Handler.class.getName();
+ String annotations = Component.class.getPackage().getName() + ".*";
Collection<Clazz> classes = m_analyzer.getClasses("",
Clazz.QUERY.ANNOTATION.name(), annotations,
