2006/ws/policy ws-policy-framework.xml,1.130,1.131 ws-policy-framework.html,1.106,1.107

Update of /sources/public/2006/ws/policy
In directory hutz:/tmp/cvs-serv12048

Modified Files:
	ws-policy-framework.xml ws-policy-framework.html 
Log Message:
Changes to align with the OASIS WS-SecurityPolicy specification. Issue 4318, editor's AI 242

Index: ws-policy-framework.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework.xml,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- ws-policy-framework.xml	29 Mar 2007 10:20:40 -0000	1.130
+++ ws-policy-framework.xml	26 Apr 2007 21:06:26 -0000	1.131
@@ -123,7 +123,7 @@
                     <eg xml:space="preserve">
                 
 (01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
 (03)     &lt;wsp:All&gt;
@@ -261,7 +261,7 @@
                                 <code>sp</code>
                             </td>
                             <td>
-                                <code>http://schemas.xmlsoap.org/ws/2005/07/securitypolicy</code>
+                                <code>http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702</code>
                             </td>
                             <td>[<bibref ref="WS-SecurityPolicy"/>]</td>
                         </tr>
@@ -631,7 +631,7 @@
 
                 <p>For example, the following is the normal form of a policy expression.</p>
                 <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
 (03)     &lt;wsp:All&gt;
@@ -797,13 +797,13 @@
                     </glist>
                     <p>For example, the following compact policy expression:</p>
                     <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;sp:IncludeTimestamp wsp:Optional="true" /&gt;
 (03) &lt;/wsp:Policy&gt;</eg>
                     <p>is equivalent to the following normal form policy expression:</p>
                     <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
 (03)     &lt;wsp:All&gt;
@@ -895,7 +895,7 @@
                     <p>For example, consider the following policy expression with nested policy
                         expressions in a compact form:</p>
                     <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;sp:TransportBinding&gt;
 (03)     &lt;wsp:Policy&gt;
@@ -909,7 +909,9 @@
 (11)       &lt;/sp:AlgorithmSuite&gt;
 (12)       &lt;sp:TransportToken&gt;
 (13)         &lt;wsp:Policy&gt;
-(14)           &lt;sp:HttpsToken RequireClientCertificate="false" /&gt;
+               &lt;sp:HttpsToken&gt;
+                 &lt;wsp:Policy/&gt;
+               &lt;/sp:HttpsToken&gt;
 (15)         &lt;/wsp:Policy&gt;
 (16)       &lt;/sp:TransportToken&gt;
            &lt;!-- Details omitted for readability --&gt;
@@ -926,7 +928,7 @@
                         algorithm suite assertion.</p>
                     <p>The example above is equivalent to the following:</p>
                     <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
 (03)     &lt;wsp:All&gt;
@@ -939,7 +941,9 @@
 (10)           &lt;/sp:AlgorithmSuite&gt;
 (11)           &lt;sp:TransportToken&gt;
 (12)             &lt;wsp:Policy&gt;
-(13)               &lt;sp:HttpsToken RequireClientCertificate="false" /&gt;
+                   &lt;sp:HttpsToken&gt;
+                     &lt;wsp:Policy/&gt;
+                   &lt;/sp:HttpsToken&gt;
 (14)             &lt;/wsp:Policy&gt;
 (15)           &lt;/sp:TransportToken&gt;
                &lt;!-- Details omitted for readability --&gt;
@@ -956,7 +960,9 @@
 (26)           &lt;/sp:AlgorithmSuite&gt;
 (27)           &lt;sp:TransportToken&gt;
 (28)             &lt;wsp:Policy&gt;
-(29)               &lt;sp:HttpsToken RequireClientCertificate="false" /&gt;
+                   &lt;sp:HttpsToken&gt;
+                     &lt;wsp:Policy/&gt;
+                   &lt;/sp:HttpsToken&gt;
 (30)             &lt;/wsp:Policy&gt;
 (31)           &lt;/sp:TransportToken&gt;
                &lt;!-- Details omitted for readability --&gt;
@@ -1379,7 +1385,7 @@
                                 <eg xml:space="preserve" role="needs-numbering">&lt;wsp:ExactlyOne /&gt;</eg>
                                 <p>For example, given the following compact policy expression:</p>
                                 <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;sp:RequireDerivedKeys wsp:Optional="true" /&gt;
 (03)   &lt;wsp:ExactlyOne&gt;
@@ -1397,7 +1403,7 @@
                         for the assertions in Lines (04-05) yields:</p>
 
                     <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
 (03)     &lt;wsp:All&gt; &lt;!-- @wsp:Optional alternative with assertion --&gt;
@@ -1420,7 +1426,7 @@
                         and distributing <el>wsp:All</el> over <el>wsp:ExactlyOne</el> yields the
                         following normal form policy expression:</p>
                     <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
 (03)     &lt;wsp:All&gt;
@@ -1583,7 +1589,7 @@
                         location. The second and third expressions reference the first expression by
                         URI indicating the referenced expression is within the document. </p>
                     <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;"
         xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
         wsu:Id="Protection" &gt;
@@ -1592,14 +1598,14 @@
 (04) &lt;/wsp:Policy&gt;
 </eg>
                     <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;wsp:PolicyReference URI="#Protection" /&gt;
 (03)   &lt;sp:OnlySignEntireHeadersAndBody /&gt;
 (04) &lt;/wsp:Policy&gt;
 </eg>
                     <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
 (02)   &lt;sp:IncludeTimestamp /&gt;
 (03)   &lt;wsp:PolicyReference URI="#Protection" /&gt;
@@ -1777,7 +1783,7 @@
                         def="policy_assertion_type">policy assertion type</termref>.</p>
                 <p>As an example of intersection, consider two input policies in normal form:</p>
                 <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
        &lt;!-- Policy P1 --&gt;
 (02)   &lt;wsp:ExactlyOne&gt;
@@ -1813,7 +1819,7 @@
                     on assertion type and delegates parameter processing to domain-specific
                     processing.</p>
                 <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
        &lt;!-- Policy P2 --&gt;
 (02)   &lt;wsp:ExactlyOne&gt;
@@ -1835,7 +1841,7 @@
                     (A3) in policy P2, the intersection is a policy with a single alternative that
                     contains all of the assertions in A2 and in A3.</p>
                 <eg xml:space="preserve">(01) &lt;wsp:Policy
-        xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="&nsuri;" &gt;
        &lt;!-- Intersection of P1 and P2 --&gt;
 (02)   &lt;wsp:ExactlyOne&gt;
@@ -2308,11 +2314,11 @@
                             href="http://uddi.org/pubs/uddi_v3.htm">latest version of the UDDI
                         3.0</loc> specification is available at http://uddi.org/pubs/uddi_v3.htm. </bibl>
                     <bibl id="WS-SecurityPolicy" key="WS-SecurityPolicy"
-                        href="http://www.oasis-open.org/committees/download.php/15979/oasis-wssx-ws-securitypolicy-1.0.pdf">
+                        href="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
                         <titleref>WS-SecurityPolicy v1.0</titleref>, A. Nadalin, M. Gudgin, A.
                         Barbir, and H. Granqvist, Editors. Organization for the Advancement of
                         Structured Information Standards, 8 December 2005. Available at
-                        http://www.oasis-open.org/committees/download.php/15979/oasis-wssx-ws-securitypolicy-1.0.pdf. </bibl>
+                        http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702. </bibl>
                     <bibl id="WSDL11" key="WSDL 1.1"
                         href="http://www.w3.org/TR/2001/NOTE-wsdl-20010315">
                         <titleref>Web Services Description Language (WSDL) 1.1</titleref>, E.
@@ -2362,7 +2368,7 @@
                 below:</p>
             <ulist>
                 <item>
-                    <p>None.</p>
+                    <p>Editorial changes to align with the OASIS WS-SecurityPolicy specification.</p>
                 </item>
             </ulist>
         </inform-div1>
@@ -3129,7 +3135,17 @@
                     <tr>
                         <td>20070328</td>
                         <td>FS</td>
-                        <td>Re-formatted the first example in <specref ref="Policy_Assertion_Nesting"/>. </td></tr>
+                        <td>Re-formatted the first example in <specref ref="Policy_Assertion_Nesting"/>. </td>
+                    </tr>
+                    <tr>
+                        <td>20070426</td>
+                        <td>PY</td>
+                        <td>Editorial changes to align with the OASIS WS-SecurityPolicy specification.
+                            For <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4318">issue 4318</loc>.
+                            Editors' action 
+                            <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/242">242</loc>.
+                        </td>
+                    </tr>
                 </tbody>
             </table>
         </inform-div1>

Index: ws-policy-framework.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework.html,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- ws-policy-framework.html	28 Mar 2007 00:38:57 -0000	1.106
+++ ws-policy-framework.html	26 Apr 2007 21:06:26 -0000	1.107
@@ -39,6 +39,51 @@
   font-variant: small-caps;
 }
 
+
+
+.boxedtext {
+   border: solid #bebebe 1px;
+   margin: 2em 1em 1em 2em;
+ }
+
+.principle, .practice, .constraint, .property, div.story {
+   margin: 1.5em 0.5em 1em 1em;
+ }
+
+.principlelab, .constraintlab,
+.propertylab, .practicelab,
+.storylab {
+   margin: 1.5em 0.5em 1em 1em;
+   font-weight: bold;
+   font-style: italic;
+ }
+
+.principlelab  { background: #f7ebd7 }
+.constraintlab { background: #becece }
+.propertylab   { background: #f7ebd7 }
+.practicelab   { background: #dfffff }
+.storylab      { background: #005a9c; color: #fff; }
+
+/* Make sure the relative spacing stuff only applies to 'screen'
+   because IE has bugs when it comes to printing relative things. */
+
+@media screen {
+
+.principle, .practice, .constraint, .property, div.story {
+   position: relative;
+   top: -2em;
+   padding: 0;
+   margin: 1.5em 0.5em -1em 1em;
+}
+
+.principlelab, .constraintlab,
+.propertylab, .practicelab,
+.storylab {
+   position: relative;
+   padding: 0 0.5em;
+   top: -1.5em;
+ }
+
 div.exampleInner pre { margin-left: 1em;
                        margin-top: 0em; margin-bottom: 0em}
 div.exampleOuter {border: 4px double gray;
@@ -139,7 +184,7 @@
 <p style="text-align: left" class="exampleHead"><a name="ex-wsp-use-security-assertations" id="ex-wsp-use-security-assertations"></a><i><span>Example 1-1. </span>Use of Web Services Policy with security policy assertions.</i></p><div class="exampleInner"><pre>
                 
 (01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
 (03)     &lt;wsp:All&gt;
@@ -189,7 +234,7 @@
                     prefix is arbitrary and not semantically significant (see [<cite><a href="#XML-NS">XML Namespaces</a></cite>]).</p><a name="nsprefix"></a><table summary="Namespace prefixes usage in this specification" border="1" cellspacing="0" cellpadding="5"><caption>Table 2-1. Prefixes and Namespaces used in this specification</caption><thead><tr><th rowspan="1" colspan="1">Prefix</th><th rowspan="1" colspan="1">Namespace</th><th rowspan="1" colspan="1">Specification</th></tr></thead><tbody><tr><td rowspan="1" colspan="1">
                                 <code>sp</code>
                             </td><td rowspan="1" colspan="1">
-                                <code>http://schemas.xmlsoap.org/ws/2005/07/securitypolicy</code>
+                                <code>http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702</code>
                             </td><td rowspan="1" colspan="1">[<cite><a href="#WS-SecurityPolicy">WS-SecurityPolicy</a></cite>]</td></tr><tr><td rowspan="1" colspan="1">
                                 <code>wsp</code>
                             </td><td rowspan="1" colspan="1">
@@ -232,7 +277,7 @@
          <a href="#ignorable_policy_assertion">ignorable policy assertion</a>
       </dt><dd><p>An
                             <b>ignorable policy assertion</b> is an assertion that may be
-                        ignored for policy intersection (as defined in <a href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection">4.5 Policy
+                        ignored for policy intersection (as defined in <a href="http://www.w3.org/TR/ws-policy#Policy_Intersection">4.5 Policy
                             Intersection</a>).</p></dd><dt class="label">
          <a href="#nested_policy_expression">nested policy expression</a>
       </dt><dd><p>A <b>nested policy expression</b>
@@ -436,7 +481,7 @@
                         policy expression</a>, the nested policy expression
                     <span class="rfc2119">MUST</span> contain at most one policy alternative (see <a href="#Policy_Assertion_Nesting"><b>4.3.2 Policy Assertion Nesting</b></a>).</p><p>To simplify processing and improve interoperability, the normal form of a policy
                     expression <span class="rfc2119">SHOULD</span> be used where practical.</p><p>For example, the following is the normal form of a policy expression.</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
 (03)     &lt;wsp:All&gt;
@@ -531,11 +576,11 @@
                                     it with a value of false. Policy expressions should not include
                                     this attribute with a value of false, but policy parsers must
                                     accept this attribute with a value of false.</p></dd></dl><p>For example, the following compact policy expression:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;sp:IncludeTimestamp wsp:Optional="true" /&gt;
 (03) &lt;/wsp:Policy&gt;</pre></div><p>is equivalent to the following normal form policy expression:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
 (03)&nbsp; &nbsp; &nbsp;&lt;wsp:All&gt;
@@ -575,7 +620,7 @@
                                     assertions.</p><p>Note: This specification does not define processing for arbitrary
                                         <code>wsp:Policy</code> Element Information Items in the
                                     descendants of an assertion parameter, e.g., in the <strong>[children]</strong> property of one of
-                                    the <strong>[children]</strong> as in: <div class="exampleInner"><pre>
+                                    the <strong>[children]</strong> as in:</p><div class="exampleInner"><pre>
 (01)&lt;wsp:Policy&gt;
 (02)&nbsp; &nbsp;&lt;Lorem&gt;
 (03)&nbsp; &nbsp;    &lt;Ipsum&gt;
@@ -584,7 +629,7 @@
 (06)           &lt;/wsp:Policy&gt;
 (07)       &lt;/Ipsum&gt;
 (08)   &lt;/Lorem&gt;
-(09)&lt;/wsp:Policy&gt;</pre></div>.</p></dd></dl><p>Policy assertions containing a nested policy expression are normalized
+(09)&lt;/wsp:Policy&gt;</pre></div></dd></dl><p>Policy assertions containing a nested policy expression are normalized
                         recursively. The nesting of a policy expression (and a <code>wsp:Policy</code>
                         child) is retained in the normal form, but in the normal form, each nested
                         policy expression contains at most one policy alternative. If an assertion A
@@ -597,7 +642,7 @@
                         have branches etc, in the normal form, a policy is a stump with straight
                         vines.</p><p>For example, consider the following policy expression with nested policy
                         expressions in a compact form:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;sp:TransportBinding&gt;
 (03)&nbsp; &nbsp; &nbsp;&lt;wsp:Policy&gt;
@@ -611,7 +656,9 @@
 (11)&nbsp; &nbsp; &nbsp; &nbsp;&lt;/sp:AlgorithmSuite&gt;
 (12)&nbsp; &nbsp; &nbsp; &nbsp;&lt;sp:TransportToken&gt;
 (13)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;wsp:Policy&gt;
-(14)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;sp:HttpsToken RequireClientCertificate="false" /&gt;
+               &lt;sp:HttpsToken&gt;
+                 &lt;wsp:Policy/&gt;
+               &lt;/sp:HttpsToken&gt;
 (15)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;/wsp:Policy&gt;
 (16)&nbsp; &nbsp; &nbsp; &nbsp;&lt;/sp:TransportToken&gt;
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;!-- Details omitted for readability --&gt;
@@ -625,7 +672,7 @@
                         example above, the behavior indicated by the transport binding assertion
                         requires the behavior indicated by one of the assertions within the
                         algorithm suite assertion.</p><p>The example above is equivalent to the following:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
 (03)&nbsp; &nbsp; &nbsp;&lt;wsp:All&gt;
@@ -638,7 +685,9 @@
 (10)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;/sp:AlgorithmSuite&gt;
 (11)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;sp:TransportToken&gt;
 (12)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;wsp:Policy&gt;
-(13)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;sp:HttpsToken RequireClientCertificate="false" /&gt;
+                   &lt;sp:HttpsToken&gt;
+                     &lt;wsp:Policy/&gt;
+                   &lt;/sp:HttpsToken&gt;
 (14)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;/wsp:Policy&gt;
 (15)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;/sp:TransportToken&gt;
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;!-- Details omitted for readability --&gt;
@@ -655,7 +704,9 @@
 (26)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;/sp:AlgorithmSuite&gt;
 (27)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;sp:TransportToken&gt;
 (28)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;wsp:Policy&gt;
-(29)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;sp:HttpsToken RequireClientCertificate="false" /&gt;
+                   &lt;sp:HttpsToken&gt;
+                     &lt;wsp:Policy/&gt;
+                   &lt;/sp:HttpsToken&gt;
 (30)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;/wsp:Policy&gt;
 (31)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;/sp:TransportToken&gt;
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&lt;!-- Details omitted for readability --&gt;
@@ -846,7 +897,7 @@
 (05) &nbsp; &lt;/wsp:ExactlyOne&gt;
 (06) &nbsp; &lt;wsp:ExactlyOne /&gt;
 (07) &lt;/wsp:All&gt;</pre></div><p>is equivalent to:</p><div class="exampleInner"><pre>(01) &lt;wsp:ExactlyOne /&gt;</pre></div><p>For example, given the following compact policy expression:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;sp:RequireDerivedKeys wsp:Optional="true" /&gt;
 (03)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
@@ -857,7 +908,7 @@
                             <code>@wsp:Optional</code> in Line (02), and distributing <code>wsp:All</code>
                         over <code>wsp:ExactlyOne</code> per Section <a href="#Policy_Operators"><b>4.3.3 Policy Operators</b></a>
                         for the assertions in Lines (04-05) yields:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
 (03)&nbsp; &nbsp; &nbsp;&lt;wsp:All&gt; &lt;!-- @wsp:Optional alternative with assertion --&gt;
@@ -877,7 +928,7 @@
                         the two alternatives in Lines (03-06) in the second listing.</p><p>Finally, noting that <code>wsp:Policy</code> is equivalent to <code>wsp:All</code>,
                         and distributing <code>wsp:All</code> over <code>wsp:ExactlyOne</code> yields the
                         following normal form policy expression:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
 (03)&nbsp; &nbsp; &nbsp;&lt;wsp:All&gt;
@@ -969,7 +1020,7 @@
                         assertions. The expression is given an identifier but not a fully qualified
                         location. The second and third expressions reference the first expression by
                         URI indicating the referenced expression is within the document. </p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 &nbsp; &nbsp; &nbsp; &nbsp; wsu:Id="Protection" &gt;
@@ -977,13 +1028,13 @@
 (03)&nbsp; &nbsp;&lt;sp:ProtectTokens wsp:Optional="true" /&gt;
 (04) &lt;/wsp:Policy&gt;
 </pre></div><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;wsp:PolicyReference URI="#Protection" /&gt;
 (03)&nbsp; &nbsp;&lt;sp:OnlySignEntireHeadersAndBody /&gt;
 (04) &lt;/wsp:Policy&gt;
 </pre></div><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;sp:IncludeTimestamp /&gt;
 (03)&nbsp; &nbsp;&lt;wsp:PolicyReference URI="#Protection" /&gt;
@@ -1045,14 +1096,14 @@
                             the nested policy expression of the other.</p></li></ul><p><a title="policy assertion parameter" href="#policy_assertion_parameter">Assertion parameters</a> are not
                     part of the compatibility determination defined herein but may be part of other,
                     domain-specific compatibility processing. </p><ul><li><p>If the mode is strict, two <a title="policy alternative" href="#policy_alternative">policy
-                                alternatives</a> A and B are compatible: <ul><li><p>if each assertion in A is compatible with an assertion in B,
+                                alternatives</a> A and B are compatible: </p><ul><li><p>if each assertion in A is compatible with an assertion in B,
                                         and</p></li><li><p>if each assertion in B is compatible with an assertion in
-                                    A.</p></li></ul></p><p>If the mode is lax, two <a title="policy alternative" href="#policy_alternative">policy
-                                alternatives</a> A and B are compatible: <ul><li><p>if each assertion in A that is not an <a title="ignorable policy assertion" href="#ignorable_policy_assertion">ignorable policy
+                                    A.</p></li></ul><p>If the mode is lax, two <a title="policy alternative" href="#policy_alternative">policy
+                                alternatives</a> A and B are compatible: </p><ul><li><p>if each assertion in A that is not an <a title="ignorable policy assertion" href="#ignorable_policy_assertion">ignorable policy
                                             assertion</a> is compatible with an assertion in
                                         B, and</p></li><li><p>if each assertion in B that is not an <a title="ignorable policy assertion" href="#ignorable_policy_assertion">ignorable policy
                                             assertion</a> is compatible with an assertion in
-                                        A.</p></li></ul></p><p>If two alternatives are compatible, their intersection is an alternative
+                                        A.</p></li></ul><p>If two alternatives are compatible, their intersection is an alternative
                             containing all of the assertions in both alternatives.</p></li><li><p>Two <a title="policy" href="#policy">policies</a> are compatible if an
                             alternative in one is compatible with an alternative in the other. If
                             two policies are compatible, their intersection is the set of the
@@ -1060,7 +1111,7 @@
                             alternative from each policy. If two policies are not compatible, their
                             intersection has no policy alternatives.</p></li></ul><p>See Section <a href="#rPolicy_Alternative"><b>3.2 Policy Alternative</b></a> for mechanisms for determining
                     the aggregate behavior indicated by multiple assertions of the same <a title="policy assertion type" href="#policy_assertion_type">policy assertion type</a>.</p><p>As an example of intersection, consider two input policies in normal form:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 &nbsp; &nbsp; &nbsp; &nbsp;&lt;!-- Policy P1 --&gt;
 (02)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
@@ -1092,7 +1143,7 @@
                     (Line 12 and Line 16) and parameters (Lines 13-14 and Line 17).</p><p>As this example illustrates, compatibility between two policy assertions is based
                     on assertion type and delegates parameter processing to domain-specific
                     processing.</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 &nbsp; &nbsp; &nbsp; &nbsp;&lt;!-- Policy P2 --&gt;
 (02)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
@@ -1112,7 +1163,7 @@
                     — the assertions have the same type — as another alternative
                     (A3) in policy P2, the intersection is a policy with a single alternative that
                     contains all of the assertions in A2 and in A3.</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
-&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+&nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
 &nbsp; &nbsp; &nbsp; &nbsp;&lt;!-- Intersection of P1 and P2 --&gt;
 (02)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
@@ -1352,10 +1403,10 @@
                         Standards, 14 October 2003. This version of the UDDI Version 3.0 is
                         http://uddi.org/pubs/uddi-v3.0.1-20031014.htm. The <a href="http://uddi.org/pubs/uddi_v3.htm">latest version of the UDDI
                         3.0</a> specification is available at http://uddi.org/pubs/uddi_v3.htm. </dd><dt class="label"><a name="WS-SecurityPolicy"></a>[WS-SecurityPolicy] </dt><dd>
-                        <cite><a href="http://www.oasis-open.org/committees/download.php/15979/oasis-wssx-ws-securitypolicy-1.0.pdf">WS-SecurityPolicy v1.0</a></cite>, A. Nadalin, M. Gudgin, A.
+                        <cite><a href="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">WS-SecurityPolicy v1.0</a></cite>, A. Nadalin, M. Gudgin, A.
                         Barbir, and H. Granqvist, Editors. Organization for the Advancement of
                         Structured Information Standards, 8 December 2005. Available at
-                        http://www.oasis-open.org/committees/download.php/15979/oasis-wssx-ws-securitypolicy-1.0.pdf. </dd><dt class="label"><a name="WSDL11"></a>[WSDL 1.1] </dt><dd>
+                        http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702. </dd><dt class="label"><a name="WSDL11"></a>[WSDL 1.1] </dt><dd>
                         <cite><a href="http://www.w3.org/TR/2001/NOTE-wsdl-20010315">Web Services Description Language (WSDL) 1.1</a></cite>, E.
                         Christensen, et al, Authors. World Wide Web Consortium, March 2001.
                         Available at http://www.w3.org/TR/2001/NOTE-wsdl-20010315. </dd><dt class="label"><a name="WSDL20"></a>[WSDL 2.0 Core Language] </dt><dd>
@@ -1397,7 +1448,7 @@
     acknowledged.
   </p></div><div class="div1">
 <h2><a name="change-description" id="change-description"></a>D. Changes in this Version of the Document (Non-Normative)</h2><p>A list of major editorial changes since the Working Draft dated 28 February, 2007 is
-                below:</p><ul><li><p>None.</p></li></ul></div><div class="div1">
+                below:</p><ul><li><p>Editorial changes to align with the OASIS WS-SecurityPolicy specification.</p></li></ul></div><div class="div1">
 <h2><a name="change-log" id="change-log"></a>E. Web Services Policy 1.5 - Framework Change Log (Non-Normative)</h2><a name="ws-policy-framework-changelog-table"></a><table border="1"><tbody><tr><th rowspan="1" colspan="1">Date</th><th rowspan="1" colspan="1">Author</th><th rowspan="1" colspan="1">Description</th></tr><tr><td rowspan="1" colspan="1">20060712</td><td rowspan="1" colspan="1">ASV</td><td rowspan="1" colspan="1">Updated the list of editors. Completed action items <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action12">12</a>, <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action16">16</a> and <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action20">20</a> from the Austin F2F.</td></tr><tr><td rowspan="1" colspan="1">20060718</td><td rowspan="1" colspan="1">DBO</td><td rowspan="1" colspan="1">Completed action items: RFC2606 for domain names <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action09">09</a> (note: PLH had already done but it ddn't show up in the
                             change log) </td></tr><tr><td rowspan="1" colspan="1">20060726</td><td rowspan="1" colspan="1">ASV</td><td rowspan="1" colspan="1">Incorporated the <a href="http://lists.w3.org/Archives/Public/public-ws-policy/2006Jul/0107.html">XML namespace URI versioning policy</a> adopted by the WG. </td></tr><tr><td rowspan="1" colspan="1">20060803</td><td rowspan="1" colspan="1">PY</td><td rowspan="1" colspan="1">Completed Issue: <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3551">3551</a>
                             Misc updates throughout. </td></tr><tr><td rowspan="1" colspan="1">20060808</td><td rowspan="1" colspan="1">PY</td><td rowspan="1" colspan="1">Completed action item: <a href="http://www.w3.org/2006/07/13-ws-policy-minutes.html#action20">20</a> to highlight infoset terms uniformly. </td></tr><tr><td rowspan="1" colspan="1">20060808</td><td rowspan="1" colspan="1">DBO</td><td rowspan="1" colspan="1">Completed action items: <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action15">15</a> as early as possible in the doc, use the definition that
@@ -1442,4 +1493,8 @@
                             to <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4379">issue 4379</a>
                             with minor editorial revision (editors action 
                             <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/181">181</a>).
-                            </td></tr><tr><td rowspan="1" colspan="1">20070321</td><td rowspan="1" colspan="1">ASV</td><td rowspan="1" colspan="1">Reset Section <a href="#change-description"><b>D. Changes in this Version of the Document</b></a>. </td></tr><tr><td rowspan="1" colspan="1">20070328</td><td rowspan="1" colspan="1">FS</td><td rowspan="1" colspan="1">Re-formatted the first example in <a href="#Policy_Assertion_Nesting"><b>4.3.2 Policy Assertion Nesting</b></a>. </td></tr></tbody></table><br></div></div></body></html>
\ No newline at end of file
+                            </td></tr><tr><td rowspan="1" colspan="1">20070321</td><td rowspan="1" colspan="1">ASV</td><td rowspan="1" colspan="1">Reset Section <a href="#change-description"><b>D. Changes in this Version of the Document</b></a>. </td></tr><tr><td rowspan="1" colspan="1">20070328</td><td rowspan="1" colspan="1">FS</td><td rowspan="1" colspan="1">Re-formatted the first example in <a href="#Policy_Assertion_Nesting"><b>4.3.2 Policy Assertion Nesting</b></a>. </td></tr><tr><td rowspan="1" colspan="1">20070426</td><td rowspan="1" colspan="1">PY</td><td rowspan="1" colspan="1">Editorial changes to align with the OASIS WS-SecurityPolicy specification.
+                            For <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4318">issue 4318</a>.
+                            Editors' action 
+                            <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/242">242</a>.
+                        </td></tr></tbody></table><br></div></div></body></html>
\ No newline at end of file

Received on Thursday, 26 April 2007 21:06:34 UTC