Return-Path: Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: (qmail 99781 invoked from network); 9 Sep 2009 21:52:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Sep 2009 21:52:43 -0000 Received: (qmail 94715 invoked by uid 500); 9 Sep 2009 21:52:43 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 94664 invoked by uid 500); 9 Sep 2009 21:52:43 -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 94655 invoked by uid 99); 9 Sep 2009 21:52:43 -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:52:43 +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:52:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 73F92238889D; Wed, 9 Sep 2009 21:52:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r813132 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Date: Wed, 09 Sep 2009 21:52:19 -0000 To: commits@openejb.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090909215219.73F92238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Wed Sep 9 21:52:19 2009 New Revision: 813132 URL: http://svn.apache.org/viewvc?rev=813132&view=rev Log: reformatted 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=813132&r1=813131&r2=813132&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:52:19 2009 @@ -944,15 +944,15 @@ @SuppressWarnings({"unchecked"}) protected static void addPersistenceUnits(AppModule appModule, URL... urls) throws OpenEJBException { - - // OPENEJB-1059: Anything in the appModule.getAltDDs() map has already been - // processed by the altdd code, so anything in here should not cause OPENEJB-1059 - List persistenceUrls = (List) appModule.getAltDDs().get("persistence.xml"); + + // OPENEJB-1059: Anything in the appModule.getAltDDs() map has already been + // processed by the altdd code, so anything in here should not cause OPENEJB-1059 + List persistenceUrls = (List) appModule.getAltDDs().get("persistence.xml"); if (persistenceUrls == null) { persistenceUrls = new ArrayList(); 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);