Add exceptions to the test and make the launchers a bit more generic

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

3 files changed, 85 insertions, 7 deletions

diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/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 e8574d67e9..da40a7f442 100644
--- a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/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
@@ -25,23 +25,49 @@ import java.net.URL;
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
+import org.apache.tuscany.sca.binding.ws.jaxws.sca.Exception_Exception;
 import org.apache.tuscany.sca.binding.ws.jaxws.sca.HelloWorldImpl;
 
 public class HelloWorldClientLauncher {
     
-    public static void main(String[] args) throws Exception {
+    public HelloWorldImpl wsProxy;
+    
+    public HelloWorldClientLauncher(){
+    }
+    
+    public void createClient() throws Exception{
         System.out.println(">>> Starting external JAXWS client ");
-                
+        
         // default JVM JAXWS support
         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);
-        
-        String response = wsProxy.getGreetings("Fred");
-        
-        System.out.println("Leaving external JAXWS client: " + response);
+        wsProxy = (HelloWorldImpl) webService.getPort(portName, HelloWorldImpl.class);
+    }
+    
+    public void destroyClient(){
+        System.out.println(">>> Stopping external JAXWS client: ");
+        // TODO 
+    }
+    
+    public String getGreetings(String name){
+        System.out.println("Entering External Client HelloWorld.getGreetings: " + name);
+        String response = wsProxy.getGreetings(name);
+        System.out.println("Leaving External Client HelloWorld.getGreetings: " + response);
+        return response;
+    }
+    
+    public String getGreetingsException(String name) throws Exception_Exception {
+        return wsProxy.getGreetingsException(name);
+    }    
+    
+    public static void main(String[] args) throws Exception {
+        HelloWorldClientLauncher launcher = new HelloWorldClientLauncher();
+        launcher.createClient();
+        launcher.getGreetings("Fred");
+        launcher.destroyClient();
     }
+    
 }
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
index 8ae67d4270..0d9d17d1be 100644
--- 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
@@ -12,6 +12,15 @@
   <message name="getGreetingsResponse">
     <part name="parameters" element="tns:getGreetingsResponse"/>
   </message>
+  <message name="getGreetingsException">
+    <part name="parameters" element="tns:getGreetingsException"/>
+  </message>
+  <message name="getGreetingsExceptionResponse">
+    <part name="parameters" element="tns:getGreetingsExceptionResponse"/>
+  </message>
+  <message name="Exception">
+    <part name="fault" element="tns:Exception"/>
+  </message>
   <message name="getGreetingsComplex">
     <part name="parameters" element="tns:getGreetingsComplex"/>
   </message>
@@ -23,6 +32,11 @@
       <input message="tns:getGreetings"/>
       <output message="tns:getGreetingsResponse"/>
     </operation>
+    <operation name="getGreetingsException">
+      <input message="tns:getGreetingsException"/>
+      <output message="tns:getGreetingsExceptionResponse"/>
+      <fault message="tns:Exception" name="Exception"/>
+    </operation>
     <operation name="getGreetingsComplex">
       <input message="tns:getGreetingsComplex"/>
       <output message="tns:getGreetingsComplexResponse"/>
@@ -39,6 +53,18 @@
         <soap:body use="literal"/>
       </output>
     </operation>
+    <operation name="getGreetingsException">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="Exception">
+        <soap:fault name="Exception" use="literal"/>
+      </fault>
+    </operation>
     <operation name="getGreetingsComplex">
       <soap:operation soapAction=""/>
       <input>
@@ -56,3 +82,5 @@
   </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
index 00d526db82..eef9ad4ead 100644
--- 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
@@ -1,14 +1,38 @@
 <?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="Exception" type="tns:Exception"/>
+
   <xs:element name="getGreetings" type="tns:getGreetings"/>
 
   <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
 
   <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
 
+  <xs:element name="getGreetingsException" type="tns:getGreetingsException"/>
+
+  <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/>
+
   <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
 
+  <xs:complexType name="getGreetingsException">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsExceptionResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="Exception">
+    <xs:sequence>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getGreetings">
     <xs:sequence>
       <xs:element name="arg0" type="xs:string" minOccurs="0"/>