Return-Path: X-Original-To: apmail-openejb-commits-archive@www.apache.org Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 162049BDA for ; Tue, 21 Feb 2012 14:51:00 +0000 (UTC) Received: (qmail 47575 invoked by uid 500); 21 Feb 2012 14:50:58 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 47553 invoked by uid 500); 21 Feb 2012 14:50:58 -0000 Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openejb.apache.org Delivered-To: mailing list commits@openejb.apache.org Received: (qmail 47517 invoked by uid 99); 21 Feb 2012 14:50:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 14:50:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 21 Feb 2012 14:50:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 88DF9238897D for ; Tue, 21 Feb 2012 14:50:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1291821 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java Date: Tue, 21 Feb 2012 14:50:34 -0000 To: commits@openejb.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120221145034.88DF9238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Tue Feb 21 14:50:33 2012 New Revision: 1291821 URL: http://svn.apache.org/viewvc?rev=1291821&view=rev Log: updating API after having updated xbean-xml Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java?rev=1291821&r1=1291820&r2=1291821&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java Tue Feb 21 14:50:33 2012 @@ -31,6 +31,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; import java.net.URL; +import java.util.Arrays; public class FinderFactory { @@ -54,7 +55,7 @@ public class FinderFactory { if (module instanceof WebModule) { WebModule webModule = (WebModule) module; final ClassLoader webClassLoader = webModule.getClassLoader(); - final IAnnotationFinder finder = xmlFinder(module, inputStream(webModule.getFile(), WEB_SCAN_XML)); + final IAnnotationFinder finder = xmlFinder(module, inputStream(webModule.getFile(), WEB_SCAN_XML), webModule.getScannableUrls(), AggregatedArchive.class); if (finder != null) { return finder; } @@ -64,7 +65,7 @@ public class FinderFactory { if (module instanceof ConnectorModule) { ConnectorModule connectorModule = (ConnectorModule) module; final ClassLoader connectorClassLoader = connectorModule.getClassLoader(); - final IAnnotationFinder finder = xmlFinder(module, connectorClassLoader.getResourceAsStream(SCAN_XML)); + final IAnnotationFinder finder = xmlFinder(module, connectorClassLoader.getResourceAsStream(SCAN_XML), connectorModule.getLibraries()); if (finder != null) { return finder; } @@ -85,7 +86,7 @@ public class FinderFactory { } if (webInfClassesFolder.getParentFile().exists()) { final FileInputStream fis = inputStream(webInfClassesFolder.getParentFile().getParentFile(), WEB_SCAN_XML); - final IAnnotationFinder finder = xmlFinder(module, fis); + final IAnnotationFinder finder = xmlFinder(module, fis, Arrays.asList(url)); if (finder != null) { return finder; } @@ -94,7 +95,7 @@ public class FinderFactory { url = new URL(location); } - final IAnnotationFinder finder = xmlFinder(module, module.getClassLoader().getResourceAsStream(SCAN_XML)); + final IAnnotationFinder finder = xmlFinder(module, module.getClassLoader().getResourceAsStream(SCAN_XML), Arrays.asList(url)); if (finder != null) { return finder; } @@ -105,10 +106,10 @@ public class FinderFactory { } } - private static IAnnotationFinder xmlFinder(final DeploymentModule module, final InputStream scanIs) { + private static IAnnotationFinder xmlFinder(final DeploymentModule module, final InputStream scanIs, final Iterable urls, final Class clazz) { if (scanIs != null) { try { - final IAnnotationFinder finder = XMLAnnotationFinderHelper.finderFromXml(scanIs, module.getClassLoader()); + final IAnnotationFinder finder = XMLAnnotationFinderHelper.finderFromXml(scanIs, module.getClassLoader(), urls, clazz); logger.info("using scan.xml for module " + module.getModuleId()); return finder; } catch (JAXBException jaxbEx) {