TUSCANY-3616 - Add code to check that that interface contracts a reference and reference binding and at service and service binding match. Motivated by BWS_2007. TO do this properly we have to test that the interfaces are described using the same IDL and if not convert to WSDL1.1 are required by the SCA specifications. There are a lot of changes here as doing this upset quite a few tests. Further work is required to look at the details of our WSDL generation process which looks a little suspect around wrapper namespaces.

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

2 files changed, 15 insertions, 1 deletions

diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index 69891225e7..25875dbd6a 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
@@ -29,5 +29,5 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContract;
  * @tuscany.spi.extension.asclient
  */
 public interface JavaInterfaceContract extends InterfaceContract {
-
+    
 }
diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index d43ebe558b..cb0d5f3b27 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tuscany.sca.interfacedef.java.impl;
 
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractImpl;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
 
@@ -28,6 +29,10 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
  */
 public class JavaInterfaceContractImpl extends InterfaceContractImpl implements JavaInterfaceContract {
     
+    // A cached WSDL version of the Java contract use during normalized
+    // interface comparison
+    private InterfaceContract normailizedWSDLInterfaceContract; 
+    
     protected JavaInterfaceContractImpl() {
     }
 
@@ -36,4 +41,13 @@ public class JavaInterfaceContractImpl extends InterfaceContractImpl implements
         return (JavaInterfaceContractImpl) super.clone();
     }
 
+    @Override
+    public InterfaceContract getNormalizedWSDLContract() {
+        return normailizedWSDLInterfaceContract;
+    }
+    
+    @Override
+    public void setNormailizedWSDLContract(InterfaceContract wsdlInterfaceContract) {
+        normailizedWSDLInterfaceContract = wsdlInterfaceContract;
+    }
 }