Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 96606 invoked from network); 8 Feb 2010 18:40:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Feb 2010 18:40:33 -0000 Received: (qmail 50926 invoked by uid 500); 8 Feb 2010 18:40:33 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 50874 invoked by uid 500); 8 Feb 2010 18:40:33 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 50865 invoked by uid 99); 8 Feb 2010 18:40:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Feb 2010 18:40:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Feb 2010 18:40:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8F1B623889DA; Mon, 8 Feb 2010 18:40:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100208184010.8F1B623889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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; }