Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 13141 invoked from network); 27 Jun 2010 17:27:05 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Jun 2010 17:27:05 -0000 Received: (qmail 32116 invoked by uid 500); 27 Jun 2010 17:27:05 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 32043 invoked by uid 500); 27 Jun 2010 17:27:05 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 32035 invoked by uid 99); 27 Jun 2010 17:27:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jun 2010 17:27:04 +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; Sun, 27 Jun 2010 17:27:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 68593238890A; Sun, 27 Jun 2010 17:26:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r958398 - /geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java Date: Sun, 27 Jun 2010 17:26:09 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100627172609.68593238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Sun Jun 27 17:26:09 2010 New Revision: 958398 URL: http://svn.apache.org/viewvc?rev=958398&view=rev Log: use the classfinder from the module that knows what the relevant classes are when looking for DataSource annotations Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java?rev=958398&r1=958397&r2=958398&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java (original) +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java Sun Jun 27 17:26:09 2010 @@ -48,7 +48,6 @@ import org.apache.openejb.jee.IsolationL import org.apache.openejb.jee.JndiConsumer; import org.apache.openejb.jee.Property; import org.apache.openejb.jee.Text; -import org.apache.xbean.finder.BundleAnnotationFinder; import org.apache.xmlbeans.QNameSet; import org.apache.xmlbeans.XmlObject; import org.osgi.framework.Bundle; @@ -98,36 +97,29 @@ public class DataSourceBuilder extends A public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map componentContext) throws DeploymentException { - Bundle bundle = module.getEarContext().getDeploymentBundle(); - - BundleAnnotationFinder classFinder; - try { - classFinder = new BundleAnnotationFinder(packageAdmin, bundle); - } catch (Exception e) { - throw new DeploymentException("could not create class finder " + bundle, e); - } - - // step 1: process annotations and update deployment descriptor - List classes; - classes = classFinder.findAnnotatedClasses(DataSourceDefinitions.class); - if (classes != null) { - for (Class clazz : classes) { - DataSourceDefinitions dsDefinitions = (DataSourceDefinitions) clazz.getAnnotation(DataSourceDefinitions.class); - for (DataSourceDefinition dsDefinition : dsDefinitions.value()) { - processDefinition(dsDefinition, specDD); + if ((module != null) && (module.getClassFinder() != null)) { + + List classes; + classes = module.getClassFinder().findAnnotatedClasses(DataSourceDefinitions.class); + if (classes != null) { + for (Class clazz : classes) { + DataSourceDefinitions dsDefinitions = (DataSourceDefinitions) clazz.getAnnotation(DataSourceDefinitions.class); + for (DataSourceDefinition dsDefinition : dsDefinitions.value()) { + processDefinition(dsDefinition, specDD); + } + } - } - } - classes = classFinder.findAnnotatedClasses(DataSourceDefinition.class); - if (classes != null) { - for (Class clazz : classes) { - DataSourceDefinition dsDefinition = (DataSourceDefinition) clazz.getAnnotation(DataSourceDefinition.class); - processDefinition(dsDefinition, specDD); + classes = module.getClassFinder().findAnnotatedClasses(DataSourceDefinition.class); + if (classes != null) { + for (Class clazz : classes) { + DataSourceDefinition dsDefinition = (DataSourceDefinition) clazz.getAnnotation(DataSourceDefinition.class); + processDefinition(dsDefinition, specDD); + } } } - + // step 2: bind all defined data sources into jndi Collection dataSources = specDD.getDataSource(); if (dataSources != null) {