Author: dkulp Date: Fri Dec 21 15:23:04 2012 New Revision: 1424965 URL: http://svn.apache.org/viewvc?rev=1424965&view=rev Log: Merged revisions 1424958 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1424958 | dkulp | 2012-12-21 10:20:21 -0500 (Fri, 21 Dec 2012) | 10 lines Merged revisions 1424951 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1424951 | dkulp | 2012-12-21 10:17:15 -0500 (Fri, 21 Dec 2012) | 2 lines Fix Colm's test ........ ........ Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/DoubleItLogical.wsdl cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java?rev=1424965&r1=1424964&r2=1424965&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java Fri Dec 21 15:23:04 2012 @@ -23,11 +23,10 @@ import javax.jws.WebService; import org.apache.cxf.feature.Features; import org.example.contract.doubleit.DoubleItFault; import org.example.contract.doubleit.DoubleItPortType2; -import org.example.schema.doubleit.DoubleItResponse; @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt";, serviceName = "DoubleItService", - endpointInterface = "org.example.contract.doubleit.DoubleItPortType") + endpointInterface = "org.example.contract.doubleit.DoubleItPortType2") @Features(features = "org.apache.cxf.feature.LoggingFeature") public class DoubleIt2Impl implements DoubleItPortType2 { @@ -35,12 +34,8 @@ public class DoubleIt2Impl implements Do return numberToDouble * 2; } - public org.example.schema.doubleit.DoubleItResponse doubleIt2( - org.example.schema.doubleit.DoubleIt parameters - ) throws DoubleItFault { - DoubleItResponse response = new DoubleItResponse(); - response.setDoubledNumber(parameters.getNumberToDouble() * 2); - return response; + public int doubleIt2(int numberToDouble) { + return numberToDouble * 2; } } Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1424965&r1=1424964&r2=1424965&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Fri Dec 21 15:23:04 2012 @@ -36,8 +36,6 @@ import org.apache.cxf.testutil.common.Ab import org.apache.cxf.ws.security.SecurityConstants; import org.example.contract.doubleit.DoubleItPortType; import org.example.contract.doubleit.DoubleItPortType2; -import org.example.schema.doubleit.DoubleIt; -import org.example.schema.doubleit.DoubleItResponse; import org.junit.BeforeClass; /** @@ -537,7 +535,6 @@ public class X509TokenTest extends Abstr } @org.junit.Test - @org.junit.Ignore public void testKeyIdentifier2() throws Exception { SpringBusFactory bf = new SpringBusFactory(); @@ -557,10 +554,8 @@ public class X509TokenTest extends Abstr int response = x509Port.doubleIt(25); assertEquals(50, response); - DoubleIt parameters = new DoubleIt(); - parameters.setNumberToDouble(15); - DoubleItResponse response2 = x509Port.doubleIt2(parameters); - assertEquals(30, response2.getDoubledNumber()); + int response2 = x509Port.doubleIt2(15); + assertEquals(30, response2); ((java.io.Closeable)x509Port).close(); bus.shutdown(true); Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/DoubleItLogical.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/DoubleItLogical.wsdl?rev=1424965&r1=1424964&r2=1424965&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/DoubleItLogical.wsdl (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/DoubleItLogical.wsdl Fri Dec 21 15:23:04 2012 @@ -35,6 +35,13 @@ </xsd:sequence> </xsd:complexType> </xsd:element> + <xsd:element name="DoubleIt2"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="numberToDouble" type="xsd:int" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> <xsd:element name="DoubleItResponse"> <xsd:complexType> <xsd:sequence> @@ -56,11 +63,17 @@ <wsdl:message name="DoubleItRequest"> <wsdl:part element="di:DoubleIt" name="parameters" /> </wsdl:message> + <wsdl:message name="DoubleIt2Request"> + <wsdl:part element="di:DoubleIt2" name="parameters" /> + </wsdl:message> <wsdl:message name="DoubleItRequestHeader"> <wsdl:part element="di:DoubleIt" name="parameters" /> <wsdl:part element="di:DoubleItHeader" name="header" /> </wsdl:message> - <wsdl:message name="DoubleItResponse"> + <wsdl:message name="DoubleItResponse"> + <wsdl:part element="di:DoubleItResponse" name="parameters" /> + </wsdl:message> + <wsdl:message name="DoubleIt2Response"> <wsdl:part element="di:DoubleItResponse" name="parameters" /> </wsdl:message> <wsdl:message name="DoubleItFault"> @@ -86,9 +99,8 @@ <wsdl:fault message="tns:DoubleItFault" name="DoubleItFault" /> </wsdl:operation> <wsdl:operation name="DoubleIt2"> - <wsdl:input message="tns:DoubleItRequest" /> - <wsdl:output message="tns:DoubleItResponse" /> - <wsdl:fault message="tns:DoubleItFault" name="DoubleItFault" /> + <wsdl:input message="tns:DoubleIt2Request" /> + <wsdl:output message="tns:DoubleIt2Response" /> </wsdl:operation> </wsdl:portType> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl?rev=1424965&r1=1424964&r2=1424965&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl Fri Dec 21 15:23:04 2012 @@ -58,9 +58,6 @@ <soap:body use="literal" /> <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy2"/> </wsdl:output> - <wsdl:fault name="DoubleItFault"> - <soap:body use="literal" name="DoubleItFault" /> - </wsdl:fault> </wsdl:operation> </wsdl:binding>
