Return-Path: Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: (qmail 23522 invoked from network); 9 Nov 2010 06:07:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Nov 2010 06:07:12 -0000 Received: (qmail 28222 invoked by uid 500); 9 Nov 2010 06:07:44 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 28163 invoked by uid 500); 9 Nov 2010 06:07:42 -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 28156 invoked by uid 99); 9 Nov 2010 06:07:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Nov 2010 06:07:42 +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; Tue, 09 Nov 2010 06:07:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7B91023888CD; Tue, 9 Nov 2010 06:06:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1032856 - /openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Date: Tue, 09 Nov 2010 06:06:25 -0000 To: commits@openejb.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101109060625.7B91023888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Tue Nov 9 06:06:25 2010 New Revision: 1032856 URL: http://svn.apache.org/viewvc?rev=1032856&view=rev Log: OPENEJB-1371: Double encoding of persistence-unit root-url leads to issues in paths with spaces Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1032856&r1=1032855&r2=1032856&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Tue Nov 9 06:06:25 2010 @@ -92,9 +92,15 @@ public class ReadDescriptors implements if (persistenceUrls != null) { for (URL persistenceUrl : persistenceUrls) { - final String path = URLs.toFilePath(persistenceUrl); - String moduleName = path.replaceFirst("/?META-INF/.*persistence.xml$", "/"); + File file = URLs.toFile(persistenceUrl); + final String path = file.getAbsolutePath(); + if (file.getName().endsWith("persistence.xml")) { + file = file.getParentFile().getParentFile(); + } + String moduleName = file.getAbsolutePath(); + + System.out.println("FOO moduleName = " + moduleName); try { Persistence persistence = JaxbPersistenceFactory.getPersistence(persistenceUrl); PersistenceModule persistenceModule = new PersistenceModule(moduleName, persistence);