Re-org to more clearly separate out the different parts of the test and to identify the launcher with a dependency on the binding.ws ri implementation

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

4 files changed, 141 insertions, 23 deletions

diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/pom.xml
index b903aa7661..b613a4ad3b 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/java-first-contribution/pom.xml
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/pom.xml
@@ -26,28 +26,32 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>itest-ws-jaxws-java-first-contribution</artifactId>
-    <name>Apache Tuscany SCA iTest WS JAXWS Java First Contribution</name>
+    <artifactId>itest-ws-jaxws-external-client</artifactId>
+    <name>Apache Tuscany SCA iTest WS JAXWS External Client</name>
 
     <dependencies>
-        
+
+        <!-- Core distribution -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
-       <dependency>
+
+        <!-- Bindings -->
+        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-ws-jaxws-common-contribution</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>        
+        </dependency>
+
                 
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+        <finalName>${artifactId}</finalName>
+        
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -89,28 +93,30 @@
                 </dependencies>
                 <executions>
                     <execution>
-                        <id>wsimport2</id>
+                        <id>wsimport1</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.jaxws</packageName>
-                            <wsdlDirectory>${basedir}/../java-first-contribution/target/classes</wsdlDirectory>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.sca</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
                             <wsdlFiles>
-                                <wsdlFile>helloworld-external.wsdl</wsdlFile>
+                                <wsdlFile>HelloWorldImplService.wsdl</wsdlFile>
                             </wsdlFiles>
-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport2StaleFlag</staleFile>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
                         </configuration>
-                    </execution>                                      
+                    </execution>                                    
                 </executions>
                 <configuration>
                     <target>2.1</target>
                     <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
                     <verbose>true</verbose>
                     <xnocompile>true</xnocompile>
                 </configuration>
             </plugin>                     
         </plugins>
     </build>
+    
 </project>
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/HelloWorldClientLauncher.java b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
index 5c76c0f876..e8574d67e9 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/test-launcher/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/HelloWorldClientLauncher.java
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.binding.ws.jaxws.external;
+package org.apache.tuscany.sca.binding.ws.jaxws.external.client;
 
 import java.io.File;
 import java.net.URL;
@@ -25,20 +25,23 @@ import java.net.URL;
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.HelloWorld;
+import org.apache.tuscany.sca.binding.ws.jaxws.sca.HelloWorldImpl;
 
 public class HelloWorldClientLauncher {
     
     public static void main(String[] args) throws Exception {
-        System.out.println("Entering external JAXWS client ");
+        System.out.println(">>> Starting external JAXWS client ");
                 
         // default JVM JAXWS support
-        QName serviceName = new QName("http://helloworld", "HelloWorldService");
-        QName portName = new QName("http://helloworld", "HelloWorldSoapPort");
-        URL wsdlLocation = new File("../java-first-contribution/target/classes/helloworld-sca.wsdl").toURL();
-        javax.xml.ws.Service webService = Service.create( wsdlLocation, serviceName );
-        HelloWorld wsProxy = (HelloWorld) webService.getPort(portName, HelloWorld.class);
+        QName serviceName = new QName("http://jaxws.ws.binding.sca.tuscany.apache.org/", "HelloWorldImplService");
+        QName portName = new QName("http://jaxws.ws.binding.sca.tuscany.apache.org/", "HelloWorldImplPort");
+        //URL wsdlLocation = new File("../external-client/target/classes/helloworld-sca.wsdl").toURL();
+        URL wsdlLocation = new File("../external-client/target/classes/HelloWorldImplService.wsdl").toURL();
+        javax.xml.ws.Service webService = Service.create(wsdlLocation, serviceName);
+        HelloWorldImpl wsProxy = (HelloWorldImpl) webService.getPort(portName, HelloWorldImpl.class);
         
-        System.out.println("Leaving external JAXWS client: " + wsProxy.getGreetings("Fred"));
+        String response = wsProxy.getGreetings("Fred");
+        
+        System.out.println("Leaving external JAXWS client: " + response);
     }
 }
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
new file mode 100644
index 0000000000..8ae67d4270
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
@@ -0,0 +1,58 @@
+<?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.7-b01-. -->
+<definitions targetNamespace="http://jaxws.ws.binding.sca.tuscany.apache.org/" name="HelloWorldImplService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://jaxws.ws.binding.sca.tuscany.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <types>
+    <xsd:schema>
+      <xsd:import namespace="http://jaxws.ws.binding.sca.tuscany.apache.org/" schemaLocation="HelloWorldImplService_schema1.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="getGreetingsComplex">
+    <part name="parameters" element="tns:getGreetingsComplex"/>
+  </message>
+  <message name="getGreetingsComplexResponse">
+    <part name="parameters" element="tns:getGreetingsComplexResponse"/>
+  </message>
+  <portType name="HelloWorldImpl">
+    <operation name="getGreetings">
+      <input message="tns:getGreetings"/>
+      <output message="tns:getGreetingsResponse"/>
+    </operation>
+    <operation name="getGreetingsComplex">
+      <input message="tns:getGreetingsComplex"/>
+      <output message="tns:getGreetingsComplexResponse"/>
+    </operation>
+  </portType>
+  <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">
+    <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="getGreetingsComplex">
+      <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/HelloWorldService/HelloWorld"/>
+    </port>
+  </service>
+</definitions>
+
diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
new file mode 100644
index 0000000000..00d526db82
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://jaxws.ws.binding.sca.tuscany.apache.org/" xmlns:tns="http://jaxws.ws.binding.sca.tuscany.apache.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:element name="getGreetings" type="tns:getGreetings"/>
+
+  <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
+
+  <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
+
+  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
+
+  <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:complexType name="getGreetingsComplex">
+    <xs:sequence>
+      <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="foo">
+    <xs:sequence>
+      <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="bar">
+    <xs:sequence>
+      <xs:element name="b" type="xs:boolean" minOccurs="0"/>
+      <xs:element name="s" type="xs:string" minOccurs="0"/>
+      <xs:element name="x" type="xs:int"/>
+      <xs:element name="y" type="xs:int" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsComplexResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:foo" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
+