From 47f6879e357c5f878e3e43164e243cd41e056df0 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 13 Jul 2010 09:12:08 +0000
Subject: 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
---
 .../tuscany/sca/binding/ws/axis2/CustomerProfileData.java      | 10 ++++++++++
 .../org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd   |  2 +-
 .../tuscany/sca/binding/ws/axis2/questionmark-include.wsdl     |  6 +-----
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'sca-java-2.x/trunk/itest/ws/wsdl/src')

diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
index 2574788dfa..6f6a374450 100644
--- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
+++ b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
@@ -33,6 +33,16 @@ public class CustomerProfileData {
     private String loginID;
     private String password;
     private int id;
+    
+    public CustomerProfileData() {
+        firstName = "John";
+        lastName = "Doe";
+        address = "345 Main Street";
+        email = "john@doe.org";
+        this.loginID = "DefaultloginID";
+        password = "hello";
+        id = 1234;
+    }
 
     public CustomerProfileData(String loginID) {
         firstName = "John";
diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
index 421d5d6166..2479f3dbe5 100644
--- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
+++ b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
@@ -21,7 +21,7 @@
             targetNamespace="http://accounts"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
-    <xsd:complexType name="CustomerProfileData">
+    <xsd:complexType name="customerProfileData">
         <xsd:sequence>
             <xsd:element name="firstName" type="xsd:string" />
             <xsd:element name="lastName" type="xsd:string" />
diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
index 4b6f982c26..7a7a4033ce 100644
--- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
+++ b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
@@ -44,11 +44,7 @@
                 <xsd:complexType>
                     <xsd:sequence>
                         <xsd:element name="customerProfile"
-                            type="xsd:string" />
-                        <!--
-                        <xsd:element name="customerProfile"
-                            type="account:CustomerProfileData" />
-                        -->
+                            type="account:customerProfileData" />
                     </xsd:sequence>
                 </xsd:complexType>
             </xsd:element>
-- 
cgit v1.2.3