svn commit: r601508 - in /incubator/tuscany/java/sca: itest/ modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/

[rfeng]

Author: rfeng
Date: Wed Dec  5 12:33:18 2007
New Revision: 601508

URL: http://svn.apache.org/viewvc?rev=601508&view=rev
Log:
Make sure the componentType is used for interface contract databinding handling

Modified:
    incubator/tuscany/java/sca/itest/pom.xml
    
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
    
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java

Modified: incubator/tuscany/java/sca/itest/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=601508&r1=601507&r2=601508&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Wed Dec  5 12:33:18 2007
@@ -81,6 +81,8 @@
                 <module>wsdlless</module>
                 <module>wsdl2java</module>
                 <module>ws-void-args-return</module>
+                <module>transaction</module>
+                <module>bpel</module>
             </modules>
         </profile>
 

Modified: 
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java?rev=601508&r1=601507&r2=601508&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
 Wed Dec  5 12:33:18 2007
@@ -304,7 +304,11 @@
         if (isTargetRemote()) {
             return getDistributedProvider().getBindingInterfaceContract();
         } else {
-            return reference.getInterfaceContract();
+            if (reference.getReference() != null) {
+                return reference.getReference().getInterfaceContract();
+            } else {
+                return reference.getInterfaceContract();
+            }
         }
     }
 

Modified: 
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java?rev=601508&r1=601507&r2=601508&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
 Wed Dec  5 12:33:18 2007
@@ -26,7 +26,6 @@
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.provider.BindingProviderFactory;
 import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -113,10 +112,14 @@
     }
 
     public InterfaceContract getBindingInterfaceContract() {
-        if (distributedProvider != null){
+        if (distributedProvider != null) {
             return distributedProvider.getBindingInterfaceContract();
         } else {
-            return service.getInterfaceContract();
+            if (service.getService() != null) {
+                return service.getService().getInterfaceContract();
+            } else {
+                return service.getInterfaceContract();
+            }
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]