Author: coheigea Date: Mon Jun 25 14:27:44 2012 New Revision: 1353573 URL: http://svn.apache.org/viewvc?rev=1353573&view=rev Log: Merged revisions 1353563 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1353563 | coheigea | 2012-06-25 15:11:31 +0100 (Mon, 25 Jun 2012) | 10 lines Merged revisions 1353560 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1353560 | coheigea | 2012-06-25 15:05:34 +0100 (Mon, 25 Jun 2012) | 2 lines Updating policy for one of the WS-Security samples ........ ........ Conflicts: distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt?rev=1353573&r1=1353572&r2=1353573&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt Mon Jun 25 14:27:44 2012 @@ -67,7 +67,7 @@ Using either UNIX or Windows: mvn install (builds the demo) mvn -Pserver (from one command line window) - Mvn -Pclient (from a second command line window) + mvn -Pclient (from a second command line window) On startup, the client makes a sequence of 4 two-way invocations. Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt?rev=1353573&r1=1353572&r2=1353573&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt Mon Jun 25 14:27:44 2012 @@ -67,7 +67,7 @@ Using either UNIX or Windows: mvn install (builds the demo) mvn -Pserver (from one command line window) - Mvn -Pclient (from a second command line window) + mvn -Pclient (from a second command line window) On startup, the client makes one invocation. Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl?rev=1353573&r1=1353572&r2=1353573&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl Mon Jun 25 14:27:44 2012 @@ -1,106 +1,132 @@ -<?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="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"; - xmlns="http://schemas.xmlsoap.org/wsdl/"; - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; - xmlns:tns="http://apache.org/hello_world_soap_http"; - xmlns:x1="http://apache.org/hello_world_soap_http/types"; - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; - xmlns:xsd="http://www.w3.org/2001/XMLSchema";> - <wsdl:types> - <schema targetNamespace="http://apache.org/hello_world_soap_http/types"; - xmlns="http://www.w3.org/2001/XMLSchema"; - xmlns:tns="http://apache.org/hello_world_soap_http/types"; - elementFormDefault="qualified"> - - <simpleType name="MyStringType"> - <restriction base="string"> - <maxLength value="30" /> - </restriction> - </simpleType> - - <element name="greetMe"> - <complexType> - <sequence> - <element name="requestType" type="tns:MyStringType"/> - </sequence> - </complexType> - </element> - <element name="greetMeResponse"> - <complexType> - <sequence> - <element name="responseType" type="string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - <wsdl:message name="greetMeRequest"> - <wsdl:part element="x1:greetMe" name="in"/> - </wsdl:message> - <wsdl:message name="greetMeResponse"> - <wsdl:part element="x1:greetMeResponse" name="out"/> - </wsdl:message> - - <wsdl:portType name="Greeter"> - - <wsdl:operation name="greetMe"> - <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/> - <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/> - </wsdl:operation> - - </wsdl:portType> - <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - - <wsdl:operation name="greetMe"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="greetMeRequest"> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output name="greetMeResponse"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - - </wsdl:binding> - <wsdl:service name="SOAPService"> - <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort"> - <wsp:PolicyReference xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"; URI="#UP_policy"/> - <soap:address location="https://localhost:9001/SoapContext/SoapPort"/> - </wsdl:port> - </wsdl:service> - - <wsp:Policy wsu:Id="UP_policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";> - <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> - <wsp:Policy><sp:TransportToken><wsp:Policy><sp:HttpsToken/></wsp:Policy></sp:TransportToken><sp:Layout><wsp:Policy><sp:Strict/></wsp:Policy></sp:Layout><sp:AlgorithmSuite><wsp:Policy><sp:Basic128/></wsp:Policy></sp:AlgorithmSuite></wsp:Policy> - </sp:TransportBinding> - <sp:SupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> - <wsp:Policy> - <sp:UsernameToken xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"; sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always";> - <wsp:Policy> - <sp:WssUsernameToken11/> - </wsp:Policy> - </sp:UsernameToken> - </wsp:Policy></sp:SupportingTokens></wsp:Policy> - -</wsdl:definitions> - +<?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="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"; + xmlns="http://schemas.xmlsoap.org/wsdl/"; + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; + xmlns:tns="http://apache.org/hello_world_soap_http"; + xmlns:x1="http://apache.org/hello_world_soap_http/types"; + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; + xmlns:xsd="http://www.w3.org/2001/XMLSchema";> + <wsdl:types> + <schema targetNamespace="http://apache.org/hello_world_soap_http/types"; + xmlns="http://www.w3.org/2001/XMLSchema"; + xmlns:tns="http://apache.org/hello_world_soap_http/types"; + elementFormDefault="qualified"> + + <simpleType name="MyStringType"> + <restriction base="string"> + <maxLength value="30" /> + </restriction> + </simpleType> + + <element name="greetMe"> + <complexType> + <sequence> + <element name="requestType" type="tns:MyStringType"/> + </sequence> + </complexType> + </element> + <element name="greetMeResponse"> + <complexType> + <sequence> + <element name="responseType" type="string"/> + </sequence> + </complexType> + </element> + </schema> + </wsdl:types> + <wsdl:message name="greetMeRequest"> + <wsdl:part element="x1:greetMe" name="in"/> + </wsdl:message> + <wsdl:message name="greetMeResponse"> + <wsdl:part element="x1:greetMeResponse" name="out"/> + </wsdl:message> + + <wsdl:portType name="Greeter"> + + <wsdl:operation name="greetMe"> + <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/> + <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/> + </wsdl:operation> + + </wsdl:portType> + <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + + <wsdl:operation name="greetMe"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="greetMeRequest"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="greetMeResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + + + </wsdl:binding> + <wsdl:service name="SOAPService"> + <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort"> + <wsp:PolicyReference xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"; URI="#UP_policy"/> + <soap:address location="https://localhost:9001/SoapContext/SoapPort"/> + </wsdl:port> + </wsdl:service> + + <wsp:Policy wsu:Id="UP_policy" 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";> + <wsp:ExactlyOne> + <wsp:All> + <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";> + <wsp:Policy> + <sp:TransportToken> + <wsp:Policy> + <sp:HttpsToken> + <wsp:Policy/> + </sp:HttpsToken> + </wsp:Policy> + </sp:TransportToken> + <sp:Layout> + <wsp:Policy> + <sp:Strict /> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp /> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128 /> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:TransportBinding> + <sp:SupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";> + <wsp:Policy> + <sp:UsernameToken + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";> + <wsp:Policy> + <sp:WssUsernameToken11/> + </wsp:Policy> + </sp:UsernameToken> + </wsp:Policy> + </sp:SupportingTokens> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + +</wsdl:definitions> +
