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

[rmannibucau]

Author: rmannibucau
Date: Sun Nov 20 19:23:44 2011
New Revision: 1204219

URL: http://svn.apache.org/viewvc?rev=1204219&view=rev
Log:
adding a property to be able to prevent openejb to create a jta datasource from 
the specified non jta one (useful for hibernate)

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

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1204219&r1=1204218&r2=1204219&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 Sun Nov 20 19:23:44 2011
@@ -101,6 +101,7 @@ public class AutoConfig implements Dynam
     public static Logger logger = 
Logger.getInstance(LogCategory.OPENEJB_STARTUP_CONFIG, AutoConfig.class);
 
     private static Set<String> ignoredReferenceTypes = new TreeSet<String>();
+    public static final String AUTOCREATE_JTA_DATASOURCE_FROM_NON_JTA_ONE_KEY 
= "openejb.autocreate.jta-datasource-from-non-jta-one";
 
     static{
         // Context objects are automatically handled
@@ -1446,7 +1447,9 @@ public class AutoConfig implements Dynam
             //  and finally setting JtaManaged=false
             //
 
-            if (nonJtaDataSourceId != null && jtaDataSourceId == null){
+            if (nonJtaDataSourceId != null && jtaDataSourceId == null
+                    // hibernate uses the fact that this ds is missing to get 
a non jta em instead of a JTA one
+                    && 
Boolean.parseBoolean(SystemInstance.get().getProperty(AUTOCREATE_JTA_DATASOURCE_FROM_NON_JTA_ONE_KEY)))
 {
 
                 ResourceInfo nonJtaResourceInfo = 
configFactory.getResourceInfo(nonJtaDataSourceId);