Author: coheigea Date: Fri Dec 21 12:04:52 2012 New Revision: 1424887 URL: http://svn.apache.org/viewvc?rev=1424887&view=rev Log: Merged revisions 1424880 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1424880 | coheigea | 2012-12-21 11:40:58 +0000 (Fri, 21 Dec 2012) | 10 lines Merged revisions 1424874 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1424874 | coheigea | 2012-12-21 11:34:29 +0000 (Fri, 21 Dec 2012) | 2 lines [CXF-4716] - Added an @Ignore'd test to reproduce the issue ........ ........ Added: 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/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/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/client/client.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml Added: 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=1424887&view=auto ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java (added) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java Fri Dec 21 12:04:52 2012 @@ -0,0 +1,46 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.systest.ws.common; + +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") +@Features(features = "org.apache.cxf.feature.LoggingFeature") +public class DoubleIt2Impl implements DoubleItPortType2 { + + public int doubleIt(int numberToDouble) throws DoubleItFault { + 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; + } + +} 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=1424887&r1=1424886&r2=1424887&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 12:04:52 2012 @@ -35,6 +35,9 @@ import org.apache.cxf.systest.ws.x509.se import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; 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; /** @@ -533,4 +536,34 @@ public class X509TokenTest extends Abstr bus.shutdown(true); } + @org.junit.Test + @org.junit.Ignore + public void testKeyIdentifier2() throws Exception { + + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = X509TokenTest.class.getResource("client/client.xml"); + + Bus bus = bf.createBus(busFile.toString()); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); + + URL wsdl = X509TokenTest.class.getResource("DoubleItOperations.wsdl"); + Service service = Service.create(wsdl, SERVICE_QNAME); + QName portQName = new QName(NAMESPACE, "DoubleItKeyIdentifierPort2"); + DoubleItPortType2 x509Port = + service.getPort(portQName, DoubleItPortType2.class); + updateAddressPort(x509Port, PORT); + + int response = x509Port.doubleIt(25); + assertEquals(50, response); + + DoubleIt parameters = new DoubleIt(); + parameters.setNumberToDouble(15); + DoubleItResponse response2 = x509Port.doubleIt2(parameters); + assertEquals(30, response2.getDoubledNumber()); + + ((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=1424887&r1=1424886&r2=1424887&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 12:04:52 2012 @@ -79,6 +79,18 @@ <wsdl:output message="tns:DoubleItResponse" /> </wsdl:operation> </wsdl:portType> + <wsdl:portType name="DoubleItPortType2"> + <wsdl:operation name="DoubleIt"> + <wsdl:input message="tns:DoubleItRequest" /> + <wsdl:output message="tns:DoubleItResponse" /> + <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:operation> + </wsdl:portType> </wsdl:definitions> Added: 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=1424887&view=auto ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl (added) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl Fri Dec 21 12:04:52 2012 @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<wsdl:definitions name="DoubleIt" + xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:tns="http://www.example.org/contract/DoubleIt"; + targetNamespace="http://www.example.org/contract/DoubleIt"; + xmlns:wsp="http://www.w3.org/ns/ws-policy"; + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; + xmlns:wsaws="http://www.w3.org/2005/08/addressing"; + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"; + xmlns:sp13="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802";> + + <wsdl:import location="src/test/resources/DoubleItLogical.wsdl" + namespace="http://www.example.org/contract/DoubleIt"/> + + <wsdl:binding name="DoubleItKeyIdentifierBinding" type="tns:DoubleItPortType2"> + <wsp:PolicyReference URI="#DoubleItKeyIdentifierPolicy" /> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http"; /> + <wsdl:operation name="DoubleIt"> + <soap:operation soapAction="" /> + <wsdl:input> + <soap:body use="literal" /> + <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/> + </wsdl:output> + <wsdl:fault name="DoubleItFault"> + <soap:body use="literal" name="DoubleItFault" /> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="DoubleIt2"> + <soap:operation soapAction="" /> + <wsdl:input> + <soap:body use="literal" /> + <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy2"/> + </wsdl:input> + <wsdl:output> + <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> + + <wsdl:service name="DoubleItService"> + <wsdl:port name="DoubleItKeyIdentifierPort2" binding="tns:DoubleItKeyIdentifierBinding"> + <soap:address location="http://localhost:9001/DoubleItX509KeyIdentifier2"; /> + </wsdl:port> + </wsdl:service> + + <wsp:Policy wsu:Id="DoubleItKeyIdentifierPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SymmetricBinding> + <wsp:Policy> + <sp:ProtectionToken> + <wsp:Policy> + <sp:X509Token + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never";> + <wsp:Policy> + <sp:WssX509V3Token10 /> + <sp:RequireKeyIdentifierReference /> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:ProtectionToken> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:SymmetricBinding> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + + <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Input_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:EncryptedParts> + <sp:Body/> + </sp:EncryptedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Input_Policy2"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Output_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:EncryptedParts> + <sp:Body/> + </sp:EncryptedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Output_Policy2"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + +</wsdl:definitions> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml?rev=1424887&r1=1424886&r2=1424887&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml Fri Dec 21 12:04:52 2012 @@ -48,6 +48,15 @@ </jaxws:properties> </jaxws:client> + <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKeyIdentifierPort2"; + createdFromAPI="true"> + <jaxws:properties> + <entry key="ws-security.encryption.properties" + value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> + <entry key="ws-security.encryption.username" value="bob"/> + </jaxws:properties> + </jaxws:client> + <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItIssuerSerialPort"; createdFromAPI="true"> <jaxws:properties> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml?rev=1424887&r1=1424886&r2=1424887&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml Fri Dec 21 12:04:52 2012 @@ -85,6 +85,24 @@ </jaxws:endpoint> <jaxws:endpoint + id="KeyIdentifier2" + address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifier2"; + serviceName="s:DoubleItService" + endpointName="s:DoubleItKeyIdentifierPort2" + xmlns:s="http://www.example.org/contract/DoubleIt"; + implementor="org.apache.cxf.systest.ws.common.DoubleIt2Impl" + wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl"> + + <jaxws:properties> + <entry key="ws-security.callback-handler" + value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" + value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> + </jaxws:properties> + + </jaxws:endpoint> + + <jaxws:endpoint id="IssuerSerial" address="http://localhost:${testutil.ports.Server}/DoubleItX509IssuerSerial"; serviceName="s:DoubleItService"
