From scm-return-45581-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Wed Feb 16 06:55:55 2011 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 72882 invoked from network); 16 Feb 2011 06:55:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Feb 2011 06:55:54 -0000 Received: (qmail 47789 invoked by uid 500); 16 Feb 2011 06:55:54 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 47731 invoked by uid 500); 16 Feb 2011 06:55:53 -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 47724 invoked by uid 99); 16 Feb 2011 06:55:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Feb 2011 06:55:53 +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; Wed, 16 Feb 2011 06:55:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6942023889BF; Wed, 16 Feb 2011 06:55:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1071159 - /geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java Date: Wed, 16 Feb 2011 06:55:32 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110216065532.6942023889BF@eris.apache.org> Author: genspring Date: Wed Feb 16 06:55:32 2011 New Revision: 1071159 URL: http://svn.apache.org/viewvc?rev=1071159&view=rev Log: OpenJPA can't handle the url when WEB-INF/classes PU was wrapped with 'jar:' and '!/' Modified: geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java Modified: geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java?rev=1071159&r1=1071158&r2=1071159&view=diff ============================================================================== --- geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java (original) +++ geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java Wed Feb 16 06:55:32 2011 @@ -165,7 +165,7 @@ public class PersistenceUnitGBean implem private static URL getPersistenceUnitRoot(Bundle bundle, String persistenceUnitRoot) throws MalformedURLException { if (persistenceUnitRoot == null || persistenceUnitRoot.equals(".")) { return bundle.getEntry("/"); - } else if (persistenceUnitRoot.endsWith("/")) { + } else if (persistenceUnitRoot.endsWith("/")|| persistenceUnitRoot.endsWith("WEB-INF/classes")) { return bundle.getEntry(persistenceUnitRoot); } else { return new URL("jar:" + bundle.getEntry(persistenceUnitRoot) + "!/");