TUSCANY-3625 - extend the test to demonstrate what happens when a WSDL is provided where an operation name has an upper case first character.

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

6 files changed, 89 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..c9c1038ea3 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
@@ -19,6 +19,8 @@
 

 package org.apache.tuscany.sca.binding.ws;

 

+import javax.jws.WebMethod;

+

 import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;

 import org.oasisopen.sca.ServiceRuntimeException;

 import org.oasisopen.sca.annotation.Remotable;

@@ -29,4 +31,7 @@ public interface HelloWorld {
     String getGreetings(String s);

     String getGreetingsException(String s) throws ServiceRuntimeException;

     Foo getGreetingsComplex(Foo foo);

+    

+    @WebMethod(operationName = "GetGreetingsCaps")

+    String getGreetingsCaps(String s);

 }

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index b279e7f648..d88a765682 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
@@ -19,8 +19,8 @@
 

 package org.apache.tuscany.sca.binding.ws;

 

-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;

 import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;

+import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;

 import org.oasisopen.sca.ServiceRuntimeException;

 import org.oasisopen.sca.annotation.Reference;

 

@@ -49,5 +49,12 @@ public class HelloWorldImpl implements HelloWorld {
         System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());

         return response;

     } 

+    

+    public String getGreetingsCaps(String s) {

+        System.out.println("Entering SCA HelloWorld.getGreetingsCaps: " + s);

+        String response = helloWorldExternal.getGreetingsCaps(s);

+        System.out.println("Leaving SCA HelloWorld.getGreetingsCaps: " + response);

+        return response;

+    }

    

 }

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
index f3e9083cec..59fce9d849 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
+++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
@@ -50,6 +50,12 @@
   <message name="getGreetingsComplexResponse">

     <part name="parameters" element="tns:getGreetingsComplexResponse"/>

   </message>

+  <message name="GetGreetingsCaps">

+    <part name="parameters" element="tns:GetGreetingsCaps"/>

+  </message>

+  <message name="GetGreetingsCapsResponse">

+    <part name="parameters" element="tns:GetGreetingsCapsResponse"/>

+  </message>   

   <portType name="HelloWorldImpl">

     <operation name="getGreetings">

       <input message="tns:getGreetings"/>

@@ -64,6 +70,10 @@
       <input message="tns:getGreetingsComplex"/>

       <output message="tns:getGreetingsComplexResponse"/>

     </operation>

+    <operation name="GetGreetingsCaps">

+      <input message="tns:GetGreetingsCaps"/>

+      <output message="tns:GetGreetingsCapsResponse"/>

+    </operation>       

   </portType>

   <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">

     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>

@@ -97,6 +107,15 @@
         <soap:body use="literal"/>

       </output>

     </operation>

+    <operation name="GetGreetingsCaps">

+      <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">

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
index aee1febea7..2d8adf3d73 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
+++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
@@ -37,6 +37,10 @@
   <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/>

 

   <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>

+  

+  <xs:element name="GetGreetingsCaps" type="tns:GetGreetingsCaps"/>

+

+  <xs:element name="GetGreetingsCapsResponse" type="tns:GetGreetingsCapsResponse"/>    

 

   <xs:complexType name="getGreetingsException">

     <xs:sequence>

@@ -79,5 +83,17 @@
       <xs:element name="return" type="tns2:foo" minOccurs="0"/>

     </xs:sequence>

   </xs:complexType>

+  

+  <xs:complexType name="GetGreetingsCaps">

+    <xs:sequence>

+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>

+    </xs:sequence>

+  </xs:complexType>

+

+  <xs:complexType name="GetGreetingsCapsResponse">

+    <xs:sequence>

+      <xs:element name="return" type="xs:string" minOccurs="0"/>

+    </xs:sequence>

+  </xs:complexType>    

 </xs:schema>

 

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..467eeb90c5 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
@@ -20,12 +20,16 @@
 <xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">

 

   <xs:element name="getGreetings" type="tns:getGreetings"/>

+  

+  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>  

 

   <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>

 

   <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>

 

-  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>

+  <xs:element name="GetGreetingsCaps" type="tns:GetGreetingsCaps"/>

+

+  <xs:element name="GetGreetingsCapsResponse" type="tns:GetGreetingsCapsResponse"/>  

 

   <xs:complexType name="getGreetings">

     <xs:sequence>

@@ -65,6 +69,18 @@
       <xs:element name="return" type="tns:foo" minOccurs="0"/>

     </xs:sequence>

   </xs:complexType>

+  

+  <xs:complexType name="GetGreetingsCaps">

+    <xs:sequence>

+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>

+    </xs:sequence>

+  </xs:complexType>

+

+  <xs:complexType name="GetGreetingsCapsResponse">

+    <xs:sequence>

+      <xs:element name="return" type="xs:string" minOccurs="0"/>

+    </xs:sequence>

+  </xs:complexType>  

 </xs:schema>

 

 

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
index 0f83f1fc08..c38f629e4f 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
@@ -36,6 +36,12 @@
   <message name="getGreetingsComplexResponse">

     <part name="parameters" element="tns:getGreetingsComplexResponse"/>

   </message>

+  <message name="GetGreetingsCaps">

+    <part name="parameters" element="tns:GetGreetingsCaps"/>

+  </message>

+  <message name="GetGreetingsCapsResponse">

+    <part name="parameters" element="tns:GetGreetingsCapsResponse"/>

+  </message>  

   <portType name="HelloWorldService">

     <operation name="getGreetings">

       <input message="tns:getGreetings"/>

@@ -45,6 +51,10 @@
       <input message="tns:getGreetingsComplex"/>

       <output message="tns:getGreetingsComplexResponse"/>

     </operation>

+    <operation name="GetGreetingsCaps">

+      <input message="tns:GetGreetingsCaps"/>

+      <output message="tns:GetGreetingsCapsResponse"/>

+    </operation>    

   </portType>

   <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">

     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>

@@ -66,10 +76,24 @@
         <soap:body use="literal"/>

       </output>

     </operation>

+    <operation name="GetGreetingsCaps">

+      <soap:operation soapAction=""/>

+      <input>

+        <soap:body use="literal"/>

+      </input>

+      <output>

+        <soap:body use="literal"/>

+      </output>

+    </operation>    

   </binding>

   <service name="HelloWorldServiceService">

     <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">

       <soap:address location="http://localhost:8086/External/HelloWorld"/>

     </port>

+  </service>    

+  <service name="HelloWorldImplService">    

+    <port name="HelloWorldImplPort" binding="tns:HelloWorldServicePortBinding">

+      <soap:address location="http://localhost:8085/HelloWorldService/HelloWorld"/>

+    </port>    

   </service>

 </definitions>