You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/11/16 02:36:00 UTC

svn commit: r1410140 - in /cxf/trunk/systests/databinding/src/test: java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java resources/mtomTestBeans.xml

Author: dkulp
Date: Fri Nov 16 01:35:59 2012
New Revision: 1410140

URL: http://svn.apache.org/viewvc?rev=1410140&view=rev
Log:
Fix issue on IBM jdk where the wrong WSDL is returned.  (IBM sometimes
returns methods in different order)

Modified:
    cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java
    cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml

Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java?rev=1410140&r1=1410139&r2=1410140&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java (original)
+++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java Fri Nov 16 01:35:59 2012
@@ -24,6 +24,7 @@ import javax.jws.WebService;
 import javax.xml.ws.soap.MTOM;
 
 import org.apache.cxf.aegis.type.java5.XmlParamType;
+import org.apache.cxf.aegis.type.java5.XmlReturnType;
 
 /**
  *
@@ -34,5 +35,6 @@ public interface MtomTestService {
     void acceptDataHandler(@WebParam(name = "inputDhBean")
                            @XmlParamType(name = "inputDhBean")
                            DataHandlerBean dhBean);
+    @XmlReturnType(name = "inputDhBean")
     DataHandlerBean produceDataHandlerBean();
 }

Modified: cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml?rev=1410140&r1=1410139&r2=1410140&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml (original)
+++ cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml Fri Nov 16 01:35:59 2012
@@ -38,7 +38,6 @@ http://cxf.apache.org/core http://cxf.ap
 		<property name="dataBinding" ref="aegisBean" />
 	</bean>
 
-
 	<jaxws:endpoint id="mtom-jaxws-service" implementor="#mtomImpl"
 		address="http://localhost:${testutil.ports.MtomTest}/jaxWsMtom">
 		<jaxws:serviceFactory>
@@ -71,7 +70,9 @@ http://cxf.apache.org/core http://cxf.ap
 
 	<simple:server id="mtom-xmime-server"
 		address="http://localhost:${testutil.ports.MtomTest}/mtomXmime"
-		serviceClass="org.apache.cxf.systest.aegis.mtom.fortest.MtomTestService">
+		serviceClass="org.apache.cxf.systest.aegis.mtom.fortest.MtomTestService"
+		xmlns:sns="http://fortest.mtom.aegis.systest.cxf.apache.org/"
+		serviceName="sns:MtomTestServiceXmime">
 		<simple:dataBinding>
 			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding">
 				<property name="mtomEnabled" value="true" />