From scm-return-46193-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Sun May 8 08:35:55 2011 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4290C36F7 for ; Sun, 8 May 2011 08:35:55 +0000 (UTC) Received: (qmail 24248 invoked by uid 500); 8 May 2011 08:35:54 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 24198 invoked by uid 500); 8 May 2011 08:35:54 -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 24190 invoked by uid 99); 8 May 2011 08:35:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 May 2011 08:35:54 +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; Sun, 08 May 2011 08:35:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C3C352388A38; Sun, 8 May 2011 08:35:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110508083530.C3C352388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 persistenceURLs = new HashMap();