svn commit: r661531 - in /ode/trunk: bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/ bpel-store/src/main/java/org/apache/ode/store/hib/ dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/

[mriou]

Author: mriou
Date: Thu May 29 16:42:46 2008
New Revision: 661531

URL: http://svn.apache.org/viewvc?rev=661531&view=rev
Log:
Stops copying namespace attributes in assign, it just increases confusion.

Modified:
    
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
    
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
    
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java

Modified: 
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java?rev=661531&r1=661530&r2=661531&view=diff
==============================================================================
--- 
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
 (original)
+++ 
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
 Thu May 29 16:42:46 2008
@@ -154,7 +154,7 @@
         Expression exp = new Expression(e);
         return (OXPath20ExpressionBPEL20)_compiler.compileLValue(exp);
     }
-    @Override
+    
     public URI getBaseResourceURI() {
        return null;
     }

Modified: 
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java?rev=661531&r1=661530&r2=661531&view=diff
==============================================================================
--- 
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 (original)
+++ 
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 Thu May 29 16:42:46 2008
@@ -82,7 +82,10 @@
         _ds = ds;
 
         // Don't want to pollute original properties
-        Properties properties = new Properties(initialProps);
+        Properties properties = new Properties();
+        for (Object prop : initialProps.keySet()) {
+            properties.put(prop, initialProps.get(prop));
+        }
 
         __log.debug("using data source: " + ds);
         _dataSources.put(_guid, ds);

Modified: 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java?rev=661531&r1=661530&r2=661531&view=diff
==============================================================================
--- 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
 (original)
+++ 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
 Thu May 29 16:42:46 2008
@@ -84,6 +84,9 @@
         if (initialProps == null) initialProps = new Properties();
         // Don't want to pollute original properties
         Properties properties = new Properties(initialProps);
+        for (Object prop : initialProps.keySet()) {
+            properties.put(prop, initialProps.get(prop));
+        }
 
         // Note that we don't allow the following properties to be overriden by
         // the client.