svn commit: r1403051 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ container/openejb-core/src/main/java/org/apache/openejb/config/ tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/

[rmannibucau]

Author: rmannibucau
Date: Sun Oct 28 17:39:16 2012
New Revision: 1403051

URL: http://svn.apache.org/viewvc?rev=1403051&view=rev
Log:
don't get url and jdbcurl in the same set of resource properties, don't 
override with definition

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.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/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1403051&r1=1403050&r2=1403051&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Sun Oct 28 17:39:16 2012
@@ -1692,7 +1692,13 @@ public class Assembler extends Assembler
                 final InputStream is = new 
ByteArrayInputStream(serviceInfo.properties.getProperty("Definition").getBytes());
                 final Properties p = new Properties();
                 IO.readProperties(is, p);
-                props.putAll(p);
+                for (Map.Entry<Object, Object> entry : p.entrySet()) {
+                    final String key = entry.getKey().toString();
+                    if (!props.containsKey(key) // never override from 
Definition, just use it to complete the properties set
+                            && !(key.equalsIgnoreCase("url") && 
props.containsKey("JdbcUrl"))) { // with @DataSource we can get both, see 
org.apache.openejb.config.ConvertDataSourceDefinitions.rawDefinition()
+                        props.put(key, entry.getValue());
+                    }
+                }
             } catch (Exception e) {
                 // ignored
             }

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java?rev=1403051&r1=1403050&r2=1403051&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java
 Sun Oct 28 17:39:16 2012
@@ -83,7 +83,7 @@ public class ConvertDataSourceDefinition
         put(p, "DatabaseName", datasource.getDatabaseName());
         put(p, "Description", datasource.getDescription());
         put(p, "ServerName", datasource.getServerName());
-        put(p, "Definition", rawDefinition(datasource));
+        put(p, "Definition", rawDefinition(datasource)); // do we need it??
         put(p, AutoConfig.ORIGIN_FLAG, AutoConfig.ORIGIN_ANNOTATION);
         setProperties(datasource, p);
 

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=1403051&r1=1403050&r2=1403051&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
 Sun Oct 28 17:39:16 2012
@@ -202,8 +202,8 @@ public class TomEEDataSourceCreator exte
             try { // just to force the pool to be created and be able to 
register the mbean
                 createPool();
                 initJmx(name);
-            } catch (Throwable ignored) {
-                ignored.printStackTrace();
+            } catch (Throwable e) {
+                LOGGER.error("Can't create DataSource", e);
             }
         }