svn commit: r1399046 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java

[rmannibucau]

Author: rmannibucau
Date: Tue Oct 16 23:58:19 2012
New Revision: 1399046

URL: http://svn.apache.org/viewvc?rev=1399046&view=rev
Log:
simplifying a bit tomcat-jdbc mapping (avoid to reuse commons-dbcp attr)

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

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1399046&r1=1399045&r2=1399046&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 Tue Oct 16 23:58:19 2012
@@ -1009,7 +1009,7 @@ public class ConfigurationFactory implem
                 }
             }
 
-            final Properties props = new SuperProperties();
+            final Properties props = new 
SuperProperties().caseInsensitive(true);
 
             // weird hack but sometimes we don't want default values when we 
want null for instance
             if (serviceProperties == null || 
"false".equals(serviceProperties.getProperty(IGNORE_DEFAULT_VALUES_PROP, 
"false"))) {

Modified: 
openejb/trunk/openejb/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java?rev=1399046&r1=1399045&r2=1399046&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
 Tue Oct 16 23:58:19 2012
@@ -82,26 +82,32 @@ public class TomEEDataSourceCreator exte
 
     private void updateProperties(final SuperProperties properties, final 
Properties converted, final String driver) {
         // some compatibility with old dbcp style
-        if (driver != null) {
+        if (driver != null && !properties.containsKey("driverClassName")) {
             converted.setProperty("driverClassName", driver);
         }
-        if (properties.containsKey("JdbcDriver")) {
-            converted.setProperty("driverClassName", (String) 
properties.remove("JdbcDriver"));
-        }
-        if (properties.containsKey("JdbcUrl")) {
-            converted.setProperty("url", (String) 
properties.remove("JdbcUrl"));
-        }
-        if (properties.containsKey("user")) {
-            converted.setProperty("username", (String) 
properties.remove("user"));
-        }
-        if (properties.containsKey("maxWaitTime")) {
-            converted.setProperty("maxWait", toMillis((String) 
properties.remove("maxWaitTime")));
-        }
-        if (properties.containsKey("timeBetweenEvictionRuns")) {
-            converted.setProperty("timeBetweenEvictionRunsMillis", 
toMillis((String) properties.remove("timeBetweenEvictionRuns")));
-        }
-        if (properties.containsKey("minEvictableIdleTime")) {
-            converted.setProperty("minEvictableIdleTimeMillis", 
toMillis((String) properties.remove("minEvictableIdleTime")));
+        final String jdbcDriver = (String) properties.remove("JdbcDriver");
+        if (jdbcDriver != null && !properties.containsKey("driverClassName")) {
+            converted.setProperty("driverClassName", jdbcDriver);
+        }
+        final String url = (String) properties.remove("JdbcUrl");
+        if (url != null && !properties.containsKey("url")) {
+            converted.setProperty("url", url);
+        }
+        final String user = (String) properties.remove("user");
+        if (user != null && !properties.containsKey("username")) {
+            converted.setProperty("username", user);
+        }
+        final String maxWait = toMillis((String) 
properties.remove("maxWaitTime"));
+        if (properties.containsKey("maxWaitTime") && 
!properties.containsKey("maxWait")) {
+            converted.setProperty("maxWait", maxWait);
+        }
+        final String tb = toMillis((String) 
properties.remove("timeBetweenEvictionRuns"));
+        if (properties.containsKey("timeBetweenEvictionRuns") && 
!properties.containsKey("timeBetweenEvictionRunsMillis")) {
+            converted.setProperty("timeBetweenEvictionRunsMillis", tb);
+        }
+        final String minEvict = toMillis((String) 
properties.remove("minEvictableIdleTime"));
+        if (properties.containsKey("minEvictableIdleTime") && 
!properties.containsKey("minEvictableIdleTimeMillis")) {
+            converted.setProperty("minEvictableIdleTimeMillis", minEvict);
         }
         for (Map.Entry<Object, Object> entry : properties.entrySet()) {
             final String key = entry.getKey().toString();
@@ -141,6 +147,9 @@ public class TomEEDataSourceCreator exte
     }
 
     private String toMillis(final String d) {
+        if (d == null) {
+            return null;
+        }
         return Long.toString(new Duration(d).getTime(TimeUnit.MILLISECONDS));
     }