svn commit: r1368376 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java

[rmannibucau]

Author: rmannibucau
Date: Thu Aug  2 08:01:06 2012
New Revision: 1368376

URL: http://svn.apache.org/viewvc?rev=1368376&view=rev
Log:
removing transactional property to use it as a replacement of JtaManaged

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java?rev=1368376&r1=1368375&r2=1368376&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
 Thu Aug  2 08:01:06 2012
@@ -49,7 +49,7 @@ public class DataSourceFactory {
         put("bonecp", "org.apache.openejb.bonecp.BoneCPDataSourceCreator"); // 
bonecp
     }};
 
-    public static DataSource create(final String name, final boolean managed, 
final Class impl, final String definition) throws IllegalAccessException, 
InstantiationException, IOException {
+    public static DataSource create(final String name, final boolean 
configuredManaged, final Class impl, final String definition) throws 
IllegalAccessException, InstantiationException, IOException {
         final Properties properties = asProperties(definition);
 
         // these can be added and are managed by OpenEJB and not the 
DataSource itself
@@ -57,6 +57,11 @@ public class DataSourceFactory {
         properties.remove("JtaManaged");
         properties.remove("ServiceId");
 
+        boolean managed = configuredManaged;
+        if (properties.containsKey("transactional")) {
+            managed = Boolean.parseBoolean((String) 
properties.remove("transactional")) || managed;
+        }
+
         final DataSourceCreator creator = 
creator(properties.remove(DATA_SOURCE_CREATOR_PROP));