Add missing files and fix host names

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

9 files changed, 424 insertions, 3 deletions

diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/anotherpackage/BBean.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/anotherpackage/BBean.java
new file mode 100644
index 0000000000..f9578a5f92
--- /dev/null
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/anotherpackage/BBean.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package anotherpackage;
+
+public class BBean {
+    
+    protected String field1;
+    protected String field2;
+
+    public String getField1() {
+        return field1;
+    }
+    
+    public void setField1(String field1) {
+        this.field1 = field1;
+    }
+    
+    public String getField2() {
+        return field2;
+    }
+    
+    public void setField2(String field2) {
+        this.field2 = field2;
+    }
+}
+
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/anotherpackage/CBean.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/anotherpackage/CBean.java
new file mode 100644
index 0000000000..b1b3801210
--- /dev/null
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/anotherpackage/CBean.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package anotherpackage;
+
+import javax.xml.bind.annotation.XmlType;
+
+@XmlType(name="")
+public class CBean {
+    
+    protected String field1;
+    protected String field2;
+
+    public String getField1() {
+        return field1;
+    }
+    
+    public void setField1(String field1) {
+        this.field1 = field1;
+    }
+    
+    public String getField2() {
+        return field2;
+    }
+    
+    public void setField2(String field2) {
+        this.field2 = field2;
+    }
+}
+
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java
new file mode 100644
index 0000000000..cee893d678
--- /dev/null
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package yetanotherpackage;
+
+import anotherpackage.BBean;
+
+public class DBean {
+    
+    protected String field1;
+    protected String field2;
+    protected BBean field3;
+
+    public String getField1() {
+        return field1;
+    }
+    
+    public void setField1(String field1) {
+        this.field1 = field1;
+    }
+    
+    public String getField2() {
+        return field2;
+    }
+    
+    public void setField2(String field2) {
+        this.field2 = field2;
+    }
+    
+    public BBean getField3() {
+        return field3;
+    }
+    
+    public void setField3(BBean field3) {
+        this.field3 = field3;
+    }
+}
+
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite
index 12d98d3453..3bd84f34d9 100644
--- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite
@@ -29,14 +29,14 @@
             <binding.sca/>
         </service>
         <reference name="hwService">
-            <binding.ws uri="http://L3AW203:8085/HelloWorldServiceComponent1"/>
+            <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent1"/>
         </reference>
     </component>    
 
     <component name="HelloWorldServiceComponent1">
         <implementation.java class="helloworld.HelloWorldImpl" />
 	    <service name="HelloWorldService">
-            <binding.ws uri="http://L3AW203:8085/HelloWorldServiceComponent1"/>
+            <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent1"/>
         </service>
     </component>
     
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl
index 6c6d8c6637..185aa2c649 100644
--- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl
@@ -337,7 +337,7 @@
 				location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:51293" />
 		</wsdl:port>
 		<wsdl:port name="HelloWorldServicePort" binding="HelloWorldServiceBinding">
-			<SOAP:address location="http://l3aw203:8085/HelloWorldServiceComponent1" />
+			<SOAP:address location="http://localhost:8085/HelloWorldServiceComponent1" />
 		</wsdl:port>
 	</wsdl:service>
 </wsdl:definitions>    
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl
new file mode 100644
index 0000000000..5fa0d565b1
--- /dev/null
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://helloworld/" name="HelloWorldImplService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <types>
+    <xsd:schema>
+      <xsd:import namespace="http://test" schemaLocation="HelloWorldImplService_schema1.xsd"/>
+    </xsd:schema>
+    <xsd:schema>
+      <xsd:import namespace="http://helloworld/" schemaLocation="HelloWorldImplService_schema2.xsd"/>
+    </xsd:schema>
+  </types>
+  <message name="getGreetings">
+    <part name="parameters" element="tns:getGreetings"/>
+  </message>
+  <message name="getGreetingsResponse">
+    <part name="parameters" element="tns:getGreetingsResponse"/>
+  </message>
+  <message name="getGreetingsBean">
+    <part name="parameters" element="tns:getGreetingsBean"/>
+  </message>
+  <message name="getGreetingsBeanResponse">
+    <part name="parameters" element="tns:getGreetingsBeanResponse"/>
+  </message>
+  <message name="getGreetingsBeanArray">
+    <part name="parameters" element="tns:getGreetingsBeanArray"/>
+  </message>
+  <message name="getGreetingsBeanArrayResponse">
+    <part name="parameters" element="tns:getGreetingsBeanArrayResponse"/>
+  </message>
+  <message name="getGreetingsBBean">
+    <part name="parameters" element="tns:getGreetingsBBean"/>
+  </message>
+  <message name="getGreetingsBBeanResponse">
+    <part name="parameters" element="tns:getGreetingsBBeanResponse"/>
+  </message>
+  <message name="getGreetingsCBean">
+    <part name="parameters" element="tns:getGreetingsCBean"/>
+  </message>
+  <message name="getGreetingsCBeanResponse">
+    <part name="parameters" element="tns:getGreetingsCBeanResponse"/>
+  </message>
+  <message name="getGreetingsDBean">
+    <part name="parameters" element="tns:getGreetingsDBean"/>
+  </message>
+  <message name="getGreetingsDBeanResponse">
+    <part name="parameters" element="tns:getGreetingsDBeanResponse"/>
+  </message>
+  <portType name="HelloWorldService">
+    <operation name="getGreetings">
+      <input message="tns:getGreetings"/>
+      <output message="tns:getGreetingsResponse"/>
+    </operation>
+    <operation name="getGreetingsBean">
+      <input message="tns:getGreetingsBean"/>
+      <output message="tns:getGreetingsBeanResponse"/>
+    </operation>
+    <operation name="getGreetingsBeanArray">
+      <input message="tns:getGreetingsBeanArray"/>
+      <output message="tns:getGreetingsBeanArrayResponse"/>
+    </operation>
+    <operation name="getGreetingsBBean">
+      <input message="tns:getGreetingsBBean"/>
+      <output message="tns:getGreetingsBBeanResponse"/>
+    </operation>
+    <operation name="getGreetingsCBean">
+      <input message="tns:getGreetingsCBean"/>
+      <output message="tns:getGreetingsCBeanResponse"/>
+    </operation>
+    <operation name="getGreetingsDBean">
+      <input message="tns:getGreetingsDBean"/>
+      <output message="tns:getGreetingsDBeanResponse"/>
+    </operation>
+  </portType>
+  <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldService">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="getGreetings">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getGreetingsBean">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getGreetingsBeanArray">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getGreetingsBBean">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getGreetingsCBean">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getGreetingsDBean">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="HelloWorldImplService">
+    <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding">
+      <soap:address location="http://localhost:8085/HelloWorldServiceComponent1"/>
+    </port>
+  </service>
+</definitions>
+
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd
new file mode 100644
index 0000000000..70de7a05ae
--- /dev/null
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://test" xmlns:ns1="http://helloworld/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:import namespace="http://helloworld/" schemaLocation="HelloWorldImplService_schema2.xsd"/>
+
+  <xs:complexType name="aBean">
+    <xs:sequence>
+      <xs:element name="field1" type="xs:string" minOccurs="0"/>
+      <xs:element name="field2" type="xs:string" minOccurs="0"/>
+      <xs:element name="field3" type="ns1:bBean" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
+
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd
new file mode 100644
index 0000000000..446492c371
--- /dev/null
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://helloworld/" xmlns:ns1="http://test" xmlns:tns="http://helloworld/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:import namespace="http://test" schemaLocation="HelloWorldImplService_schema1.xsd"/>
+
+  <xs:element name="getGreetings" type="tns:getGreetings"/>
+
+  <xs:element name="getGreetingsBBean" type="tns:getGreetingsBBean"/>
+
+  <xs:element name="getGreetingsBBeanResponse" type="tns:getGreetingsBBeanResponse"/>
+
+  <xs:element name="getGreetingsBean" type="tns:getGreetingsBean"/>
+
+  <xs:element name="getGreetingsBeanArray" type="tns:getGreetingsBeanArray"/>
+
+  <xs:element name="getGreetingsBeanArrayResponse" type="tns:getGreetingsBeanArrayResponse"/>
+
+  <xs:element name="getGreetingsBeanResponse" type="tns:getGreetingsBeanResponse"/>
+
+  <xs:element name="getGreetingsCBean" type="tns:getGreetingsCBean"/>
+
+  <xs:element name="getGreetingsCBeanResponse" type="tns:getGreetingsCBeanResponse"/>
+
+  <xs:element name="getGreetingsDBean" type="tns:getGreetingsDBean"/>
+
+  <xs:element name="getGreetingsDBeanResponse" type="tns:getGreetingsDBeanResponse"/>
+
+  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
+
+  <xs:complexType name="getGreetingsBeanArray">
+    <xs:sequence>
+      <xs:element name="arg0" type="ns1:aBean" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="bBean">
+    <xs:sequence>
+      <xs:element name="field1" type="xs:string" minOccurs="0"/>
+      <xs:element name="field2" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsBeanArrayResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsBBean">
+    <xs:sequence>
+      <xs:element name="arg0" type="tns:bBean" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsBBeanResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsCBean">
+    <xs:sequence>
+      <xs:element name="arg0" minOccurs="0">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="field1" type="xs:string" minOccurs="0"/>
+            <xs:element name="field2" type="xs:string" minOccurs="0"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsCBeanResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsBean">
+    <xs:sequence>
+      <xs:element name="arg0" type="ns1:aBean" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsBeanResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsDBean">
+    <xs:sequence>
+      <xs:element name="arg0" type="tns:dBean" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="dBean">
+    <xs:sequence>
+      <xs:element name="field1" type="xs:string" minOccurs="0"/>
+      <xs:element name="field2" type="xs:string" minOccurs="0"/>
+      <xs:element name="field3" type="tns:bBean" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsDBeanResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetings">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
+
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/README b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/README
new file mode 100644
index 0000000000..f0092fbfb1
--- /dev/null
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/resources/wsdl/README
@@ -0,0 +1,6 @@
+These are files generated by JAXWS wsgen. The maven pom.xml is configured to generate
+them to target/jaxws/wsgen/wsdl. These files are copied manually from there to here
+and the .wsdl file is hand edited to 
+
+1/ add the right service port location
+2/ change the port type name to HelloWorldService