Author: dkulp Date: Fri Nov 16 01:49:50 2012 New Revision: 1410150 URL: http://svn.apache.org/viewvc?rev=1410150&view=rev Log: Merged revisions 1410145 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1410145 | dkulp | 2012-11-15 20:47:44 -0500 (Thu, 15 Nov 2012) | 11 lines Merged revisions 1410140 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1410140 | dkulp | 2012-11-15 20:35:59 -0500 (Thu, 15 Nov 2012) | 3 lines Fix issue on IBM jdk where the wrong WSDL is returned. (IBM sometimes returns methods in different order) ........ ........ Modified: cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java cxf/branches/2.5.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml Modified: cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java?rev=1410150&r1=1410149&r2=1410150&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java (original) +++ cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/fortest/MtomTestService.java Fri Nov 16 01:49:50 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/branches/2.5.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml?rev=1410150&r1=1410149&r2=1410150&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml (original) +++ cxf/branches/2.5.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml Fri Nov 16 01:49:50 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" />
