svn commit: r1512239 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java

[rmannibucau]

Author: rmannibucau
Date: Fri Aug  9 10:27:01 2013
New Revision: 1512239

URL: http://svn.apache.org/r1512239
Log:
trying to use openjpa.ConnectionFactoryName and openjpa.ConnectionFactory2Name 
when no jtadatasource or nonjtadatasource are configured in an openjpa 
persistence unit

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1512239&r1=1512238&r2=1512239&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 Fri Aug  9 10:27:01 2013
@@ -1313,6 +1313,15 @@ public class AutoConfig implements Dynam
             //                
unit.setNonJtaDataSource(unit.getJtaDataSource()+"NonJta");
             //            }
 
+            if 
("org.apache.openjpa.persistence.PersistenceProviderImpl".equals(unit.getProvider()))
 {
+                if (unit.getJtaDataSource() == null) {
+                    
unit.setJtaDataSource(unit.getProperty("openjpa.ConnectionFactoryName"));
+                }
+                if (unit.getNonJtaDataSource() == null) {
+                    
unit.setNonJtaDataSource(unit.getProperty("openjpa.ConnectionFactory2Name"));
+                }
+            }
+
             logger.debug("raw <jta-data-source>" + unit.getJtaDataSource() + 
"</jta-datasource>");
             logger.debug("raw <non-jta-data-source>" + 
unit.getNonJtaDataSource() + "</non-jta-datasource>");