svn commit: r901968 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java

[dwoods]

Author: dwoods
Date: Fri Jan 22 03:34:57 2010
New Revision: 901968

URL: http://svn.apache.org/viewvc?rev=901968&view=rev
Log:
OPENJPA-1410 Undo removal of code that was added by OPENJPA-1460

Modified:
    
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java

Modified: 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java?rev=901968&r1=901967&r2=901968&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
 Fri Jan 22 03:34:57 2010
@@ -187,6 +187,11 @@
                 }
             }
 
+            OpenJPAConfiguration conf = factory.getConfiguration();
+            // OPENJPA-1460 Fix scope visibility of orm.xml when it is 
packaged in both ear file and war file
+            conf.setPersistenceUnitRootUrl(pui.getPersistenceUnitRootUrl());
+            _log = conf.getLog(OpenJPAConfiguration.LOG_RUNTIME);
+
             // Create appropriate LifecycleEventManager
             loadValidator(factory);