svn commit: r686681 - in /tuscany/java/sca/modules: implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/ implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/

[jsdelfino]

Author: jsdelfino
Date: Sun Aug 17 23:33:50 2008
New Revision: 686681

URL: http://svn.apache.org/viewvc?rev=686681&view=rev
Log:
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.

Modified:
    
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
    
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java

Modified: 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java?rev=686681&r1=686680&r2=686681&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
 (original)
+++ 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
 Sun Aug 17 23:33:50 2008
@@ -25,6 +25,9 @@
 
 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 @@
         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) {

Modified: 
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java?rev=686681&r1=686680&r2=686681&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
 Sun Aug 17 23:33:50 2008
@@ -367,7 +367,6 @@
             // 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 @@
             // 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 @@
             // 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 @@
             // information from the
             // sidefile
             for (Service svc : impl.getServices()) {
-                
svc.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
                 serviceMap.put(svc.getName(), svc);
             } // end for