Author: dkulp Date: Wed Aug 1 18:30:23 2012 New Revision: 1368179 URL: http://svn.apache.org/viewvc?rev=1368179&view=rev Log: Merged revisions 1368170 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1368170 | dkulp | 2012-08-01 14:28:29 -0400 (Wed, 01 Aug 2012) | 18 lines Merged revisions 1368160 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1368160 | dkulp | 2012-08-01 14:23:45 -0400 (Wed, 01 Aug 2012) | 10 lines Merged revisions 1368155 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1368155 | dkulp | 2012-08-01 14:18:18 -0400 (Wed, 01 Aug 2012) | 2 lines Fix some tests that are using an invalid wsdl ........ ........ ........ Modified: cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/add_numbers.wsdl Modified: cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java?rev=1368179&r1=1368178&r2=1368179&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java (original) +++ cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java Wed Aug 1 18:30:23 2012 @@ -157,9 +157,6 @@ public class WSAPureWsdlTest extends Abs disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:"; + PORT + "/jaxws/add"); - //manually set the action - disp.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY, - expectedOut); disp.invoke(new StreamSource(new StringReader(req))); assertTrue(output.toString().indexOf(expectedOut) != -1); Modified: cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/add_numbers.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/add_numbers.wsdl?rev=1368179&r1=1368178&r2=1368179&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/add_numbers.wsdl (original) +++ cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/add_numbers.wsdl Wed Aug 1 18:30:23 2012 @@ -164,7 +164,7 @@ <!-- </fault> --> </operation> <operation name="addNumbers3"> - <soap:operation soapAction="" /> + <soap:operation soapAction="3in" /> <input> <soap:body use="literal" /> </input> @@ -206,7 +206,7 @@ <!-- </fault> --> </operation> <operation name="addNumbers3"> - <soap:operation soapAction="" /> + <soap:operation soapAction="3in" /> <input> <soap:body use="literal" /> </input>
