You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/02/16 07:55:32 UTC
svn commit: r1071159 -
/geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
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) + "!/");