Moved databinding setting to DOM from implementation-bpel to implementation-bpel-ode as it's really a runtime specific requirement to use DOM, here an ODE requirement. That's also what other implementation extensions do, they set the databinding in the runtime module instead of the model module.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@686681 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 13 insertions, 4 deletions

diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
index 7086e1bc2f..b67d6755c3 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
@@ -25,6 +25,9 @@ import javax.transaction.TransactionManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.databinding.xml.DOMDataBinding;
 import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
 import org.apache.tuscany.sca.implementation.bpel.ode.EmbeddedODEServer;
 import org.apache.tuscany.sca.implementation.bpel.ode.ODEDeployment;
@@ -60,6 +63,16 @@ public class BPELImplementationProvider implements ImplementationProvider {
         this.implementation = implementation;
         this.odeServer = odeServer;
         this.txMgr = txMgr;
+        
+        // Configure the service and reference interfaces to use a DOM databinding
+        // as it's what ODE expects
+        for (Service service: implementation.getServices()) {
+            service.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
+        }
+        for (Reference reference: implementation.getReferences()) {
+            reference.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
+        }
+        
     }
 
     public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
diff --git a/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
index c822eade1e..e12d3568d6 100644
--- a/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
+++ b/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
@@ -367,7 +367,6 @@ public class BPELImplementationProcessor extends BaseStAXArtifactProcessor imple
             // References...
             Map<String, Reference> refMap = new HashMap<String, Reference>();
             for (Reference reference : componentType.getReferences()) {
-                reference.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
                 refMap.put(reference.getName(), reference);
             } // end for
 
@@ -380,7 +379,6 @@ public class BPELImplementationProcessor extends BaseStAXArtifactProcessor imple
             // information from the
             // sidefile
             for (Reference ref : impl.getReferences()) {
-                ref.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
                 refMap.put(ref.getName(), ref);
             } // end for
 
@@ -390,7 +388,6 @@ public class BPELImplementationProcessor extends BaseStAXArtifactProcessor imple
             // Services.....
             Map<String, Service> serviceMap = new HashMap<String, Service>();
             for (Service service : componentType.getServices()) {
-                service.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
                 serviceMap.put(service.getName(), service);
             } // end for
 
@@ -403,7 +400,6 @@ public class BPELImplementationProcessor extends BaseStAXArtifactProcessor imple
             // information from the
             // sidefile
             for (Service svc : impl.getServices()) {
-                svc.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
                 serviceMap.put(svc.getName(), svc);
             } // end for