Return-Path: Delivered-To: apmail-incubator-open-jpa-commits-archive@locus.apache.org Received: (qmail 84218 invoked from network); 8 Oct 2006 19:29:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Oct 2006 19:29:58 -0000 Received: (qmail 45552 invoked by uid 500); 8 Oct 2006 19:29:58 -0000 Delivered-To: apmail-incubator-open-jpa-commits-archive@incubator.apache.org Received: (qmail 45531 invoked by uid 500); 8 Oct 2006 19:29:58 -0000 Mailing-List: contact open-jpa-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: open-jpa-dev@incubator.apache.org Delivered-To: mailing list open-jpa-commits@incubator.apache.org Received: (qmail 45513 invoked by uid 99); 8 Oct 2006 19:29:58 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Oct 2006 12:29:58 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:60938] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 72/B1-01505-EEB49254 for ; Sun, 08 Oct 2006 12:05:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0C1391A981A; Sun, 8 Oct 2006 12:05:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r454191 - in /incubator/openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ Date: Sun, 08 Oct 2006 19:05:15 -0000 To: open-jpa-commits@incubator.apache.org From: awhite@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061008190516.0C1391A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: awhite Date: Sun Oct 8 12:05:15 2006 New Revision: 454191 URL: http://svn.apache.org/viewvc?view=rev&rev=454191 Log: Always use a ConfigurationProvider that supplies a spec. Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java?view=diff&rev=454191&r1=454190&r2=454191 ============================================================================== --- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java (original) +++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java Sun Oct 8 12:05:15 2006 @@ -95,7 +95,7 @@ } } - private static BrokerFactory invokeFactory (ConfigurationProvider conf, + private static BrokerFactory invokeFactory(ConfigurationProvider conf, ClassLoader loader, String methodName) throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java?view=diff&rev=454191&r1=454190&r2=454191 ============================================================================== --- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java (original) +++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java Sun Oct 8 12:05:15 2006 @@ -165,7 +165,8 @@ * overrides. */ public static OpenJPAEntityManagerFactory getEntityManagerFactory(Map map) { - ConfigurationProvider cp = new MapConfigurationProvider(map); + ConfigurationProvider cp = new PersistenceProductDerivation. + ConfigurationProviderImpl(map); try { return toEntityManagerFactory(Bootstrap.getBrokerFactory(cp, null)); } catch (Exception e) { Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?view=diff&rev=454191&r1=454190&r2=454191 ============================================================================== --- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original) +++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Sun Oct 8 12:05:15 2006 @@ -355,11 +355,18 @@ /** * Custom configuration provider. */ - private static class ConfigurationProviderImpl + public static class ConfigurationProviderImpl extends MapConfigurationProvider { private String _source; + public ConfigurationProviderImpl() { + } + + public ConfigurationProviderImpl(Map props) { + super(props); + } + /** * Set the source of information in this provider. */ @@ -374,8 +381,10 @@ super.setInto(conf, null); Log log = conf.getConfigurationLog(); - if (log.isTraceEnabled()) - log.trace(_loc.get("conf-load", _source, getProperties())); + if (log.isTraceEnabled()) { + String src = (_source == null) ? "?" : _source; + log.trace(_loc.get("conf-load", src, getProperties())); + } } }