cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r547558 - in /incubator/cxf/trunk/tools/javato/test/src/test: java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/ resources/java2wsdl_wsdl/
Date Fri, 15 Jun 2007 07:06:37 GMT
Author: mmao
Date: Fri Jun 15 00:06:36 2007
New Revision: 547558

URL: http://svn.apache.org/viewvc?view=rev&rev=547558
Log:
* To fix the build
  The failure caused by there are two GreeterRPCLit class, one in the testutils one in the
javato/test
  We just changed the namespace of the wsdl in the javato, so the test will pick up the one
in the javato/test


Modified:
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?view=diff&rev=547558&r1=547557&r2=547558
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
Fri Jun 15 00:06:36 2007
@@ -34,7 +34,7 @@
 import org.apache.cxf.tools.fortest.withannotation.doc.Hello;
 import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
 import org.apache.cxf.tools.util.AnnotationUtil;
-import org.apache.hello_world_rpclit.GreeterRPCLit;
+import org.apache.hello_world_rpclit.javato.GreeterRPCLit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl?view=diff&rev=547558&r1=547557&r2=547558
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
Fri Jun 15 00:06:36 2007
@@ -17,9 +17,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions name="GreeterRPCLitService" targetNamespace="http://apache.org/hello_world_rpclit"
xmlns:ns1="http://apache.org/hello_world_rpclit" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ns2="http://apache.org/hello_world_rpclit/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="GreeterRPCLitService" targetNamespace="http://apache.org/hello_world_rpclit/javato"
xmlns:ns1="http://apache.org/hello_world_rpclit/javato" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ns2="http://apache.org/hello_world_rpclit/javato/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_rpclit/types"
attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/hello_world_rpclit/types">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_rpclit/javato/types"
attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/hello_world_rpclit/javato/types">
 <xs:complexType name="myComplexStruct">
 <xs:sequence>
 <xs:element form="qualified" name="elem1" type="xs:string"/>
@@ -29,16 +29,6 @@
 </xs:complexType>
 </xs:schema>
   </wsdl:types>
-  <wsdl:message name="greetUs">
-    <wsdl:part name="you" type="xsd:string">
-    </wsdl:part>
-    <wsdl:part name="me" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="greetUsResponse">
-    <wsdl:part name="out" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
   <wsdl:message name="greetMeResponse">
     <wsdl:part name="out" type="xsd:string">
     </wsdl:part>
@@ -74,12 +64,6 @@
       <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
     </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="greetUs">
-      <wsdl:input name="greetUs" message="ns1:greetUs">
-    </wsdl:input>
-      <wsdl:output name="greetUsResponse" message="ns1:greetUsResponse">
-    </wsdl:output>
-    </wsdl:operation>
     <wsdl:operation name="sayHi">
       <wsdl:input name="sayHi" message="ns1:sayHi">
     </wsdl:input>
@@ -92,37 +76,28 @@
     <wsdl:operation name="sendReceiveData">
       <soap:operation soapAction="" style="rpc"/>
       <wsdl:input name="sendReceiveData">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit"/>
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
       </wsdl:input>
       <wsdl:output name="sendReceiveDataResponse">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit"/>
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
       </wsdl:output>
     </wsdl:operation>
     <wsdl:operation name="greetMe">
       <soap:operation soapAction="" style="rpc"/>
       <wsdl:input name="greetMe">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit"/>
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
       </wsdl:input>
       <wsdl:output name="greetMeResponse">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="greetUs">
-      <soap:operation soapAction="" style="rpc"/>
-      <wsdl:input name="greetUs">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit"/>
-      </wsdl:input>
-      <wsdl:output name="greetUsResponse">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit"/>
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
       </wsdl:output>
     </wsdl:operation>
     <wsdl:operation name="sayHi">
       <soap:operation soapAction="" style="rpc"/>
       <wsdl:input name="sayHi">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit"/>
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
       </wsdl:input>
       <wsdl:output name="sayHiResponse">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit"/>
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>
@@ -131,4 +106,4 @@
       <soap:address location="http://localhost"/>
     </wsdl:port>
   </wsdl:service>
-</wsdl:definitions>
+</wsdl:definitions>
\ No newline at end of file

Modified: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl?view=diff&rev=547558&r1=547557&r2=547558
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl
Fri Jun 15 00:06:36 2007
@@ -17,17 +17,17 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_rpclit"

+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_rpclit/javato"

     xmlns="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:http-conf="http://schemas.iona.com/transports/http/configuration"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://apache.org/hello_world_rpclit"
-    xmlns:x1="http://apache.org/hello_world_rpclit/types"
+    xmlns:tns="http://apache.org/hello_world_rpclit/javato"
+    xmlns:x1="http://apache.org/hello_world_rpclit/javato/types"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     
     <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world_rpclit/types" 
+        <schema targetNamespace="http://apache.org/hello_world_rpclit/javato/types" 
             xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
             <complexType name="myComplexStruct">
 	        <sequence>
@@ -83,30 +83,30 @@
         <wsdl:operation name="sayHi">
             <soap:operation soapAction="" style="rpc"/>
             <wsdl:input>
-                <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+                <soap:body namespace="http://apache.org/hello_world_rpclit/javato" use="literal"/>
             </wsdl:input>
             <wsdl:output>
-                <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+                <soap:body namespace="http://apache.org/hello_world_rpclit/javato" use="literal"/>
             </wsdl:output>
         </wsdl:operation>
         
         <wsdl:operation name="greetMe">
             <soap:operation soapAction="" style="rpc"/>
             <wsdl:input>
-                <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+                <soap:body namespace="http://apache.org/hello_world_rpclit/javato" use="literal"/>
             </wsdl:input>
             <wsdl:output>
-                <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+                <soap:body namespace="http://apache.org/hello_world_rpclit/javato" use="literal"/>
             </wsdl:output>
         </wsdl:operation>
         
         <wsdl:operation name="sendReceiveData">
             <soap:operation soapAction="" style="rpc"/>
                <wsdl:input>
-                   <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+                   <soap:body namespace="http://apache.org/hello_world_rpclit/javato"
use="literal"/>
                </wsdl:input>
                <wsdl:output>
-                   <soap:body namespace="http://apache.org/hello_world_rpclit" use="literal"/>
+                   <soap:body namespace="http://apache.org/hello_world_rpclit/javato"
use="literal"/>
                </wsdl:output>   
         </wsdl:operation>
 



Mime
View raw message