2006/ws/policy/interop/Round3/WSDL20 Round3.wsdl,1.1,1.2

Update of /sources/public/2006/ws/policy/interop/Round3/WSDL20
In directory hutz:/tmp/cvs-serv28139/interop/Round3/WSDL20

Modified Files:
	Round3.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: Round3.wsdl
===================================================================
RCS file: /sources/public/2006/ws/policy/interop/Round3/WSDL20/Round3.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Round3.wsdl	7 Feb 2007 23:56:55 -0000	1.1
+++ Round3.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="T1Endpoint">
         <!-- Policy alternative T1 - Anonymous client -->
@@ -64,7 +60,7 @@
         <sp:SignedSupportingTokens>
             <wsp:Policy>
                 <sp:UsernameToken
-                    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:WssUsernameToken10/>
                     </wsp:Policy>
@@ -85,7 +81,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>
@@ -95,7 +91,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>
@@ -130,7 +126,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>
@@ -140,7 +136,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>
@@ -186,14 +182,14 @@
     </wsdl20:types>
     
     <wsdl20:interface name="Test">
-        <wsdl20:operation name="Echo" pattern="http://www.w3.org/2006/01/wsdl/in-out">
+        <wsdl20:operation name="Echo" pattern="http://www.w3.org/ns/wsdl/in-out">
             <wsdl20:input element="tns:EchoRequest" />
             <wsdl20:output element="tns:EchoResponse" />
         </wsdl20:operation>
     </wsdl20:interface>
     
     <wsdl20:binding name="NoSecurityBinding" 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> </wsdl20:input>
@@ -201,7 +197,7 @@
         </wsdl20:operation>
     </wsdl20:binding>
     
-    <wsdl20:binding name="T1Binding" interface="tns:Test" type="http://www.w3.org/2006/01/wsdl/soap"
+    <wsdl20:binding name="T1Binding" interface="tns:Test" type="http://www.w3.org/ns/wsdl/soap"
         wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
         <wsp:PolicyReference URI="#T1Endpoint" wsdl20:required="true"/>
         <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest">
@@ -210,7 +206,7 @@
         </wsdl20:operation>
     </wsdl20:binding>
     
-    <wsdl20:binding name="T3Binding" interface="tns:Test" type="http://www.w3.org/2006/01/wsdl/soap"
+    <wsdl20:binding name="T3Binding" interface="tns:Test" type="http://www.w3.org/ns/wsdl/soap"
         wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP/">
         <wsp:PolicyReference URI="#T3Endpoint" wsdl20:required="true"/>
         <wsdl20:operation ref="tns:Echo" wsoap:action="http://example.com/ws/2004/09/policy/Test/EchoRequest">
@@ -220,7 +216,7 @@
     </wsdl20:binding>
     
     <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">
@@ -234,7 +230,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">

Received on Friday, 8 June 2007 05:48:51 UTC