- From: Asir Vedamuthu via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 08 Jun 2007 05:48:45 +0000
- To: public-ws-policy-eds@w3.org
Update of /sources/public/2006/ws/policy/interop/Round4/external-attachment In directory hutz:/tmp/cvs-serv28139/interop/Round4/external-attachment Modified Files: R4W2-2.policy R4W2-1-Result.wsdl R4W1-2-Result.wsdl R4W2-2-Result.wsdl R4W2R1.wsdl R4WP2.policy R4W1R1.wsdl R4WP1.policy R4W1.wsdl R4W1-2.policy R4W1-1.policy R4W1-1-Result.wsdl R4W2-1.policy R4WP3.policy R4W2.wsdl Log Message: Implemented WG resolutions for issues 4522 4567 4572 4568 4571 4575 Fixed a few more namespace declarations in the External Policy Attachment test cases PS: External Policy Attachment Test Cases are too buggy :-( Index: R4WP1.policy =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4WP1.policy,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- R4WP1.policy 9 Mar 2007 01:19:30 -0000 1.1 +++ R4WP1.policy 8 Jun 2007 05:48:43 -0000 1.2 @@ -1,10 +1,13 @@ -<wsp:Policy wsu:Id="A11Endpoint" > +<wsp:Policy wsu:Id="A11Endpoint" + 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:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512"> <!-- Asymmetric Policy A11 - X509 with mutual authentication and AES 256 --> <sp:AsymmetricBinding> <wsp:Policy> <sp:RecipientToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/Never" > + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/Never" > <wsp:Policy> <sp:WssX509V3Token10 /> </wsp:Policy> @@ -13,7 +16,7 @@ </sp:RecipientToken> <sp:InitiatorToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/AlwaysToRecipient" > + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/AlwaysToRecipient" > <wsp:Policy> <sp:WssX509V3Token10 /> </wsp:Policy> Index: R4WP2.policy =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4WP2.policy,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- R4WP2.policy 9 Mar 2007 01:19:30 -0000 1.1 +++ R4WP2.policy 8 Jun 2007 05:48:43 -0000 1.2 @@ -1,10 +1,13 @@ -<wsp:Policy wsu:Id="A12Endpoint" > +<wsp:Policy wsu:Id="A12Endpoint" + 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:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512"> <!-- Asymmetric Policy A12 - X509 with mutual authentication and 3DES --> <sp:AsymmetricBinding> <wsp:Policy> <sp:RecipientToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/Never" > + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/Never" > <wsp:Policy> <sp:WssX509V3Token10 /> </wsp:Policy> @@ -13,7 +16,7 @@ </sp:RecipientToken> <sp:InitiatorToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/AlwaysToRecipient" > + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/AlwaysToRecipient" > <wsp:Policy> <sp:WssX509V3Token10 /> </wsp:Policy> Index: R4W2.wsdl =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W2.wsdl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- R4W2.wsdl 9 Mar 2007 19:07:15 -0000 1.2 +++ R4W2.wsdl 8 Jun 2007 05:48:43 -0000 1.3 @@ -2,15 +2,11 @@ <wsdl20:description targetNamespace="http://example.com/ws/2004/09/policy" xmlns:tns="http://example.com/ws/2004/09/policy" xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl20="http://www.w3.org/2006/01/wsdl" xmlns:wsoap="http://www.w3.org/2006/01/wsdl/soap" + xmlns:wsdl20="http://www.w3.org/ns/wsdl" xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" 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:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd - http://www.w3.org/2006/01/wsdl http://www.w3.org/2006/03/wsdl/wsdl20.xsd - http://www.w3.org/2006/01/wsdl/soap http://www.w3.org/2006/03/wsdl/soap.xsd - http://www.w3.org/ns/ws-policy http://www.w3.org/2002/ws/policy/ns/ws-policy"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <wsdl20:types> @@ -22,7 +18,7 @@ </wsdl20:types> <wsdl20:binding name="A11Binding" interface="tns:Test" - type="http://www.w3.org/2006/01/wsdl/soap" + type="http://www.w3.org/ns/wsdl/soap" wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"> <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest"> <wsdl20:input/> @@ -31,7 +27,7 @@ </wsdl20:binding> <wsdl20:binding name="A12Binding" interface="tns:Test" - type="http://www.w3.org/2006/01/wsdl/soap" + type="http://www.w3.org/ns/wsdl/soap" wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"> <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest"> <wsdl20:input/> Index: R4W2-1-Result.wsdl =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W2-1-Result.wsdl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- R4W2-1-Result.wsdl 9 Mar 2007 19:07:15 -0000 1.1 +++ R4W2-1-Result.wsdl 8 Jun 2007 05:48:43 -0000 1.2 @@ -2,15 +2,11 @@ <wsdl20:description targetNamespace="http://example.com/ws/2004/09/policy" xmlns:tns="http://example.com/ws/2004/09/policy" xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl20="http://www.w3.org/2006/01/wsdl" xmlns:wsoap="http://www.w3.org/2006/01/wsdl/soap" + xmlns:wsdl20="http://www.w3.org/ns/wsdl" xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" 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:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd - http://www.w3.org/2006/01/wsdl http://www.w3.org/2006/03/wsdl/wsdl20.xsd - http://www.w3.org/2006/01/wsdl/soap http://www.w3.org/2006/03/wsdl/soap.xsd - http://www.w3.org/ns/ws-policy http://www.w3.org/2002/ws/policy/ns/ws-policy"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <wsp:Policy wsu:Id="A11Endpoint"> <!-- Asymmetric Policy A11 - X509 with mutual authentication and AES 256 --> @@ -19,7 +15,7 @@ <sp:RecipientToken> <wsp:Policy> <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/Never"> + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/Never"> <wsp:Policy> <sp:WssX509V3Token10/> </wsp:Policy> @@ -29,7 +25,7 @@ <sp:InitiatorToken> <wsp:Policy> <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/AlwaysToRecipient"> + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/AlwaysToRecipient"> <wsp:Policy> <sp:WssX509V3Token10/> </wsp:Policy> @@ -76,7 +72,7 @@ </wsdl20:types> <wsdl20:binding name="A11Binding" interface="tns:Test" - type="http://www.w3.org/2006/01/wsdl/soap" + type="http://www.w3.org/ns/wsdl/soap" wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"> <wsp:PolicyReference URI="#A11Endpoint" wsdl20:required="true"/> <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest"> @@ -90,9 +86,8 @@ </wsdl20:binding> <wsdl20:binding name="A12Binding" interface="tns:Test" - type="http://www.w3.org/2006/01/wsdl/soap" + type="http://www.w3.org/ns/wsdl/soap" wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"> - <wsp:PolicyReference URI="#A12Endpoint" wsdl20:required="true"/> <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest"> <wsdl20:input/> <wsdl20:output/> Index: R4W1R1.wsdl =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W1R1.wsdl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- R4W1R1.wsdl 9 Mar 2007 01:19:30 -0000 1.1 +++ R4W1R1.wsdl 8 Jun 2007 05:48:43 -0000 1.2 @@ -14,8 +14,8 @@ </wsdl:message> <wsdl:portType name="Test"> <wsdl:operation name="Echo"> - <wsdl:input message="tns:EchoInMessage" wsa:Action="http://example.com/ws/2004/09/policy/Test/EchoRequest"/> - <wsdl:output message="tns:EchoOutMessage" wsa:Action="http://example.com/ws/2004/09/policy/Test/EchoResponse"/> + <wsdl:input message="tns:EchoInMessage"/> + <wsdl:output message="tns:EchoOutMessage"/> </wsdl:operation> </wsdl:portType> Index: R4W2-2.policy =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W2-2.policy,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- R4W2-2.policy 9 Mar 2007 19:07:15 -0000 1.2 +++ R4W2-2.policy 8 Jun 2007 05:48:43 -0000 1.3 @@ -1,26 +1,26 @@ -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> - #wsdl.binding (A12Binding) + #wsdl.binding(A12Binding) </wsp:URI> </wsp:AppliesTo> - <wsp:PolicyReference URI="#A12Endpoint"/> + <wsp:PolicyReference URI="#A12Endpoint"/> </wsp:PolicyAttachment> -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> - #wsdl.BindingMessageReference(A12Binding/Echo/input) + #wsdl.bindingMessageReference(A12Binding/Echo/In) </wsp:URI> </wsp:AppliesTo> - <wsp:PolicyReference URI="#AMessage"/> + <wsp:PolicyReference URI="#AMessage"/> </wsp:PolicyAttachment> -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> - # wsdl.BindingMessageReference(A12Binding/Echo/output) + #wsdl.bindingMessageReference(A12Binding/Echo/Out) </wsp:URI> </wsp:AppliesTo> - <wsp:PolicyReference URI="#AMessage"/> + <wsp:PolicyReference URI="#AMessage"/> </wsp:PolicyAttachment> Index: R4W1-2.policy =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W1-2.policy,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- R4W1-2.policy 9 Mar 2007 19:07:15 -0000 1.2 +++ R4W1-2.policy 8 Jun 2007 05:48:43 -0000 1.3 @@ -1,13 +1,13 @@ -wsp:PolicyAttachment> +wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> - #wsdl11.binding (A12Binding) + #wsdl11.binding(A12Binding) </wsp:URI> </wsp:AppliesTo> <wsp:PolicyReference URI="#A12Endpoint"/> </wsp:PolicyAttachment> -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> #wsdl11.bindingOperation.input(A12Binding/Echo) @@ -16,7 +16,7 @@ <wsp:PolicyReference URI="#AMessage"/> </wsp:PolicyAttachment> -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> #wsdl11.bindingOperation.output(A12Binding/Echo) Index: R4W1-1.policy =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W1-1.policy,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- R4W1-1.policy 9 Mar 2007 19:07:15 -0000 1.2 +++ R4W1-1.policy 8 Jun 2007 05:48:43 -0000 1.3 @@ -1,13 +1,13 @@ -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> - #wsdl11.binding (A11Binding) + #wsdl11.binding(A11Binding) </wsp:URI> </wsp:AppliesTo> <wsp:PolicyReference URI="#A11Endpoint"/> </wsp:PolicyAttachment> -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> #wsdl11.bindingOperation.input(A11Binding/Echo) @@ -16,7 +16,7 @@ <wsp:PolicyReference URI="#AMessage"/> </wsp:PolicyAttachment> -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> #wsdl11.bindingOperation.output(A11Binding/Echo) Index: R4W1-1-Result.wsdl =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W1-1-Result.wsdl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- R4W1-1-Result.wsdl 22 Mar 2007 04:25:56 -0000 1.2 +++ R4W1-1-Result.wsdl 8 Jun 2007 05:48:43 -0000 1.3 @@ -6,7 +6,7 @@ <wsp:Policy> <sp:RecipientToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/Never" > + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/Never" > <wsp:Policy> <sp:WssX509V3Token10 /> </wsp:Policy> @@ -15,7 +15,7 @@ </sp:RecipientToken> <sp:InitiatorToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/AlwaysToRecipient" > + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/AlwaysToRecipient" > <wsp:Policy> <sp:WssX509V3Token10 /> </wsp:Policy> @@ -69,8 +69,8 @@ </wsdl:message> <wsdl:portType name="Test"> <wsdl:operation name="Echo"> - <wsdl:input message="tns:EchoInMessage" wsa:Action="http://example.com/ws/2004/09/policy/Test/EchoRequest"/> - <wsdl:output message="tns:EchoOutMessage" wsa:Action="http://example.com/ws/2004/09/policy/Test/EchoResponse"/> + <wsdl:input message="tns:EchoInMessage"/> + <wsdl:output message="tns:EchoOutMessage"/> </wsdl:operation> </wsdl:portType> Index: R4W2-1.policy =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W2-1.policy,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- R4W2-1.policy 9 Mar 2007 19:07:15 -0000 1.2 +++ R4W2-1.policy 8 Jun 2007 05:48:43 -0000 1.3 @@ -1,25 +1,25 @@ -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> - #wsdl.binding (A11Binding) + #wsdl.binding(A11Binding) </wsp:URI> </wsp:AppliesTo> <wsp:PolicyReference URI="#A11Endpoint"/> </wsp:PolicyAttachment> -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> - # wsdl.BindingMessageReference (A11Binding/Echo/input) + #wsdl.bindingMessageReference(A11Binding/Echo/In) </wsp:URI> </wsp:AppliesTo> <wsp:PolicyReference URI="#AMessage"/> </wsp:PolicyAttachment> -<wsp:PolicyAttachment> +<wsp:PolicyAttachment xmlns:wsp="http://www.w3.org/ns/ws-policy"> <wsp:AppliesTo> <wsp:URI> - # wsdl.BindingMessageReference(A11Binding/Echo/output) + #wsdl.bindingMessageReference(A11Binding/Echo/Out) </wsp:URI> </wsp:AppliesTo> <wsp:PolicyReference URI="#AMessage"/> Index: R4WP3.policy =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4WP3.policy,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- R4WP3.policy 9 Mar 2007 01:19:30 -0000 1.1 +++ R4WP3.policy 8 Jun 2007 05:48:43 -0000 1.2 @@ -1,4 +1,7 @@ -<wsp:Policy wsu:Id="AMessage" > +<wsp:Policy wsu:Id="AMessage" + 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:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512"> <wsp:ExactlyOne> <wsp:All> <sp:SignedParts> Index: R4W2-2-Result.wsdl =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W2-2-Result.wsdl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- R4W2-2-Result.wsdl 9 Mar 2007 19:07:15 -0000 1.1 +++ R4W2-2-Result.wsdl 8 Jun 2007 05:48:43 -0000 1.2 @@ -2,15 +2,11 @@ <wsdl20:description targetNamespace="http://example.com/ws/2004/09/policy" xmlns:tns="http://example.com/ws/2004/09/policy" xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl20="http://www.w3.org/2006/01/wsdl" xmlns:wsoap="http://www.w3.org/2006/01/wsdl/soap" + xmlns:wsdl20="http://www.w3.org/ns/wsdl" xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" 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:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd - http://www.w3.org/2006/01/wsdl http://www.w3.org/2006/03/wsdl/wsdl20.xsd - http://www.w3.org/2006/01/wsdl/soap http://www.w3.org/2006/03/wsdl/soap.xsd - http://www.w3.org/ns/ws-policy http://www.w3.org/2002/ws/policy/ns/ws-policy"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <wsp:Policy wsu:Id="A12Endpoint"> <!-- Asymmetric Policy A12 - X509 with mutual authentication and 3DES --> @@ -19,7 +15,7 @@ <sp:RecipientToken> <wsp:Policy> <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/Never"> + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/Never"> <wsp:Policy> <sp:WssX509V3Token10/> </wsp:Policy> @@ -29,7 +25,7 @@ <sp:InitiatorToken> <wsp:Policy> <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/AlwaysToRecipient"> + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/AlwaysToRecipient"> <wsp:Policy> <sp:WssX509V3Token10/> </wsp:Policy> @@ -75,7 +71,7 @@ </wsdl20:types> <wsdl20:binding name="A11Binding" interface="tns:Test" - type="http://www.w3.org/2006/01/wsdl/soap" + type="http://www.w3.org/ns/wsdl/soap" wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"> <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest"> <wsdl20:input/> @@ -84,7 +80,7 @@ </wsdl20:binding> <wsdl20:binding name="A12Binding" interface="tns:Test" - type="http://www.w3.org/2006/01/wsdl/soap" + type="http://www.w3.org/ns/wsdl/soap" wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"> <wsp:PolicyReference URI="#A12Endpoint" wsdl20:required="true"/> <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest"> Index: R4W1-2-Result.wsdl =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W1-2-Result.wsdl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- R4W1-2-Result.wsdl 22 Mar 2007 04:25:56 -0000 1.2 +++ R4W1-2-Result.wsdl 8 Jun 2007 05:48:43 -0000 1.3 @@ -6,7 +6,7 @@ <wsp:Policy> <sp:RecipientToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/Never" > + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/Never" > <wsp:Policy> <sp:WssX509V3Token10 /> </wsp:Policy> @@ -15,7 +15,7 @@ </sp:RecipientToken> <sp:InitiatorToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/AlwaysToRecipient" > + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/AlwaysToRecipient" > <wsp:Policy> <sp:WssX509V3Token10 /> </wsp:Policy> @@ -69,8 +69,8 @@ </wsdl:message> <wsdl:portType name="Test"> <wsdl:operation name="Echo"> - <wsdl:input message="tns:EchoInMessage" wsa:Action="http://example.com/ws/2004/09/policy/Test/EchoRequest"/> - <wsdl:output message="tns:EchoOutMessage" wsa:Action="http://example.com/ws/2004/09/policy/Test/EchoResponse"/> + <wsdl:input message="tns:EchoInMessage"/> + <wsdl:output message="tns:EchoOutMessage"/> </wsdl:operation> </wsdl:portType> Index: R4W2R1.wsdl =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W2R1.wsdl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- R4W2R1.wsdl 9 Mar 2007 01:19:30 -0000 1.1 +++ R4W2R1.wsdl 8 Jun 2007 05:48:43 -0000 1.2 @@ -2,15 +2,11 @@ <wsdl20:description targetNamespace="http://example.com/ws/2004/09/policy" xmlns:tns="http://example.com/ws/2004/09/policy" xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl20="http://www.w3.org/2006/01/wsdl" xmlns:wsoap="http://www.w3.org/2006/01/wsdl/soap" + xmlns:wsdl20="http://www.w3.org/ns/wsdl" xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" 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:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd - http://www.w3.org/2006/01/wsdl http://www.w3.org/2006/03/wsdl/wsdl20.xsd - http://www.w3.org/2006/01/wsdl/soap http://www.w3.org/2006/03/wsdl/soap.xsd - http://www.w3.org/ns/ws-policy http://www.w3.org/2002/ws/policy/ns/ws-policy"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <wsp:Policy wsu:Id="A11Endpoint"> <!-- Asymmetric Policy A11 - X509 with mutual authentication and AES 256 --> @@ -19,7 +15,7 @@ <sp:RecipientToken> <wsp:Policy> <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/Never"> + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/Never"> <wsp:Policy> <sp:WssX509V3Token10/> </wsp:Policy> @@ -29,7 +25,7 @@ <sp:InitiatorToken> <wsp:Policy> <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/AlwaysToRecipient"> + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/AlwaysToRecipient"> <wsp:Policy> <sp:WssX509V3Token10/> </wsp:Policy> @@ -64,7 +60,7 @@ <sp:RecipientToken> <wsp:Policy> <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/IncludeToken/Never"> + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/IncludeToken/Never"> <wsp:Policy> <sp:WssX509V3Token10/> </wsp:Policy> @@ -74,7 +70,7 @@ <sp:InitiatorToken> <wsp:Policy> <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-trust/200512/ws-securitypolicy/AlwaysToRecipient"> + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512/AlwaysToRecipient"> <wsp:Policy> <sp:WssX509V3Token10/> </wsp:Policy> @@ -120,7 +116,7 @@ </wsdl20:types> <wsdl20:binding name="A11Binding" interface="tns:Test" - type="http://www.w3.org/2006/01/wsdl/soap" + type="http://www.w3.org/ns/wsdl/soap" wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"> <wsp:PolicyReference URI="#A11Endpoint" wsdl20:required="true"/> <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest"> @@ -134,7 +130,7 @@ </wsdl20:binding> <wsdl20:binding name="A12Binding" interface="tns:Test" - type="http://www.w3.org/2006/01/wsdl/soap" + type="http://www.w3.org/ns/wsdl/soap" wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/"> <wsp:PolicyReference URI="#A12Endpoint" wsdl20:required="true"/> <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest"> Index: R4W1.wsdl =================================================================== RCS file: /sources/public/2006/ws/policy/interop/Round4/external-attachment/R4W1.wsdl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- R4W1.wsdl 9 Mar 2007 19:07:15 -0000 1.2 +++ R4W1.wsdl 8 Jun 2007 05:48:43 -0000 1.3 @@ -14,8 +14,8 @@ </wsdl:message> <wsdl:portType name="Test"> <wsdl:operation name="Echo"> -<wsdl:input message="tns:EchoInMessage" wsa:Action="http://example.com/ws/2004/09/policy/Test/EchoRequest"/> -<wsdl:output message="tns:EchoOutMessage" wsa:Action="http://example.com/ws/2004/09/policy/Test/EchoResponse"/> +<wsdl:input message="tns:EchoInMessage"/> +<wsdl:output message="tns:EchoOutMessage"/> </wsdl:operation> </wsdl:portType> <wsdl:binding name="A11Binding" type="tns:Test">
Received on Friday, 8 June 2007 05:48:49 UTC