cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r640927 - in /incubator/cxf/branches/2.0.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/
Date Tue, 25 Mar 2008 18:20:13 GMT
Author: dkulp
Date: Tue Mar 25 11:20:03 2008
New Revision: 640927

URL: http://svn.apache.org/viewvc?rev=640927&view=rev
Log:
Merged revisions 640863 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r640863 | dkulp | 2008-03-25 11:37:31 -0400 (Tue, 25 Mar 2008) | 2 lines
  
  [CXF-1486] Fix problems of putting primitives in generics for AsyncHandlers/Response objects
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async.wsdl

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java?rev=640927&r1=640926&r2=640927&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
Tue Mar 25 11:20:03 2008
@@ -26,6 +26,7 @@
 
 import javax.jws.WebParam;
 
+import org.apache.cxf.jaxb.JAXBUtils;
 import org.apache.cxf.service.model.FaultInfo;
 import org.apache.cxf.service.model.MessageInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
@@ -239,6 +240,10 @@
             response = wrapperResponse.getClassName();
         } else {
             response = method.getReturn().getClassName();
+        }
+        Class<?> mappedClass = JAXBUtils.holderClass(response);
+        if (mappedClass != null) {
+            response = mappedClass.getName();
         }
 
         StringBuffer sb = new StringBuffer();

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async.wsdl?rev=640927&r1=640926&r2=640927&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async.wsdl
Tue Mar 25 11:20:03 2008
@@ -51,6 +51,8 @@
 		    </sequence>
 		</complexType>
 	    </element>		
+      	<element name="testInt" type="xsd:int"/>
+        <element name="testIntResponse" type="xsd:int"/>
 	</schema>
     </wsdl:types>
     <wsdl:message name="greetMeSometimeRequest">
@@ -59,15 +61,34 @@
     <wsdl:message name="greetMeSometimeResponse">
 	<wsdl:part name="out" element="x1:greetMeSometimeResponse"/>
     </wsdl:message>
+    <wsdl:message name="testIntRequest">
+    	<wsdl:part name="parameters" element="x1:testInt"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="testIntResponse">
+    	<wsdl:part name="parameters" element="x1:testIntResponse"></wsdl:part>
+    </wsdl:message>
     <wsdl:portType name="GreeterAsync">
 	<wsdl:operation name="greetMeSometime">
 	    <wsdl:input name="greetMeSometimeRequest" message="tns:greetMeSometimeRequest"/>
 	    <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"/>
 	</wsdl:operation>
+	<wsdl:operation name="testInt">
+		<wsdl:input message="tns:testIntRequest"></wsdl:input>
+		<wsdl:output message="tns:testIntResponse"></wsdl:output>
+	</wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="GreeterAsync_SOAPBinding" type="tns:GreeterAsync">
 	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
 	<wsdl:operation name="greetMeSometime">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="testInt">
 	    <soap:operation style="document"/>
 	    <wsdl:input>
 		<soap:body use="literal"/>



Mime
View raw message