Return-Path: Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: (qmail 1159 invoked from network); 9 Sep 2009 21:59:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Sep 2009 21:59:34 -0000 Received: (qmail 98933 invoked by uid 500); 9 Sep 2009 21:59:34 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 98884 invoked by uid 500); 9 Sep 2009 21:59:34 -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 98874 invoked by uid 99); 9 Sep 2009 21:59:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Sep 2009 21:59:34 +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; Wed, 09 Sep 2009 21:59:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 608ED23888E7; Wed, 9 Sep 2009 21:59:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r813135 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Date: Wed, 09 Sep 2009 21:59:10 -0000 To: commits@openejb.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090909215910.608ED23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Wed Sep 9 21:59:10 2009 New Revision: 813135 URL: http://svn.apache.org/viewvc?rev=813135&view=rev Log: Quick addition to OPENEJB-1059 which process each URL (jar) individually as there may be several modules in that list each with their own persistence.xml. Only module type that does this is ears, so it did't come out in the tests. Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=813135&r1=813134&r2=813135&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Wed Sep 9 21:59:10 2009 @@ -953,14 +953,17 @@ appModule.getAltDDs().put("persistence.xml", persistenceUrls); } - // OPENEJB-1059: looking for an altdd persistence.xml file in all urls - // delegates to xbean finder for going throughout the list - ResourceFinder finder = new ResourceFinder("", ClassLoader.getSystemClassLoader(), urls); - Map descriptors = getDescriptors(finder); - // if a persistence.xml has been found, just pull it to the list - if (descriptors.containsKey("persistence.xml")) { - persistenceUrls.add(descriptors.get("persistence.xml")); + for (URL url : urls) { + // OPENEJB-1059: looking for an altdd persistence.xml file in all urls + // delegates to xbean finder for going throughout the list + ResourceFinder finder = new ResourceFinder("", appModule.getClassLoader(), url); + Map descriptors = getDescriptors(finder); + + // if a persistence.xml has been found, just pull it to the list + if (descriptors.containsKey("persistence.xml")) { + persistenceUrls.add(descriptors.get("persistence.xml")); + } } }