geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1100705 - /geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Date Sun, 08 May 2011 08:35:30 GMT
Author: genspring
Date: Sun May  8 08:35:30 2011
New Revision: 1100705

URL: http://svn.apache.org/viewvc?rev=1100705&view=rev
Log:
Match the directory classpath whether it ends with "/" or not.

Modified:
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=1100705&r1=1100704&r2=1100705&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Sun May  8 08:35:30 2011
@@ -151,7 +151,15 @@ public class PersistenceUnitBuilder impl
 
                 @Override
                 public boolean directoryDiscoveryRequired(String s) {
-                    return manifestcp.contains(s);
+                    
+                    boolean found = false;
+                    if (manifestcp.contains(s)){
+                        found=true;
+                    } else if(s.endsWith("/") && manifestcp.contains(s.substring(0,s.length()-1))){
+                        found=true;
+                    }
+                    
+                    return found;
                 }
             });
             final Map<URL, String> persistenceURLs = new HashMap<URL, String>();



Mime
View raw message