W3C home > Mailing lists > Public > public-ws-policy-eds@w3.org > May 2007

2006/ws/policy ws-policy-framework-diff20070330.html,1.2,1.3 ws-policy-framework-diff20070330.xml,1.2,1.3 ws-policy-attachment-diff20070330.xml,1.2,1.3 ws-policy-attachment-diff20070330.html,1.2,1.3

From: Asir Vedamuthu via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 30 May 2007 05:25:07 +0000
To: public-ws-policy-eds@w3.org
Message-Id: <E1HtGgF-000430-AO@lionel-hutz.w3.org>

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

Modified Files:
	ws-policy-framework-diff20070330.html 
	ws-policy-framework-diff20070330.xml 
	ws-policy-attachment-diff20070330.xml 
	ws-policy-attachment-diff20070330.html 
Log Message:
Regenerating the DIFF

Index: ws-policy-attachment-diff20070330.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment-diff20070330.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ws-policy-attachment-diff20070330.xml	1 May 2007 23:30:36 -0000	1.2
+++ ws-policy-attachment-diff20070330.xml	30 May 2007 05:25:04 -0000	1.3
@@ -61,10 +61,10 @@
 </td><td rowspan="1" colspan="1">
 <code>http://www.w3.org/2005/08/addressing</code>
 </td><td rowspan="1" colspan="1">[<bibref ref="WS-Addressing"/>]</td></tr><tr><td rowspan="1" colspan="1">
-<code>wsap</code>
+<code><phrase diff="chg">wsam</phrase></code>
 </td><td rowspan="1" colspan="1">
-<code>http://www.w3.org/2006/05/addressing/wsdl</code>
-</td><td rowspan="1" colspan="1">[<bibref ref="WS-AddressingPolicy"/>]</td></tr><tr><td rowspan="1" colspan="1">
+<code><phrase diff="chg">http://www.w3.org/2007/05/addressing/metadata</phrase></code>
+</td><td rowspan="1" colspan="1">[<bibref ref="WS-AddressingMetadata" diff="chg"/>]</td></tr><tr><td rowspan="1" colspan="1">
 <code>wsdl11</code>
 </td><td rowspan="1" colspan="1">
 <code>http://schemas.xmlsoap.org/wsdl/</code>
@@ -131,6 +131,10 @@
 	      "<rfc2119>OPTIONAL</rfc2119>" in this document are to be
 	      interpreted as described in RFC 2119 [<bibref ref="RFC2119"/>].
 	    </p><p>We introduce the following terms that are used throughout this document:</p><glist><gitem><label>
+         <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="ws-policy-framework.html#collection" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">collection</loc>
+      </label><def><p id="collection"> The items in a
+                            <term>collection</term> in this specification are unordered and may contain duplicates. 
+                   </p></def></gitem><gitem><label>
          <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="#effective_policy" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">effective policy</loc>
       </label><def><p>The
 <term>effective policy</term>, for a given <termref def="policy_subject">policy subject</termref>, is the 
@@ -160,7 +164,8 @@
                         alternatives</termref>. </p></def></gitem><gitem><label>
          <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="ws-policy-framework.html#policy_alternative" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">policy alternative</loc>
       </label><def><p id="policy_alternative">A <term>policy
-                            alternative</term> is a potentially empty collection of <termref def="policy_assertion">policy assertions</termref>.</p></def></gitem><gitem><label>
+                            alternative</term> is a potentially empty 
+                            <termref def="collection"> collection </termref> of <termref def="policy_assertion">policy assertions</termref>.</p></def></gitem><gitem><label>
          <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="ws-policy-framework.html#policy_assertion" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">policy assertion</loc>
       </label><def><p id="policy_assertion">A <term>policy
                         assertion</term> represents a requirement, a capability, or other property
@@ -179,7 +184,7 @@
          <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="ws-policy-framework.html#policy_subject" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">policy subject</loc>
       </label><def><p id="policy_subject">A <term>policy subject</term> is
                         an entity (e.g., an endpoint, message, resource, operation) with which a
-                            <termref def="policy">policy</termref> can be associated. </p></def></gitem></glist><!-- The following definitions are taken from the WS-Policy-Framework document. They need to be here for the automatic glossary generation. Use the value of the ID for the termdef element in ws-policy-framework.xml inside a p element.--><ulist role="termreference"><item><p>ignorable_policy_assertion</p></item><item><p>policy</p></item><item><p>policy_alternative</p></item><item><p>policy_assertion</p></item><item><p>policy_expression</p></item><item><p>policy_subject</p></item><item><p>policy_scope</p></item><item><p>policy_attachment</p></item></ulist></div2><div2 id="Example"><head>Example</head><p>This specification defines several mechanisms for
+                            <termref def="policy">policy</termref> can be associated. </p></def></gitem></glist><!-- The following definitions are taken from the WS-Policy-Framework document. They need to be here for the automatic glossary generation. Use the value of the ID for the termdef element in ws-policy-framework.xml inside a p element.--><ulist role="termreference"><item><p><phrase diff="add">collection</phrase></p></item><item diff="add"><p>ignorable_policy_assertion</p></item><item><p>policy</p></item><item><p>policy_alternative</p></item><item><p>policy_assertion</p></item><item><p>policy_expression</p></item><item><p>policy_subject</p></item><item><p>policy_scope</p></item><item><p>policy_attachment</p></item></ulist></div2><div2 id="Example"><head>Example</head><p>This specification defines several mechanisms for
 	associating policies (Web Services Policy 1.5 - Framework, [<bibref ref="WS-Policy"/>]) with various XML Web service entities. For
 	brevity, we define two sample <termref def="policy_expression">policy expressions</termref> that the
 	remainder of this document references. </p><p>
@@ -726,11 +731,11 @@
   The annotation of such policy expressions as required extensions using the
                     WSDL-defined extensibility flag <code>@wsdl20:required</code>.</p></item></ulist><p>
 <specref ref="XMLNamespaces"/> lists all the XML Namespaces that are used in this section. (XML
-                elements without a namespace prefix are from the Web Services Policy XML Namespace.)</p><div2 id="wsdl20-example"><head>Example</head><p>The example below illustrates the use of WS-Policy Attachment for WSDL 2.0:</p><example id="table-wsdl20-example"><head>Example Policy Attached to WSDL 2.0</head><eg xml:space="preserve">(01) &lt;wsdl20:description&gt;
+                elements without a namespace prefix are from the Web Services Policy XML Namespace.)</p><div2 id="wsdl20-example"><head>Example</head><p>The example below illustrates the use of WS-Policy Attachment for WSDL 2.0:</p><example id="table-wsdl20-example"><head>Example Policy Attached to WSDL 2.0</head><eg xml:space="preserve"><phrase diff="chg">(01) &lt;wsdl20:description&gt;
 (02) …
 (03)   &lt;wsp:Policy wsu:Id="common"&gt;
 (04)     &lt;mtom:OptimizedMimeSerialization wsp:Optional="true"/&gt;
-(05)     &lt;wsap:UsingAddressing /&gt;
+(05)     &lt;wsam:Addressing&gt;…&lt;/wsam:Addressing&gt;
 (06)   &lt;/wsp:Policy&gt;
 
 (07)   &lt;wsp:Policy wsu:Id="secure"&gt;
@@ -756,7 +761,7 @@
 (25)     &lt;/wsdl20:endpoint&gt;
 (26)   &lt;/wsdl20:service&gt;
 (27) …
-(28) &lt;/wsdl20:description&gt;</eg></example><p>The <code>SecureBinding</code> WSDL binding description describes a binding for
+(28) &lt;/wsdl20:description&gt;</phrase></eg></example><p>The <code>SecureBinding</code> WSDL binding description describes a binding for
                     an interface that provides real-time quotes and book information on securities.
                     (The prefixes <code>wsdl20</code> and <code>tns</code> are used here to denote
                     the Web Services Description Language 2.0 XML Namespace and the target namespace
@@ -776,11 +781,11 @@
                         <code>RealTimeDataPort</code> WSDL endpoint descriptions collectively apply
                     to any message exchange associated with the RealTimeDataPort endpoint. The
                     example below represents the combination of these two <termref def="policy">policies</termref>, that is, the
-                <termref def="effective_policy">effective policy</termref> for the <code>RealTimeDataPort</code> endpoint.</p><example id="table-wsdl20-effective-policy-example"><head>Effective Policy for the RealTimeDataPort endpoint</head><eg xml:space="preserve">(01) &lt;wsp:Policy&gt;
+                <termref def="effective_policy">effective policy</termref> for the <code>RealTimeDataPort</code> endpoint.</p><example id="table-wsdl20-effective-policy-example"><head>Effective Policy for the RealTimeDataPort endpoint</head><eg xml:space="preserve"><phrase diff="chg">(01) &lt;wsp:Policy&gt;
 (02)   &lt;wsp:All&gt;
 (03)     &lt;wsp:Policy&gt;
 (04)       &lt;mtom:OptimizedMimeSerialization wsp:Optional="true"/&gt;
-(05)       &lt;wsap:UsingAddressing /&gt;
+(05)       &lt;wsam:Addressing&gt;…&lt;/wsam:Addressing&gt;
 (06)     &lt;/wsp:Policy&gt;
 (07)     &lt;wsp:Policy&gt;
 (08)       &lt;wsp:ExactlyOne&gt;
@@ -789,7 +794,7 @@
 (11)       &lt;/wsp:ExactlyOne&gt;
 (12)     &lt;/wsp:Policy&gt;
 (13)   &lt;/wsp:All&gt;
-(14) &lt;/wsp:Policy&gt;</eg></example></div2><div2 id="attaching-policy-expressions"><head>Attaching Policy Expressions</head><p>Policy attachment points in a WSDL 2.0 document are:</p><ulist><item><p>
+(14) &lt;/wsp:Policy&gt;</phrase></eg></example></div2><div2 id="attaching-policy-expressions"><head>Attaching Policy Expressions</head><p>Policy attachment points in a WSDL 2.0 document are:</p><ulist><item><p>
 <code>wsdl20:service</code>
 </p></item><item><p>
 <code>wsdl20:endpoint</code>
@@ -1486,12 +1491,13 @@
 	version of Schema Centric XML Canonicalization Version
 	1.0</loc> is available at
 	http://uddi.org/pubs/SchemaCentricCanonicalization.htm.
-      </bibl><bibl xmlns:xlink="http://www.w3.org/1999/xlink" key="WS-Addressing Policy" id="WS-AddressingPolicy" href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple">
-<titleref xlink:type="simple" xlink:actuate="onRequest" xlink:show="new">Web Services Addressing 1.0 - WSDL Binding</titleref>, M. Gudgin, M. Hadley, T.
-        Rogers and Ü. Yalçinalp, Editors. World Wide Web Consortium, 29 May 2006. This version of
-        the Web Services Addressing 1.0 - WSDL Binding is
-        http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/. The <loc href="http://www.w3.org/TR/ws-addr-wsdl" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">latest version of Web Services Addressing 1.0 -
-          WSDL Binding</loc> is available at http://www.w3.org/TR/ws-addr-wsdl. </bibl><bibl xmlns:xlink="http://www.w3.org/1999/xlink" id="WS-MetadataExchange" key="WS-MetadataExchange" href="http://schemas.xmlsoap.org/ws/2004/09/mex/" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple">
+      </bibl><bibl xmlns:xlink="http://www.w3.org/1999/xlink" key="WS-Addressing Metadata" id="WS-AddressingMetadata" href="http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" diff="chg">
+          <titleref xlink:type="simple" xlink:actuate="onRequest" xlink:show="new">Web Services Addressing 1.0 - <phrase diff="add">Metadata</phrase><phrase diff="del">WSDL Binding</phrase></titleref>, M. Gudgin, M. Hadley, T.
+          Rogers and Ü. Yalçinalp, Editors. World Wide Web Consortium, <phrase diff="chg">16 </phrase>May <phrase diff="chg">2007. </phrase>This version of
+          the Web Services Addressing 1.0 - <phrase diff="add">Metadata</phrase><phrase diff="del">WSDL Binding </phrase>is
+          <phrase diff="chg">http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/. </phrase>The <loc href="http://www.w3.org/TR/ws-addr-metadata" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">latest version of Web Services Addressing 1.0 -
+            <phrase diff="add">Metadata</phrase></loc>
+          <phrase diff="del">WSDL Binding </phrase>is available at <phrase diff="chg">http://www.w3.org/TR/ws-addr-metadata. </phrase></bibl><bibl xmlns:xlink="http://www.w3.org/1999/xlink" id="WS-MetadataExchange" key="WS-MetadataExchange" href="http://schemas.xmlsoap.org/ws/2004/09/mex/" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple">
 <titleref xlink:type="simple" xlink:actuate="onRequest" xlink:show="new">Web Services Metadata Exchange
 	(WS-MetadataExchange)</titleref>, K. Ballinger, et al,
 	Authors. BEA Systems Inc., Computer Associates International,
@@ -1630,8 +1636,8 @@
     on public-ws-policy@w3.org</loc> are also gratefully
     acknowledged.
   </p></inform-div1><inform-div1 id="change-description"><head>Changes in this Version of the Document</head><p>A list of major editorial changes since the Working Draft dated <phrase diff="chg">30 March, </phrase>2007
-      is below:</p><ulist><item><p><phrase diff="add">Editorial</phrase><phrase diff="del">Aligned the UDDI </phrase><phrase diff="chg">changes to align </phrase>with the <phrase diff="add">OASIS</phrase><phrase diff="del">XML namespace name of the
-          Web Services </phrase><phrase diff="chg">WS-SecurityPolicy specification.</phrase></p></item></ulist></inform-div1><inform-div1 id="change-log"><head>Web Services Policy 1.5 - Attachment Change Log</head><table id="ws-policy-attachment-changelog-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><!-- template
+      is below:</p><ulist><item><p><phrase diff="add">Editorial</phrase><phrase diff="del">Aligned the UDDI </phrase><phrase diff="chg">changes to align </phrase>with the <phrase diff="chg">OASIS WS-SecurityPolicy </phrase><phrase diff="add">specification.</phrase></p></item><item diff="add"><p><phrase diff="add">Editorial</phrase><phrase diff="del">name </phrase><phrase diff="add">changes to align with</phrase><phrase diff="del">of </phrase>the
+          <phrase diff="del">Web </phrase><phrase diff="chg">W3C </phrase><phrase diff="add">WS-Addressing 1.0</phrase><phrase diff="del">Policy </phrase><phrase diff="add">Metadata specification.</phrase><phrase diff="del">language.</phrase></p></item></ulist></inform-div1><inform-div1 id="change-log"><head>Web Services Policy 1.5 - Attachment Change Log</head><table id="ws-policy-attachment-changelog-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><!-- template
           <tr>
           <td>200505</td>
           <td></td>
@@ -1802,4 +1808,12 @@
       Editors' action 
       <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/243" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">243</phrase></loc>.
     </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070501</td><td rowspan="1" colspan="1" diff="add">ASV</td><td rowspan="1" colspan="1" diff="add">Reset Section <specref ref="change-description"/>.
-    </td></tr></tbody></table></inform-div1></back></spec>
\ No newline at end of file
+    </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070524</td><td rowspan="1" colspan="1" diff="add">DBO</td><td rowspan="1" colspan="1" diff="add">Editorial changes to align with the W3C WS-Addressing Metadata specification.
+      For <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4374" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">issue 4374</phrase></loc>.
+      Editors' action 
+      <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/285" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">285</phrase></loc>.
+    </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070528</td><td rowspan="1" colspan="1" diff="add">MH</td><td rowspan="1" colspan="1" diff="add">Implemented the changes proposed at F2F
+       <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2007/05/23-ws-policy-minutes.html#item08" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">indicated by this reference</phrase></loc> 
+       for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4552" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4552</phrase></loc>. 
+       Editors' action <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/275" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">275</phrase></loc>.
+     </td></tr></tbody></table></inform-div1></back></spec>
\ No newline at end of file

Index: ws-policy-attachment-diff20070330.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment-diff20070330.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ws-policy-attachment-diff20070330.html	1 May 2007 23:30:36 -0000	1.2
+++ ws-policy-attachment-diff20070330.html	30 May 2007 05:25:04 -0000	1.3
@@ -133,9 +133,9 @@
 &nbsp;&nbsp;&nbsp;&nbsp;6.4 <a href="#RegisteringPoliciesUDDIVersion3">Registering Policies in UDDI Version 3</a><br>
 7. <a href="#SecurityConsiderations">Security Considerations</a><br>
 8. <a href="#Conformance">Conformance</a><br>
-&nbsp;&nbsp;&nbsp;&nbsp;8.1 <a href="#d2e4000">External Policy Attachment Conformance</a><br>
-&nbsp;&nbsp;&nbsp;&nbsp;8.2 <a href="#d2e4012">WSDL 1.1 Attachment Conformance</a><br>
-&nbsp;&nbsp;&nbsp;&nbsp;8.3 <a href="#d2e4021">WSDL 2.0 Attachment Conformance</a><br>
+&nbsp;&nbsp;&nbsp;&nbsp;8.1 <a href="#d2e4024">External Policy Attachment Conformance</a><br>
+&nbsp;&nbsp;&nbsp;&nbsp;8.2 <a href="#d2e4036">WSDL 1.1 Attachment Conformance</a><br>
+&nbsp;&nbsp;&nbsp;&nbsp;8.3 <a href="#d2e4045">WSDL 2.0 Attachment Conformance</a><br>
 </p>
 <h3><a name="appendices" id="appendices"></a>Appendices</h3><p class="toc">A. <a href="#References">References</a><br>
 &nbsp;&nbsp;&nbsp;&nbsp;A.1 <a href="#Normative-References">Normative References</a><br>
@@ -209,10 +209,10 @@
 </td><td rowspan="1" colspan="1">
 <code>http://www.w3.org/2005/08/addressing</code>
 </td><td rowspan="1" colspan="1">[<a href="#WS-Addressing">[WS-Addressing Core]</a>]</td></tr><tr><td rowspan="1" colspan="1">
-<code>wsap</code>
+<code><span class="diff-chg"><span>wsam</span></span></code>
 </td><td rowspan="1" colspan="1">
-<code>http://www.w3.org/2006/05/addressing/wsdl</code>
-</td><td rowspan="1" colspan="1">[<a href="#WS-AddressingPolicy">[WS-Addressing Policy]</a>]</td></tr><tr><td rowspan="1" colspan="1">
+<code><span class="diff-chg"><span>http://www.w3.org/2007/05/addressing/metadata</span></span></code>
+</td><td rowspan="1" colspan="1">[<div class="diff-chg"><a href="#WS-AddressingMetadata">[WS-Addressing Metadata]</a></div>]</td></tr><tr><td rowspan="1" colspan="1">
 <code>wsdl11</code>
 </td><td rowspan="1" colspan="1">
 <code>http://schemas.xmlsoap.org/wsdl/</code>
@@ -280,6 +280,10 @@
 	      "<span class="rfc2119">OPTIONAL</span>" in this document are to be
 	      interpreted as described in RFC 2119 [<a href="#RFC2119">[IETF RFC 2119]</a>].
 	    </p><p>We introduce the following terms that are used throughout this document:</p><dl><dt class="label">
+         <a href="ws-policy-framework.html#collection">collection</a>
+      </dt><dd><p id="collection"> The items in a
+                            <b>collection</b> in this specification are unordered and may contain duplicates. 
+                   </p></dd><dt class="label">
          <a href="#effective_policy">effective policy</a>
       </dt><dd><p>The
 <b>effective policy</b>, for a given <a title="" href="#policy_subject">policy subject</a>, is the 
@@ -309,7 +313,8 @@
                         alternatives</a>. </p></dd><dt class="label">
          <a href="ws-policy-framework.html#policy_alternative">policy alternative</a>
       </dt><dd><p id="policy_alternative">A <b>policy
-                            alternative</b> is a potentially empty collection of <a title="" href="#policy_assertion">policy assertions</a>.</p></dd><dt class="label">
+                            alternative</b> is a potentially empty 
+                            <a title="" href="#collection"> collection </a> of <a title="" href="#policy_assertion">policy assertions</a>.</p></dd><dt class="label">
          <a href="ws-policy-framework.html#policy_assertion">policy assertion</a>
       </dt><dd><p id="policy_assertion">A <b>policy
                         assertion</b> represents a requirement, a capability, or other property
@@ -328,7 +333,7 @@
          <a href="ws-policy-framework.html#policy_subject">policy subject</a>
       </dt><dd><p id="policy_subject">A <b>policy subject</b> is
                         an entity (e.g., an endpoint, message, resource, operation) with which a
-                            <a title="" href="#policy">policy</a> can be associated. </p></dd></dl><ul><li><p>ignorable_policy_assertion</p></li><li><p>policy</p></li><li><p>policy_alternative</p></li><li><p>policy_assertion</p></li><li><p>policy_expression</p></li><li><p>policy_subject</p></li><li><p>policy_scope</p></li><li><p>policy_attachment</p></li></ul></div><div class="div2">
+                            <a title="" href="#policy">policy</a> can be associated. </p></dd></dl><ul><li><p><span class="diff-add"><span>collection</span></span></p></li><div class="diff-add"><li class="diff-add"><p>ignorable_policy_assertion</p></li></div><li><p>policy</p></li><li><p>policy_alternative</p></li><li><p>policy_assertion</p></li><li><p>policy_expression</p></li><li><p>policy_subject</p></li><li><p>policy_scope</p></li><li><p>policy_attachment</p></li></ul></div><div class="div2">
 <h3><a name="Example" id="Example"></a>2.4 Example</h3><p>This specification defines several mechanisms for
 	associating policies (Web Services Policy 1.5 - Framework, [<a href="#WS-Policy">[Web Services Policy Framework]</a>]) with various XML Web service entities. For
 	brevity, we define two sample <a title="" href="#policy_expression">policy expressions</a> that the
@@ -898,11 +903,11 @@
 <a href="#XMLNamespaces"><b>2.2 XML Namespaces</b></a> lists all the XML Namespaces that are used in this section. (XML
                 elements without a namespace prefix are from the Web Services Policy XML Namespace.)</p><div class="div2">
 <h3><a name="wsdl20-example" id="wsdl20-example"></a>5.1 Example</h3><p>The example below illustrates the use of WS-Policy Attachment for WSDL 2.0:</p><div class="exampleOuter">
-<p style="text-align: left" class="exampleHead"><a name="table-wsdl20-example" id="table-wsdl20-example"></a><i><span>Example 5-1. </span>Example Policy Attached to WSDL 2.0</i></p><div class="exampleInner"><pre>(01) &lt;wsdl20:description&gt;
+<p style="text-align: left" class="exampleHead"><a name="table-wsdl20-example" id="table-wsdl20-example"></a><i><span>Example 5-1. </span>Example Policy Attached to WSDL 2.0</i></p><div class="exampleInner"><pre><span class="diff-chg"><span>(01) &lt;wsdl20:description&gt;
 (02) …
 (03)   &lt;wsp:Policy wsu:Id="common"&gt;
 (04) &nbsp; &nbsp; &lt;mtom:OptimizedMimeSerialization wsp:Optional="true"/&gt;
-(05) &nbsp; &nbsp; &lt;wsap:UsingAddressing /&gt;
+(05) &nbsp; &nbsp; &lt;wsam:Addressing&gt;…&lt;/wsam:Addressing&gt;
 (06) &nbsp; &lt;/wsp:Policy&gt;
 
 (07) &nbsp; &lt;wsp:Policy wsu:Id="secure"&gt;
@@ -928,7 +933,7 @@
 (25) &nbsp; &nbsp; &lt;/wsdl20:endpoint&gt;
 (26) &nbsp; &lt;/wsdl20:service&gt;
 (27) …
-(28) &lt;/wsdl20:description&gt;</pre></div></div><p>The <code>SecureBinding</code> WSDL binding description describes a binding for
+(28) &lt;/wsdl20:description&gt;</span></span></pre></div></div><p>The <code>SecureBinding</code> WSDL binding description describes a binding for
                     an interface that provides real-time quotes and book information on securities.
                     (The prefixes <code>wsdl20</code> and <code>tns</code> are used here to denote
                     the Web Services Description Language 2.0 XML Namespace and the target namespace
@@ -949,11 +954,11 @@
                     to any message exchange associated with the RealTimeDataPort endpoint. The
                     example below represents the combination of these two <a title="" href="#policy">policies</a>, that is, the
                 <a title="effective policy" href="#effective_policy">effective policy</a> for the <code>RealTimeDataPort</code> endpoint.</p><div class="exampleOuter">
-<p style="text-align: left" class="exampleHead"><a name="table-wsdl20-effective-policy-example" id="table-wsdl20-effective-policy-example"></a><i><span>Example 5-2. </span>Effective Policy for the RealTimeDataPort endpoint</i></p><div class="exampleInner"><pre>(01) &lt;wsp:Policy&gt;
+<p style="text-align: left" class="exampleHead"><a name="table-wsdl20-effective-policy-example" id="table-wsdl20-effective-policy-example"></a><i><span>Example 5-2. </span>Effective Policy for the RealTimeDataPort endpoint</i></p><div class="exampleInner"><pre><span class="diff-chg"><span>(01) &lt;wsp:Policy&gt;
 (02)&nbsp;  &lt;wsp:All&gt;
 (03) &nbsp; &nbsp; &lt;wsp:Policy&gt;
 (04) &nbsp; &nbsp; &nbsp; &lt;mtom:OptimizedMimeSerialization wsp:Optional="true"/&gt;
-(05) &nbsp; &nbsp; &nbsp; &lt;wsap:UsingAddressing /&gt;
+(05) &nbsp; &nbsp; &nbsp; &lt;wsam:Addressing&gt;…&lt;/wsam:Addressing&gt;
 (06) &nbsp; &nbsp; &lt;/wsp:Policy&gt;
 (07) &nbsp; &nbsp; &lt;wsp:Policy&gt;
 (08) &nbsp; &nbsp; &nbsp; &lt;wsp:ExactlyOne&gt;
@@ -962,7 +967,7 @@
 (11) &nbsp; &nbsp; &nbsp; &lt;/wsp:ExactlyOne&gt;
 (12) &nbsp; &nbsp; &lt;/wsp:Policy&gt;
 (13) &nbsp; &lt;/wsp:All&gt;
-(14) &lt;/wsp:Policy&gt;</pre></div></div></div><div class="div2">
+(14) &lt;/wsp:Policy&gt;</span></span></pre></div></div></div><div class="div2">
 <h3><a name="attaching-policy-expressions" id="attaching-policy-expressions"></a>5.2 Attaching Policy Expressions</h3><p>Policy attachment points in a WSDL 2.0 document are:</p><ul><li><p>
 <code>wsdl20:service</code>
 </p></li><li><p>
@@ -1504,11 +1509,11 @@
     Security Considerations section of the Web Services Policy 1.5 - Framework document [<a href="#WS-Policy">[Web Services Policy Framework]</a>].
   </p></div><div class="div1">
 <h2><a name="Conformance" id="Conformance"></a>8. Conformance</h2><div class="div2">
-<h3><a name="d2e4000" id="d2e4000"></a>8.1 External Policy Attachment Conformance</h3><p>An element information item whose namespace name is "http://www.w3.org/ns/ws-policy" and whose local part is PolicyAttachment conforms to this specification if it is valid according to the XML Schema [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>] for that element as defined by this specification (<a href="http://www.w3.org/2007/02/ws-policy.xsd">http://www.w3.org/2007/02/ws-policy.xsd</a>) and additionally adheres to all the constraints contained in Section <a href="#ExternalPolicyAttachment"><b>3.4 External Policy Attachment</b></a> of this specification. Such a conformant element information item constitutes an external policy attachment. </p></div><div class="div2">
-<h3><a name="d2e4012" id="d2e4012"></a>8.2 WSDL 1.1 Attachment Conformance</h3><p>
+<h3><a name="d2e4024" id="d2e4024"></a>8.1 External Policy Attachment Conformance</h3><p>An element information item whose namespace name is "http://www.w3.org/ns/ws-policy" and whose local part is PolicyAttachment conforms to this specification if it is valid according to the XML Schema [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>] for that element as defined by this specification (<a href="http://www.w3.org/2007/02/ws-policy.xsd">http://www.w3.org/2007/02/ws-policy.xsd</a>) and additionally adheres to all the constraints contained in Section <a href="#ExternalPolicyAttachment"><b>3.4 External Policy Attachment</b></a> of this specification. Such a conformant element information item constitutes an external policy attachment. </p></div><div class="div2">
+<h3><a name="d2e4036" id="d2e4036"></a>8.2 WSDL 1.1 Attachment Conformance</h3><p>
  A WSDL 1.1 [<a href="#WSDL11">[WSDL 1.1]</a>] description conforms to this specification when it incorporates one or more element policies and additionally adheres to all the constraints contained in section <a href="#AttachingPolicyUsingWSDL1.1"><b>4. Attaching Policies Using WSDL 1.1</b></a>
 </p></div><div class="div2">
-<h3><a name="d2e4021" id="d2e4021"></a>8.3 WSDL 2.0 Attachment Conformance</h3><p>
+<h3><a name="d2e4045" id="d2e4045"></a>8.3 WSDL 2.0 Attachment Conformance</h3><p>
  A WSDL 2.0 [<a href="#WSDL20">[WSDL 2.0 Core Language]</a>] description conforms to this specification when it incorporates one or more element policies and additionally adheres to all the constraints contained in section <a href="#ws-policy-attachment-for-wsdl20"><b>5. WS-Policy Attachment for WSDL 2.0</b></a>
 </p></div></div></div><div class="back"><div class="div1">
 <h2><a name="References" id="References"></a>A. References</h2><div class="div2">
@@ -1665,12 +1670,13 @@
 	version of Schema Centric XML Canonicalization Version
 	1.0</a> is available at
 	http://uddi.org/pubs/SchemaCentricCanonicalization.htm.
-        (See http://uddi.org/pubs/SchemaCentricCanonicalization-20050523.htm.)</dd><dt class="label"><a name="WS-AddressingPolicy" id="WS-AddressingPolicy"></a>[WS-Addressing Policy] </dt><dd>
-<a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"><cite>Web Services Addressing 1.0 - WSDL Binding</cite></a>, M. Gudgin, M. Hadley, T.
-        Rogers and Ü. Yalçinalp, Editors. World Wide Web Consortium, 29 May 2006. This version of
-        the Web Services Addressing 1.0 - WSDL Binding is
-        http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/. The <a href="http://www.w3.org/TR/ws-addr-wsdl">latest version of Web Services Addressing 1.0 -
-          WSDL Binding</a> is available at http://www.w3.org/TR/ws-addr-wsdl.   (See http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/.)</dd><dt class="label"><a name="WS-MetadataExchange" id="WS-MetadataExchange"></a>[WS-MetadataExchange] </dt><dd>
+        (See http://uddi.org/pubs/SchemaCentricCanonicalization-20050523.htm.)</dd><dt class="label"><span class="diff-chg"><a name="WS-AddressingMetadata"></a>WS-Addressing Metadata</span></dt><dd><div class="diff-chg">
+          <a href="http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/"><cite>Web Services Addressing 1.0 - <span class="diff-add"><span>Metadata</span></span><span class="diff-del"><span>WSDL Binding</span></span></cite></a>, M. Gudgin, M. Hadley, T.
+          Rogers and Ü. Yalçinalp, Editors. World Wide Web Consortium, <span class="diff-chg"><span>16 </span></span>May <span class="diff-chg"><span>2007. </span></span>This version of
+          the Web Services Addressing 1.0 - <span class="diff-add"><span>Metadata</span></span><span class="diff-del"><span>WSDL Binding </span></span>is
+          <span class="diff-chg"><span>http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/. </span></span>The <a href="http://www.w3.org/TR/ws-addr-metadata">latest version of Web Services Addressing 1.0 -
+            <span class="diff-add"><span>Metadata</span></span></a>
+          <span class="diff-del"><span>WSDL Binding </span></span>is available at <span class="diff-chg"><span>http://www.w3.org/TR/ws-addr-metadata. </span></span>  (See http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/.)</div></dd><dt class="label"><a name="WS-MetadataExchange" id="WS-MetadataExchange"></a>[WS-MetadataExchange] </dt><dd>
 <a href="http://schemas.xmlsoap.org/ws/2004/09/mex/"><cite>Web Services Metadata Exchange
 	(WS-MetadataExchange)</cite></a>, K. Ballinger, et al,
 	Authors. BEA Systems Inc., Computer Associates International,
@@ -1824,8 +1830,8 @@
     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 <span class="diff-chg"><span>30 March, </span></span>2007
-      is below:</p><ul><li><p><span class="diff-add"><span>Editorial</span></span><span class="diff-del"><span>Aligned the UDDI </span></span><span class="diff-chg"><span>changes to align </span></span>with the <span class="diff-add"><span>OASIS</span></span><span class="diff-del"><span>XML namespace name of the
-          Web Services </span></span><span class="diff-chg"><span>WS-SecurityPolicy specification.</span></span></p></li></ul></div><div class="div1">
+      is below:</p><ul><li><p><span class="diff-add"><span>Editorial</span></span><span class="diff-del"><span>Aligned the UDDI </span></span><span class="diff-chg"><span>changes to align </span></span>with the <span class="diff-chg"><span>OASIS WS-SecurityPolicy </span></span><span class="diff-add"><span>specification.</span></span></p></li><div class="diff-add"><li class="diff-add"><p><span class="diff-add"><span>Editorial</span></span><span class="diff-del"><span>name </span></span><span class="diff-add"><span>changes to align with</span></span><span class="diff-del"><span>of </span></span>the
+          <span class="diff-del"><span>Web </span></span><span class="diff-chg"><span>W3C </span></span><span class="diff-add"><span>WS-Addressing 1.0</span></span><span class="diff-del"><span>Policy </span></span><span class="diff-add"><span>Metadata specification.</span></span><span class="diff-del"><span>language.</span></span></p></li></div></ul></div><div class="div1">
 <h2><a name="change-log" id="change-log"></a>E. Web Services Policy 1.5 - Attachment Change Log (Non-Normative)</h2><a name="ws-policy-attachment-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#action20">20</a> 
             from the Austin F2F.</td></tr><tr><td rowspan="1" colspan="1">20060712</td><td rowspan="1" colspan="1">DBO</td><td rowspan="1" colspan="1">Completed action item <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action12">12</a>
@@ -1991,4 +1997,12 @@
       Editors' action 
       <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/243"><span class="diff-add"><span>243</span></span></a>.
     </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070501</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">ASV</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Reset Section <a href="#change-description"><b>D. Changes in this Version of the Document</b></a>.
-    </td></div></tr></div></tbody></table><br></div></div></body></html>
\ No newline at end of file
+    </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070524</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">DBO</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Editorial changes to align with the W3C WS-Addressing Metadata specification.
+      For <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4374"><span class="diff-add"><span>issue 4374</span></span></a>.
+      Editors' action 
+      <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/285"><span class="diff-add"><span>285</span></span></a>.
+    </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070528</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">MH</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the changes proposed at F2F
+       <a href="http://www.w3.org/2007/05/23-ws-policy-minutes.html#item08"><span class="diff-add"><span>indicated by this reference</span></span></a> 
+       for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4552"><span class="diff-add"><span>4552</span></span></a>. 
+       Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/275"><span class="diff-add"><span>275</span></span></a>.
+     </td></div></tr></div></tbody></table><br></div></div></body></html>
\ No newline at end of file

Index: ws-policy-framework-diff20070330.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework-diff20070330.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ws-policy-framework-diff20070330.xml	1 May 2007 23:30:36 -0000	1.2
+++ ws-policy-framework-diff20070330.xml	30 May 2007 05:25:04 -0000	1.3
@@ -11,8 +11,8 @@
                 requirements and capabilities.</p></abstract><status><p/></status><langusage><language id="en-US">English</language></langusage><revisiondesc><p>Last Modified: $Date$</p></revisiondesc></header><body><div1 id="tocRange"><head>Introduction</head><p>Web Services Policy 1.5 - Framework defines a framework and a model for expressing policies that
                 refer to domain-specific capabilities, requirements, and general characteristics of
                 entities in a Web services-based system. </p><p>A <termref def="policy">policy</termref> is a collection of policy alternatives. A
-                    <termref def="policy_alternative">policy alternative </termref> is a collection
-                of policy assertions. A <termref def="policy_assertion">policy assertion</termref>
+                    <termref def="policy_alternative">policy alternative </termref> 
+                    is a collection of policy assertions. A <termref def="policy_assertion">policy assertion</termref>
                 represents a requirement, capability, or other property of a behavior. A <termref def="policy_expression">policy expression</termref> is an XML Infoset
                 representation of its policy, either in a normal form or in its equivalent compact
                 form. Some policy assertions specify traditional requirements and capabilities that
@@ -83,6 +83,10 @@
                             </td><td rowspan="1" colspan="1">
                                 <code><phrase diff="chg">http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702</phrase></code>
                             </td><td rowspan="1" colspan="1">[<bibref ref="WS-SecurityPolicy"/>]</td></tr><tr><td rowspan="1" colspan="1">
+                                <code><phrase diff="add">wsam</phrase></code>
+                            </td><td rowspan="1" colspan="1" diff="add">
+                                <code><phrase diff="add">http://www.w3.org/2007/05/addressing/metadata</phrase></code>
+                            </td><td rowspan="1" colspan="1" diff="add">[<bibref ref="WS-AddressingMetadata"/>]</td></tr><tr diff="add"><td rowspan="1" colspan="1">
                                 <code>wsp</code>
                             </td><td rowspan="1" colspan="1">
                                 <code>http://www.w3.org/ns/ws-policy</code>
@@ -97,7 +101,6 @@
                             </td><td rowspan="1" colspan="1">[<bibref ref="XMLSchemaPart1"/>]</td></tr></tbody></table><p>All information items defined by this specification are identified by the XML
                     namespace URI [<bibref ref="XML-NS"/>] <code>http://www.w3.org/ns/ws-policy</code>. A <xspecref xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2007/02/ws-policy.xsd" xlink:type="simple" xlink:actuate="onRequest" xlink:show="new">normative XML Schema</xspecref> [<bibref ref="XMLSchemaPart1"/>, <bibref ref="XMLSchemaPart2"/>] document can be
                     obtained indirectly by dereferencing the namespace document at the WS-Policy 1.5
-
                     namespace URI.</p><p>It is the intent of the W3C Web Services Policy Working Group that the
                     Web Services Policy 1.5 - Framework and Web Services Policy 1.5 - Attachment XML namespace URI will not
                     change arbitrarily with each subsequent revision of the corresponding XML Schema
@@ -121,6 +124,10 @@
                     NOT</rfc2119>", "<rfc2119>RECOMMENDED</rfc2119>", "<rfc2119>MAY</rfc2119>", and
                         "<rfc2119>OPTIONAL</rfc2119>" in this document are to be interpreted as
                     described in RFC 2119 [<bibref ref="RFC2119"/>]. </p><p>We introduce the following terms that are used throughout this document:</p><glist><gitem><label>
+         <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="#collection" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">collection</loc>
+      </label><def><p> The items in a
+                            <term>collection</term> in this specification are unordered and may contain duplicates. 
+                   </p></def></gitem><gitem><label>
          <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="#ignorable_policy_assertion" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">ignorable policy assertion</loc>
       </label><def><p>An
                             <term>ignorable policy assertion</term> is an assertion that may be
@@ -136,11 +143,8 @@
                         alternatives</termref>. </p></def></gitem><gitem><label>
          <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="#policy_alternative" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">policy alternative</loc>
       </label><def><p>A <term>policy
-                            alternative</term> is a potentially empty collection of <termref def="policy_assertion">policy assertions</termref>.</p></def></gitem><gitem><label>
-         <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="#policy_alternative_vocabulary" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">policy alternative vocabulary</loc>
-      </label><def><p>A <term>policy alternative vocabulary</term> is the set of all <termref def="policy_assertion_type">policy assertion types</termref> within the
-                            <termref def="policy_alternative">policy
-                    alternative</termref>.</p></def></gitem><gitem><label>
+                            alternative</term> is a potentially empty 
+                            <termref def="collection"> collection </termref> of <termref def="policy_assertion">policy assertions</termref>.</p></def></gitem><gitem><label>
          <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="#policy_assertion" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">policy assertion</loc>
       </label><def><p>A <term>policy
                         assertion</term> represents a requirement, a capability, or other property
@@ -167,11 +171,7 @@
          <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="#policy_subject" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">policy subject</loc>
       </label><def><p>A <term>policy subject</term> is
                         an entity (e.g., an endpoint, message, resource, operation) with which a
-                            <termref def="policy">policy</termref> can be associated. </p></def></gitem><gitem><label>
-         <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="#policy_vocabulary" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">policy vocabulary</loc>
-      </label><def><p>A
-                            <term>policy vocabulary</term> is the set of all <termref def="policy_assertion_type">policy assertion types</termref> used in a
-                        policy.</p></def></gitem></glist></div2></div1><div1 id="Policy_Model"><head>Policy Model</head><p>This section defines an abstract model for policies and for operations upon policies.</p><p>The descriptions below use XML Infoset terminology for convenience of description.
+                            <termref def="policy">policy</termref> can be associated. </p></def></gitem></glist></div2></div1><div1 id="Policy_Model"><head>Policy Model</head><p>This section defines an abstract model for policies and for operations upon policies.</p><p>The descriptions below use XML Infoset terminology for convenience of description.
                 However, this abstract model itself is independent of how it is represented as an
                 XML Infoset. </p><div2 id="rPolicy_Assertion"><head>Policy Assertion</head><p><termdef id="policy_assertion" term="policy assertion">A <term>policy
                         assertion</term> represents a requirement, a capability, or other property
@@ -195,9 +195,14 @@
                     interpreted independent of their <termref def="policy_subject">policy
                     subjects</termref>.</p><p>Authors <rfc2119>MAY</rfc2119> define that an assertion contains a <termref def="policy_expression">policy expression</termref> (as defined in <specref ref="rPolicy_Expression"/>) as one of its <emph role="infoset-property">children</emph>. <termref def="nested_policy_expression">Nested policy
                         expression(s)</termref> are used by authors to further qualify one or more
-                    specific aspects of the original assertion. For example, security policy authors
+                    specific aspects of the <phrase diff="add">parent policy</phrase><phrase diff="del">original </phrase>assertion. <phrase diff="add">The qualification may indicate 
+                    a relationship or context between the parent policy assertion and 
+                    a nested policy expression. </phrase>For <phrase diff="add">example within a</phrase><phrase diff="del">example, </phrase>security <phrase diff="add">domain, security</phrase>policy 
+                    authors
                     may define an assertion describing a set of security algorithms to qualify the
-                    specific behavior of a security binding assertion. </p><p>The XML Infoset of a <termref def="policy_assertion">policy assertion</termref>
+                    specific behavior of a security binding assertion. <phrase diff="add">A parent policy assertion 
+                    of one domain may also serve as a container for the nested policy expression 
+                    from another domain.</phrase></p><p>The XML Infoset of a <termref def="policy_assertion">policy assertion</termref>
                     <rfc2119>MAY</rfc2119> contain a non-empty <emph role="infoset-property">attributes</emph> property and/or a non-empty <emph role="infoset-property">children</emph> property. Such properties, excluding the Attribute and
                     Element Information Items from the WS-Policy language XML namespace name are
                         <termref def="policy_assertion_parameter">policy assertion
@@ -213,28 +218,39 @@
                         policy expressions</termref>. Specifically, authors are encouraged to
                     consider when the identity of the root Element Information Item alone is enough
                     to convey the requirement or capability.</p></div2><div2 id="rPolicy_Alternative"><head>Policy Alternative</head><p><termdef id="policy_alternative" term="policy alternative">A <term>policy
-                            alternative</term> is a potentially empty collection of <termref def="policy_assertion">policy assertions</termref>.</termdef> An
-                    alternative with zero assertions indicates no behaviors. An alternative with one
+                            alternative</term> is a potentially empty 
+                            <termref def="collection" diff="add"> collection </termref> of <termref def="policy_assertion">policy assertions</termref>.</termdef> 
+                   <termdef id="collection" term="collection" diff="add"> <phrase diff="add">The items in a
+                            </phrase><term><phrase diff="add">collection</phrase></term> <phrase diff="add">in this specification are unordered and may contain duplicates. 
+                   </phrase></termdef>
+                            An alternative with zero assertions indicates no behaviors. An alternative with one
                     or more assertions indicates behaviors implied by those, and only those
-                    assertions. <termdef id="policy_vocabulary" term="policy vocabulary">A
-                            <term>policy vocabulary</term> is the set of all <termref def="policy_assertion_type">policy assertion types</termref> used in a
-                        policy.</termdef>
-                    <termdef id="policy_alternative_vocabulary" term="policy alternative vocabulary">A <term>policy alternative vocabulary</term> is the set of all <termref def="policy_assertion_type">policy assertion types</termref> within the
-                            <termref def="policy_alternative">policy
-                    alternative</termref>.</termdef> When an assertion whose type is part of the
+                    assertions. <phrase diff="del">A
+                            policy vocabulary is the set of all policy assertion types used in a
+                        policy.
+                    A policy alternative vocabulary is the set of all policy assertion types within the
+                            policy
+                    alternative. When an assertion whose type is part of the
                     policy's vocabulary is not included in a policy alternative, the policy
                     alternative without the assertion type indicates that the assertion will not be
                     applied in the context of the attached policy subject. See the example in
-                    Section <specref ref="Optional_Policy_Assertions"/></p><p>Assertions within an alternative are not ordered, and thus aspects such as the
+                    Section </phrase></p><p>Assertions within an alternative are not ordered, and thus aspects such as the
                     order in which behaviors (indicated by assertions) are applied to a <termref def="policy_subject">subject</termref> are beyond the scope of this
                     specification. However, authors can write assertions that control the order in
-                    which behaviours are applied.</p><p>A policy alternative <rfc2119>MAY</rfc2119> contain multiple assertions of the
+                    which <phrase diff="chg">behaviors </phrase>are applied.</p><p>A policy alternative <rfc2119>MAY</rfc2119> contain multiple assertions of the
                     same type. Mechanisms for determining the aggregate behavior indicated by the
                     assertions (and their Post-Schema-Validation Infoset (PSVI) (See XML Schema Part
                     1 [<bibref ref="XMLSchemaPart1"/>]) content, if any) are specific to the
-                    assertion type and are outside the scope of this document.</p><p>Note: Depending on the semantics of the domain specific policy assertions a
+                    assertion type and are outside the scope of this document.</p><p>Note: Depending on the semantics of the domain specific policy assertions 
+                    <phrase diff="add">regardless if they are qualified by nested policy expressions, </phrase>a
                     combination of the policy assertions can be required to specify a particular
-                    behavior. </p></div2><div2 id="rPolicy"><head>Policy</head><p><termdef id="policy" term="policy">A <term>policy</term> is a potentially empty
+                    behavior. <phrase diff="add">For example, a combination of two or three assertions from the 
+                    WS-SecurityPolicy [</phrase><bibref ref="WS-SecurityPolicy" diff="add"/><phrase diff="add">] specification is used to indicate message-level 
+                    security for protecting messages - that is, the </phrase><code diff="add"><phrase diff="add">sp:AsymmetricBinding</phrase></code> 
+                    <phrase diff="add">assertion is used to indicate message-level security, the </phrase><code diff="add"><phrase diff="add">sp:SignedParts</phrase></code> 
+                    <phrase diff="add">assertion is used to indicate the parts of a message to be protected 
+                    and the </phrase><code diff="add"><phrase diff="add">sp:EncryptedParts</phrase></code> <phrase diff="add">assertion is used to indicate the parts of 
+                    a message that require confidentiality.</phrase></p></div2><div2 id="rPolicy"><head>Policy</head><p><termdef id="policy" term="policy">A <term>policy</term> is a potentially empty
                         collection of <termref def="policy_alternative">policy
                         alternatives</termref>. </termdef> A policy with zero alternatives contains
                     no choices; a policy with one or more alternatives indicates choice in
@@ -269,11 +285,9 @@
                     the policy. Note that although policy alternatives are meant to be mutually
                     exclusive, it cannot be decided in general whether or not more than one
                     alternative can be supported at the same time.</p><p>Note that an entity may be able to support a policy even if the entity does not
-                    understand the <termref def="policy_assertion_type">type</termref> of each
-                    assertion in the <termref def="policy_vocabulary">vocabulary of the
-                    policy</termref>; the entity only has to understand the type of each assertion
-                    in the vocabulary of a <termref def="policy_alternative">policy
-                    alternative</termref> the entity supports. This characteristic is crucial to
+                    understand the type of each assertion in the <phrase diff="add">policy;</phrase><phrase diff="del">vocabulary of the
+                    policy; </phrase>the entity only has to understand the type of each assertion
+                    in <phrase diff="del">the vocabulary of </phrase>a policy alternative <phrase diff="add">that </phrase>the entity supports. This characteristic is crucial to
                     versioning and incremental deployment of new assertions because this allows a
                     provider's policy to include new assertions in new alternatives while allowing
                     entities to continue to use old alternatives in a backward-compatible
@@ -451,7 +465,7 @@
                                     (i.e., no assertions are needed in the nested policy
                                     expression), the assertion <rfc2119>MUST</rfc2119> include an
                                     empty <code>&lt;wsp:Policy/&gt;</code> Element
-                                    Information Item in its <emph role="infoset-property">children</emph> property; as explained in Section <specref ref="Policy_Operators"/>, this is equivalent to a nested
+                                    Information Item in its <emph role="infoset-property">children</emph> <phrase diff="chg">property. As </phrase>explained in Section <specref ref="Policy_Operators"/>, this is equivalent to a nested
                                     policy expression with a single alternative that has zero
                                     assertions.</p><p>Note: This specification does not define processing for arbitrary
                                         <el>wsp:Policy</el> Element Information Items in the
@@ -661,8 +675,8 @@
     &lt;!-- assertion 1 --&gt;
     &lt;!-- assertion 2 --&gt;
   &lt;/wsp:All&gt;
-&lt;/wsp:ExactlyOne&gt;</eg></def></gitem><gitem><label>Empty</label><def><ulist><item><p><code>&lt;wsp:All /&gt;</code> expresses a policy
-                                            with zero policy assertions. Note that since
+&lt;/wsp:ExactlyOne&gt;</eg></def></gitem><gitem><label>Empty</label><def><ulist><item><p><code>&lt;wsp:All /&gt;</code> expresses a policy <phrase diff="add">alternative
+                                            </phrase>with zero policy assertions. Note that since
                                                 <el>wsp:Policy</el> is equivalent to
                                             <el>wsp:All</el>, <code>&lt;wsp:Policy
                                             /&gt;</code> is therefore equivalent to
@@ -906,14 +920,20 @@
                                 true, the assertion is an <termref def="ignorable_policy_assertion">ignorable policy assertion</termref>. If the actual value is
                                 false, the assertion is not an <termref def="ignorable_policy_assertion">ignorable policy
                                 assertion</termref>. Omitting this attribute is semantically
-                                equivalent to including it with a value of false.</p></def></gitem></glist></div2><div2 id="Policy_Intersection"><head>Policy Intersection</head><p>Policy intersection is useful when two or more parties express <termref def="policy">policy</termref> and want to limit the <termref def="policy_alternative">policy alternatives</termref> to those that are
+                                equivalent to including it with a value of false.</p></def></gitem></glist></div2><div2 id="Policy_Intersection"><head>Policy Intersection</head><p>Policy intersection is <phrase diff="add">OPTIONAL but, a </phrase>useful <phrase diff="add">tool </phrase>when two or more parties express 
+                <termref def="policy">policy</termref> and want to limit the <termref def="policy_alternative">policy alternatives</termref> to those that are
                     mutually compatible. For example, when a requester and a provider express
                     requirements on a message exchange, intersection identifies compatible policy
                     alternatives (if any) included in both requester and provider policies.
-                    Intersection is a commutative function that takes two policies and returns a
-                    policy. There are two modes for intersection: strict and lax. How the mode is
-                    selected or indicated for the policy intersection is outside the scope of this
-                    specification. </p><p>Because the set of behaviors indicated by a <termref def="policy_alternative">policy alternative</termref> depends on the domain-specific semantics of
+                    <phrase diff="add">Policy </phrase>Intersection is a commutative <phrase diff="chg">operation performed on </phrase>two policies <phrase diff="add">that 
+                    yields a policy that</phrase><phrase diff="del">and </phrase><phrase diff="chg">contains </phrase>a <phrase diff="add">collection of the compatible policy alternatives. 
+                    (Note: while policy intersection at times is analogous with set intersection, 
+                    it does not imply formal
+                    </phrase><phrase diff="del">policy. </phrase><phrase diff="add">set intersection semantics). </phrase>There are two modes for 
+                    intersection: strict and lax. How the mode is selected or indicated for the policy 
+                    intersection is outside the scope of this
+                    specification. 
+                </p><p>Because the set of behaviors indicated by a <termref def="policy_alternative">policy alternative</termref> depends on the domain-specific semantics of
                     the collected assertions, determining whether two policy alternatives are
                     compatible generally involves domain-specific processing. If a domain-specific
                     intersection processing algorithm is required this will be known from the QNames
@@ -934,13 +954,15 @@
                                         B, and</p></item><item><p>if each assertion in B that is not an <termref def="ignorable_policy_assertion">ignorable policy
                                             assertion</termref> is compatible with an assertion in
                                         A.</p></item></ulist><p>If two alternatives are compatible, their intersection is an alternative
-                            containing all of the assertions in both alternatives.</p></item><item><p>Two <termref def="policy">policies</termref> are compatible if an
+                            containing all of the <phrase diff="add">occurrences of all of the </phrase>assertions <phrase diff="chg">from each </phrase><phrase diff="add">of the
+                            alternatives (i.e., the bag union of the two).</phrase><phrase diff="del">alternatives.</phrase></p></item><item><p>Two <termref def="policy">policies</termref> 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
                             intersections between all pairs of compatible alternatives, choosing one
                             alternative from each policy. If two policies are not compatible, their
                             intersection has no policy alternatives.</p></item></ulist><p>See Section <specref ref="rPolicy_Alternative"/> for mechanisms for determining
-                    the aggregate behavior indicated by multiple assertions of the same <termref 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"><phrase diff="chg">(01) &lt;wsp:Policy
+                    the aggregate behavior indicated by multiple assertions of the same <termref def="policy_assertion_type">policy assertion type</termref>.</p><p diff="add"><phrase diff="add">An entity applies all the behaviors implied by a policy alternative when that policy alternative is chosen from the intersection result (see </phrase><specref ref="Web_services"/><phrase diff="add">).  If an entity includes a policy assertion type A in its policy, and this policy assertion type A does not occur in an intersected result, then that entity SHOULD not apply the behavior implied by assertion type A.  If a policy assertion type Z is not included in the input policies being intersected then the intersection result is silent about the behavior implied by the assertion type Z.
+</phrase></p><p>As an example of intersection, consider two input policies in normal form:</p><eg xml:space="preserve"><phrase diff="chg">(01) &lt;wsp:Policy
         xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
         xmlns:wsp="http://www.w3.org/ns/ws-policy" &gt;
        &lt;!-- Policy P1 --&gt;
@@ -989,8 +1011,8 @@
 (12)       &lt;/sp:SignedElements&gt;
 (13)     &lt;/wsp:All&gt;
 (14)   &lt;/wsp:ExactlyOne&gt;
-(15) &lt;/wsp:Policy&gt;</phrase></eg><p>Because there is only one alternative (A2) in policy P1 with the same vocabulary
-                    — the assertions have the same type — as another alternative
+(15) &lt;/wsp:Policy&gt;</phrase></eg><p>Because there is only one alternative (A2) in policy P1 with the same <phrase diff="chg">assertion
+                    </phrase><phrase diff="del">— the assertions have the same </phrase>type <phrase diff="del">— </phrase>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><eg xml:space="preserve"><phrase diff="chg">(01) &lt;wsp:Policy
         xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
@@ -1018,7 +1040,45 @@
                     these two assertions are compatible depends on the domain-specific semantics of
                     the <el>sp:SignedParts</el> assertion. To leverage intersection, assertion
                     authors are encouraged to factor assertions such that two assertions of the same
-                    assertion type are always (or at least typically) compatible.</p></div2><div2 id="IRI_Policy_Expressions"><head>Use of IRIs in Policy Expressions</head><p>Policy expressions use IRIs for some identifiers. This document does not define a
+                    assertion type are always (or at least typically) compatible.</p><p diff="add"><phrase diff="add">As another example of intersection of WS-Addressing assertions that utilize the framework intersection algorithm, consider two input policies:</phrase></p><eg xml:space="preserve" role="needs-numbering" diff="add">&lt;wsp:Policy
+      xmlns:wsp="http://www.w3.org/ns/ws-policy"
+      xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" &gt;
+  &lt;wsp:ExactlyOne&gt;
+    &lt;wsp:All&gt;        &lt;!-- Alternative A5 --&gt;
+      &lt;wsam:Addressing&gt;
+        &lt;wsp:Policy/&gt;
+      &lt;/wsam:Addressing&gt;
+    &lt;/wsp:All&gt;
+  &lt;/wsp:ExactlyOne&gt;
+&lt;/wsp:Policy&gt;</eg><p diff="add"><phrase diff="add">Lines (04)-(06) in the above policy expression contain an addressing 
+                    policy assertion with the empty </phrase><code><phrase diff="add">&lt;wsp:Policy/&gt;</phrase></code> <phrase diff="add">in line (05). 
+                    The empty </phrase><code><phrase diff="add">&lt;wsp:Policy/&gt;</phrase></code> <phrase diff="add">is a nested policy expression with an 
+                alternative that has zero assertions. In the example above, the addressing 
+                assertion indicates the use of addressing without any restriction.</phrase></p><eg xml:space="preserve" role="needs-numbering" diff="add">&lt;wsp:Policy
+      xmlns:wsp="http://www.w3.org/ns/ws-policy"
+      xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" &gt;
+  &lt;wsp:ExactlyOne&gt;
+    &lt;wsp:All&gt;       &lt;!-- Alternative A6 --&gt;
+      &lt;wsam:Addressing&gt;
+        &lt;wsp:Policy&gt;
+          &lt;wsam:AnonymousResponses/&gt;
+        &lt;/wsp:Policy&gt;
+      &lt;/wsam:Addressing&gt;
+    &lt;/wsp:All&gt;
+  &lt;/wsp:ExactlyOne&gt;
+&lt;/wsp:Policy&gt;</eg><p diff="add"><phrase diff="add">Lines (04)-(08) in the above policy expression contain an addressing 
+                policy assertion with a nested policy expression in lines (05)-(06). 
+                The nested policy expression indicates that the provider requires request 
+                messages to use response endpoint EPRs that contain the anonymous URI. 
+                The nested policy expression contains an alternative that has one 
+                    assertion, </phrase><code><phrase diff="add">wsam:AnonymousResponses</phrase></code><phrase diff="add">.</phrase></p><p diff="add"><phrase diff="add">The two assertions in alternatives A5 and A6 have the same assertion type 
+                and have nested policy expressions. The nested policy expression within
+                 the addressing assertion in the alternative A5 contains an alternative 
+                 that has zero assertions. The nested policy expression within the
+                  addressing assertion in the alternative A6 contains an alternative 
+                  that has one assertion. The nested policy expressions within these 
+                  two assertions are incompatible because the alternative in one is
+                   incompatible with the alternative in the other.</phrase></p><p diff="add"><phrase diff="add">Therefore, the two assertions are incompatible and hence the two alternatives are incompatible.</phrase></p></div2><div2 id="IRI_Policy_Expressions"><head>Use of IRIs in Policy Expressions</head><p>Policy expressions use IRIs for some identifiers. This document does not define a
                     base URI but relies on the mechanisms defined in XML Base [<bibref ref="XMLBASE"/>] and RFCs 3023 [<bibref ref="RFC3023"/>], 3986 [<bibref ref="RFC3986"/>] and
                     3987 [<bibref ref="RFC3987"/>] for establishing a base URI against which
                     relative IRIs can be made absolute.</p></div2></div1><div1 id="Security_Considerations"><head>Security Considerations</head><p>It is <rfc2119>RECOMMENDED</rfc2119> that <termref def="policy">policies</termref>
@@ -1217,7 +1277,12 @@
                         Editors. Organization for the Advancement of Structured Information
                         Standards, 14 October 2003. This version of the UDDI Version 3.0 is
                         http://uddi.org/pubs/uddi-v3.0.1-20031014.htm. The <loc href="http://uddi.org/pubs/uddi_v3.htm" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace">latest version of the UDDI
-                        3.0</loc> specification is available at http://uddi.org/pubs/uddi_v3.htm. </bibl><bibl xmlns:xlink="http://www.w3.org/1999/xlink" id="WS-SecurityPolicy" key="WS-SecurityPolicy" href="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" diff="chg">
+                        3.0</loc> specification is available at http://uddi.org/pubs/uddi_v3.htm. </bibl><bibl xmlns:xlink="http://www.w3.org/1999/xlink" key="WS-Addressing Metadata" id="WS-AddressingMetadata" href="http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" diff="add">
+                        <titleref xlink:type="simple" xlink:actuate="onRequest" xlink:show="new"><phrase diff="add">Web Services Addressing 1.0 - Metadata</phrase></titleref><phrase diff="add">, M. Gudgin, M. Hadley, T.
+                        Rogers and Ü. Yalçinalp, Editors. World Wide Web Consortium, 16 May 2007. This version of
+                        the Web Services Addressing 1.0 - Metadata is
+                        http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/. The </phrase><loc href="http://www.w3.org/TR/ws-addr-metadata" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">latest version of Web Services Addressing 1.0 -
+                            Metadata</phrase></loc> <phrase diff="add">is available at http://www.w3.org/TR/ws-addr-metadata. </phrase></bibl><bibl xmlns:xlink="http://www.w3.org/1999/xlink" id="WS-SecurityPolicy" key="WS-SecurityPolicy" href="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" diff="add">
                         <titleref xlink:type="simple" xlink:actuate="onRequest" xlink:show="new">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
@@ -1261,7 +1326,7 @@
     on public-ws-policy@w3.org</loc> are also gratefully
     acknowledged.
   </p></inform-div1><inform-div1 id="change-description"><head>Changes in this Version of the Document</head><p>A list of major editorial changes since the Working Draft dated <phrase diff="chg">30 March, </phrase>2007 is
-                below:</p><ulist><item><p><phrase diff="add">Editorial changes to align with the OASIS WS-SecurityPolicy specification.</phrase><phrase diff="del">None.</phrase></p></item></ulist></inform-div1><inform-div1 id="change-log"><head>Web Services Policy 1.5 - Framework Change Log</head><table id="ws-policy-framework-changelog-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><!-- template
+                below:</p><ulist><item><p><phrase diff="add">Editorial changes to align with the OASIS WS-SecurityPolicy specification.</phrase><phrase diff="del">None.</phrase></p></item><item diff="add"><p><phrase diff="add">Clarified the meaning of a policy intersection result.</phrase></p></item></ulist></inform-div1><inform-div1 id="change-log"><head>Web Services Policy 1.5 - Framework Change Log</head><table id="ws-policy-framework-changelog-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><!-- template
                         <tr>
                         <td>200505</td>
                         <td></td>
@@ -1324,4 +1389,36 @@
                             Editors' action 
                             <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/248" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">248</phrase></loc>.
                         </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070501</td><td rowspan="1" colspan="1" diff="add">ASV</td><td rowspan="1" colspan="1" diff="add">Reset Section <specref ref="change-description"/>.
+                        </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070513</td><td rowspan="1" colspan="1" diff="add">ASV</td><td rowspan="1" colspan="1" diff="add">Implemented the 
+                        <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://lists.w3.org/Archives/Public/public-ws-policy/2007May/0005.html" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution</phrase></loc> 
+                            for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4479" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4479</phrase></loc>. 
+                            Editors' action <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/259" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">259</phrase></loc>.
+                        </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070524</td><td rowspan="1" colspan="1" diff="add">DBO</td><td rowspan="1" colspan="1" diff="add">Implemented the 
+                        <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://lists.w3.org/Archives/Public/public-ws-policy/2007May/0283.html" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution</phrase></loc> 
+                            for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4554" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4554</phrase></loc>. 
+                            Editors' action <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/297" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">297</phrase></loc>.
+                            </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070528</td><td rowspan="1" colspan="1" diff="add">MH</td><td rowspan="1" colspan="1" diff="add">Implemented the changes proposed at F2F
+                            <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2007/05/23-ws-policy-minutes.html#item08" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">indicated by this reference</phrase></loc> 
+                            for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4552" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4552</phrase></loc>. 
+                            Editors' action <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/275" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">275</phrase></loc>.
+                            </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070528</td><td rowspan="1" colspan="1" diff="add">MH</td><td rowspan="1" colspan="1" diff="add">Implemented the changes proposed at F2F
+                            for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4556" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4556</phrase></loc>. 
+                            Editors' action <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/276" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">276</phrase></loc>.
+                            </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070529</td><td rowspan="1" colspan="1" diff="add">PY</td><td rowspan="1" colspan="1" diff="add">Implemented the changes proposed at the Ottawa F2F
+                            for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4553" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4553</phrase></loc>. 
+                            Editors' action <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/278" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">278</phrase></loc>.
+                        </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070529</td><td rowspan="1" colspan="1" diff="add">PY</td><td rowspan="1" colspan="1" diff="add">Implemented the changes proposed at the Ottawa F2F
+                            for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4555" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4555</phrase></loc>. 
+                            Editors' action <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/279" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">279</phrase></loc>.
+                        </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070529</td><td rowspan="1" colspan="1" diff="add">PY</td><td rowspan="1" colspan="1" diff="add">Implemented the changes proposed at the Ottawa F2F
+                            for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4554" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4554</phrase></loc>. 
+                            Editors' action <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/280" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">280</phrase></loc>.
+                        </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070529</td><td rowspan="1" colspan="1" diff="add">ASV</td><td rowspan="1" colspan="1" diff="add">Implemented the <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://lists.w3.org/Archives/Public/public-ws-policy/2007May/0210.html" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution</phrase></loc>
+                            for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4577" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4577</phrase></loc>. 
+                            Editors' action 
+                            <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/274" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">274</phrase></loc>.
+                        </td></tr><tr diff="add"><td rowspan="1" colspan="1" diff="add">20070529</td><td rowspan="1" colspan="1" diff="add">ASV</td><td rowspan="1" colspan="1" diff="add">Implemented the <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://lists.w3.org/Archives/Public/public-ws-policy/2007May/att-0274/ws-policyframework-context-draft-mm1-051507-1.htm__charset_UTF-8" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution</phrase></loc>
+                            for issue <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4579" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4579</phrase></loc>. 
+                            Editors' action 
+                            <loc xmlns:xlink="http://www.w3.org/1999/xlink" href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/312" xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">312</phrase></loc>.
                         </td></tr></tbody></table></inform-div1></back></spec>
\ No newline at end of file

Index: ws-policy-framework-diff20070330.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework-diff20070330.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ws-policy-framework-diff20070330.html	1 May 2007 23:30:36 -0000	1.2
+++ ws-policy-framework-diff20070330.html	30 May 2007 05:25:04 -0000	1.3
@@ -133,8 +133,8 @@
 <h2><a name="tocRange" id="tocRange"></a>1. Introduction</h2><p>Web Services Policy 1.5 - Framework defines a framework and a model for expressing policies that
                 refer to domain-specific capabilities, requirements, and general characteristics of
                 entities in a Web services-based system. </p><p>A <a title="policy" href="#policy">policy</a> is a collection of policy alternatives. A
-                    <a title="policy alternative" href="#policy_alternative">policy alternative </a> is a collection
-                of policy assertions. A <a title="policy assertion" href="#policy_assertion">policy assertion</a>
+                    <a title="policy alternative" href="#policy_alternative">policy alternative </a> 
+                    is a collection of policy assertions. A <a title="policy assertion" href="#policy_assertion">policy assertion</a>
                 represents a requirement, capability, or other property of a behavior. A <a title="policy expression" href="#policy_expression">policy expression</a> is an XML Infoset
                 representation of its policy, either in a normal form or in its equivalent compact
                 form. Some policy assertions specify traditional requirements and capabilities that
@@ -211,10 +211,14 @@
                             </td><td rowspan="1" colspan="1">
                                 <code><span class="diff-chg"><span>http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702</span></span></code>
                             </td><td rowspan="1" colspan="1">[<a href="#WS-SecurityPolicy">[WS-SecurityPolicy]</a>]</td></tr><tr><td rowspan="1" colspan="1">
+                                <code><span class="diff-add"><span>wsam</span></span></code>
+                            </td><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">
+                                <code><span class="diff-add"><span>http://www.w3.org/2007/05/addressing/metadata</span></span></code>
+                            </td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">[<a href="#WS-AddressingMetadata">[WS-Addressing Metadata]</a>]</td></div></tr><div class="diff-add"><tr class="diff-add"><td rowspan="1" colspan="1">
                                 <code>wsp</code>
                             </td><td rowspan="1" colspan="1">
                                 <code>http://www.w3.org/ns/ws-policy</code>
-                            </td><td rowspan="1" colspan="1">This specification</td></tr><tr><td rowspan="1" colspan="1">
+                            </td><td rowspan="1" colspan="1">This specification</td></tr></div><tr><td rowspan="1" colspan="1">
                                 <code>wsu</code>
                             </td><td rowspan="1" colspan="1">
                                 <code>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd</code>
@@ -225,7 +229,6 @@
                             </td><td rowspan="1" colspan="1">[<a href="#XMLSchemaPart1">[XML Schema Structures]</a>]</td></tr></tbody></table><br><p>All information items defined by this specification are identified by the XML
                     namespace URI [<a href="#XML-NS">[XML Namespaces]</a>] <code>http://www.w3.org/ns/ws-policy</code>. A <a href="http://www.w3.org/2007/02/ws-policy.xsd">normative XML Schema</a> [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>, <a href="#XMLSchemaPart2">[XML Schema Datatypes]</a>] document can be
                     obtained indirectly by dereferencing the namespace document at the WS-Policy 1.5
-
                     namespace URI.</p><p>It is the intent of the W3C Web Services Policy Working Group that the
                     Web Services Policy 1.5 - Framework and Web Services Policy 1.5 - Attachment XML namespace URI will not
                     change arbitrarily with each subsequent revision of the corresponding XML Schema
@@ -250,6 +253,10 @@
                     NOT</span>", "<span class="rfc2119">RECOMMENDED</span>", "<span class="rfc2119">MAY</span>", and
                         "<span class="rfc2119">OPTIONAL</span>" in this document are to be interpreted as
                     described in RFC 2119 [<a href="#RFC2119">[IETF RFC 2119]</a>]. </p><p>We introduce the following terms that are used throughout this document:</p><dl><dt class="label">
+         <a href="#collection">collection</a>
+      </dt><dd><p> The items in a
+                            <b>collection</b> in this specification are unordered and may contain duplicates. 
+                   </p></dd><dt class="label">
          <a href="#ignorable_policy_assertion">ignorable policy assertion</a>
       </dt><dd><p>An
                             <b>ignorable policy assertion</b> is an assertion that may be
@@ -265,11 +272,8 @@
                         alternatives</a>. </p></dd><dt class="label">
          <a href="#policy_alternative">policy alternative</a>
       </dt><dd><p>A <b>policy
-                            alternative</b> is a potentially empty collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.</p></dd><dt class="label">
-         <a href="#policy_alternative_vocabulary">policy alternative vocabulary</a>
-      </dt><dd><p>A <b>policy alternative vocabulary</b> is the set of all <a title="policy assertion type" href="#policy_assertion_type">policy assertion types</a> within the
-                            <a title="policy alternative" href="#policy_alternative">policy
-                    alternative</a>.</p></dd><dt class="label">
+                            alternative</b> is a potentially empty 
+                            <a title="collection" href="#collection"> collection </a> of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.</p></dd><dt class="label">
          <a href="#policy_assertion">policy assertion</a>
       </dt><dd><p>A <b>policy
                         assertion</b> represents a requirement, a capability, or other property
@@ -296,11 +300,7 @@
          <a href="#policy_subject">policy subject</a>
       </dt><dd><p>A <b>policy subject</b> is
                         an entity (e.g., an endpoint, message, resource, operation) with which a
-                            <a title="policy" href="#policy">policy</a> can be associated. </p></dd><dt class="label">
-         <a href="#policy_vocabulary">policy vocabulary</a>
-      </dt><dd><p>A
-                            <b>policy vocabulary</b> is the set of all <a title="policy assertion type" href="#policy_assertion_type">policy assertion types</a> used in a
-                        policy.</p></dd></dl></div></div><div class="div1">
+                            <a title="policy" href="#policy">policy</a> can be associated. </p></dd></dl></div></div><div class="div1">
 <h2><a name="Policy_Model" id="Policy_Model"></a>3. Policy Model</h2><p>This section defines an abstract model for policies and for operations upon policies.</p><p>The descriptions below use XML Infoset terminology for convenience of description.
                 However, this abstract model itself is independent of how it is represented as an
                 XML Infoset. </p><div class="div2">
@@ -326,9 +326,14 @@
                     interpreted independent of their <a title="policy subject" href="#policy_subject">policy
                     subjects</a>.</p><p>Authors <span class="rfc2119">MAY</span> define that an assertion contains a <a title="policy expression" href="#policy_expression">policy expression</a> (as defined in <a href="#rPolicy_Expression"><b>4. Policy Expression</b></a>) as one of its <em>children</em>. <a title="nested policy expression" href="#nested_policy_expression">Nested policy
                         expression(s)</a> are used by authors to further qualify one or more
-                    specific aspects of the original assertion. For example, security policy authors
+                    specific aspects of the <span class="diff-add"><span>parent policy</span></span><span class="diff-del"><span>original </span></span>assertion. <span class="diff-add"><span>The qualification may indicate 
+                    a relationship or context between the parent policy assertion and 
+                    a nested policy expression. </span></span>For <span class="diff-add"><span>example within a</span></span><span class="diff-del"><span>example, </span></span>security <span class="diff-add"><span>domain, security</span></span>policy 
+                    authors
                     may define an assertion describing a set of security algorithms to qualify the
-                    specific behavior of a security binding assertion. </p><p>The XML Infoset of a <a title="policy assertion" href="#policy_assertion">policy assertion</a>
+                    specific behavior of a security binding assertion. <span class="diff-add"><span>A parent policy assertion 
+                    of one domain may also serve as a container for the nested policy expression 
+                    from another domain.</span></span></p><p>The XML Infoset of a <a title="policy assertion" href="#policy_assertion">policy assertion</a>
                     <span class="rfc2119">MAY</span> contain a non-empty <em>attributes</em> property and/or a non-empty <em>children</em> property. Such properties, excluding the Attribute and
                     Element Information Items from the WS-Policy language XML namespace name are
                         <a title="policy assertion parameter" href="#policy_assertion_parameter">policy assertion
@@ -345,28 +350,39 @@
                     consider when the identity of the root Element Information Item alone is enough
                     to convey the requirement or capability.</p></div><div class="div2">
 <h3><a name="rPolicy_Alternative" id="rPolicy_Alternative"></a>3.2 Policy Alternative</h3><p>[<a name="policy_alternative" id="policy_alternative" title="policy alternative">Definition</a>: A <b>policy
-                            alternative</b> is a potentially empty collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.] An
-                    alternative with zero assertions indicates no behaviors. An alternative with one
+                            alternative</b> is a potentially empty 
+                            <span class="diff-add"><a title="collection" href="#collection"> collection </a></span> of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.] 
+                   <span class="diff-add">[<a name="collection" id="collection" title="collection">Definition</a>:  <span class="diff-add"><span>The items in a
+                            </span></span><b><span class="diff-add"><span>collection</span></span></b> <span class="diff-add"><span>in this specification are unordered and may contain duplicates. 
+                   </span></span>]</span>
+                            An alternative with zero assertions indicates no behaviors. An alternative with one
                     or more assertions indicates behaviors implied by those, and only those
-                    assertions. [<a name="policy_vocabulary" id="policy_vocabulary" title="policy vocabulary">Definition</a>: A
-                            <b>policy vocabulary</b> is the set of all <a title="policy assertion type" href="#policy_assertion_type">policy assertion types</a> used in a
-                        policy.]
-                    [<a name="policy_alternative_vocabulary" id="policy_alternative_vocabulary" title="policy alternative vocabulary">Definition</a>: A <b>policy alternative vocabulary</b> is the set of all <a title="policy assertion type" href="#policy_assertion_type">policy assertion types</a> within the
-                            <a title="policy alternative" href="#policy_alternative">policy
-                    alternative</a>.] When an assertion whose type is part of the
+                    assertions. <span class="diff-del"><span>A
+                            policy vocabulary is the set of all policy assertion types used in a
+                        policy.
+                    A policy alternative vocabulary is the set of all policy assertion types within the
+                            policy
+                    alternative. When an assertion whose type is part of the
                     policy's vocabulary is not included in a policy alternative, the policy
                     alternative without the assertion type indicates that the assertion will not be
                     applied in the context of the attached policy subject. See the example in
-                    Section <a href="#Optional_Policy_Assertions"><b>4.3.1 Optional Policy Assertions</b></a></p><p>Assertions within an alternative are not ordered, and thus aspects such as the
+                    Section </span></span></p><p>Assertions within an alternative are not ordered, and thus aspects such as the
                     order in which behaviors (indicated by assertions) are applied to a <a title="policy subject" href="#policy_subject">subject</a> are beyond the scope of this
                     specification. However, authors can write assertions that control the order in
-                    which behaviours are applied.</p><p>A policy alternative <span class="rfc2119">MAY</span> contain multiple assertions of the
+                    which <span class="diff-chg"><span>behaviors </span></span>are applied.</p><p>A policy alternative <span class="rfc2119">MAY</span> contain multiple assertions of the
                     same type. Mechanisms for determining the aggregate behavior indicated by the
                     assertions (and their Post-Schema-Validation Infoset (PSVI) (See XML Schema Part
                     1 [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>]) content, if any) are specific to the
-                    assertion type and are outside the scope of this document.</p><p>Note: Depending on the semantics of the domain specific policy assertions a
+                    assertion type and are outside the scope of this document.</p><p>Note: Depending on the semantics of the domain specific policy assertions 
+                    <span class="diff-add"><span>regardless if they are qualified by nested policy expressions, </span></span>a
                     combination of the policy assertions can be required to specify a particular
-                    behavior. </p></div><div class="div2">
+                    behavior. <span class="diff-add"><span>For example, a combination of two or three assertions from the 
+                    WS-SecurityPolicy [</span></span><span class="diff-add"><a href="#WS-SecurityPolicy">[WS-SecurityPolicy]</a></span><span class="diff-add"><span>] specification is used to indicate message-level 
+                    security for protecting messages - that is, the </span></span><span class="diff-add"><code><span class="diff-add"><span>sp:AsymmetricBinding</span></span></code></span> 
+                    <span class="diff-add"><span>assertion is used to indicate message-level security, the </span></span><span class="diff-add"><code><span class="diff-add"><span>sp:SignedParts</span></span></code></span> 
+                    <span class="diff-add"><span>assertion is used to indicate the parts of a message to be protected 
+                    and the </span></span><span class="diff-add"><code><span class="diff-add"><span>sp:EncryptedParts</span></span></code></span> <span class="diff-add"><span>assertion is used to indicate the parts of 
+                    a message that require confidentiality.</span></span></p></div><div class="div2">
 <h3><a name="rPolicy" id="rPolicy"></a>3.3 Policy</h3><p>[<a name="policy" id="policy" title="policy">Definition</a>: A <b>policy</b> is a potentially empty
                         collection of <a title="policy alternative" href="#policy_alternative">policy
                         alternatives</a>. ] A policy with zero alternatives contains
@@ -403,11 +419,9 @@
                     the policy. Note that although policy alternatives are meant to be mutually
                     exclusive, it cannot be decided in general whether or not more than one
                     alternative can be supported at the same time.</p><p>Note that an entity may be able to support a policy even if the entity does not
-                    understand the <a title="policy assertion type" href="#policy_assertion_type">type</a> of each
-                    assertion in the <a title="policy vocabulary" href="#policy_vocabulary">vocabulary of the
-                    policy</a>; the entity only has to understand the type of each assertion
-                    in the vocabulary of a <a title="policy alternative" href="#policy_alternative">policy
-                    alternative</a> the entity supports. This characteristic is crucial to
+                    understand the type of each assertion in the <span class="diff-add"><span>policy;</span></span><span class="diff-del"><span>vocabulary of the
+                    policy; </span></span>the entity only has to understand the type of each assertion
+                    in <span class="diff-del"><span>the vocabulary of </span></span>a policy alternative <span class="diff-add"><span>that </span></span>the entity supports. This characteristic is crucial to
                     versioning and incremental deployment of new assertions because this allows a
                     provider's policy to include new assertions in new alternatives while allowing
                     entities to continue to use old alternatives in a backward-compatible
@@ -591,7 +605,7 @@
                                     (i.e., no assertions are needed in the nested policy
                                     expression), the assertion <span class="rfc2119">MUST</span> include an
                                     empty <code>&lt;wsp:Policy/&gt;</code> Element
-                                    Information Item in its <em>children</em> property; as explained in Section <a href="#Policy_Operators"><b>4.3.3 Policy Operators</b></a>, this is equivalent to a nested
+                                    Information Item in its <em>children</em> <span class="diff-chg"><span>property. As </span></span>explained in Section <a href="#Policy_Operators"><b>4.3.3 Policy Operators</b></a>, this is equivalent to a nested
                                     policy expression with a single alternative that has zero
                                     assertions.</p><p>Note: This specification does not define processing for arbitrary
                                         <code>wsp:Policy</code> Element Information Items in the
@@ -802,8 +816,8 @@
     &lt;!-- assertion 1 --&gt;
     &lt;!-- assertion 2 --&gt;
   &lt;/wsp:All&gt;
-&lt;/wsp:ExactlyOne&gt;</pre></div></dd><dt class="label">Empty</dt><dd><ul><li><p><code>&lt;wsp:All /&gt;</code> expresses a policy
-                                            with zero policy assertions. Note that since
+&lt;/wsp:ExactlyOne&gt;</pre></div></dd><dt class="label">Empty</dt><dd><ul><li><p><code>&lt;wsp:All /&gt;</code> expresses a policy <span class="diff-add"><span>alternative
+                                            </span></span>with zero policy assertions. Note that since
                                                 <code>wsp:Policy</code> is equivalent to
                                             <code>wsp:All</code>, <code>&lt;wsp:Policy
                                             /&gt;</code> is therefore equivalent to
@@ -1052,14 +1066,20 @@
                                 false, the assertion is not an <a title="ignorable policy assertion" href="#ignorable_policy_assertion">ignorable policy
                                 assertion</a>. Omitting this attribute is semantically
                                 equivalent to including it with a value of false.</p></dd></dl></div><div class="div2">
-<h3><a name="Policy_Intersection" id="Policy_Intersection"></a>4.5 Policy Intersection</h3><p>Policy intersection is useful when two or more parties express <a title="policy" href="#policy">policy</a> and want to limit the <a title="policy alternative" href="#policy_alternative">policy alternatives</a> to those that are
+<h3><a name="Policy_Intersection" id="Policy_Intersection"></a>4.5 Policy Intersection</h3><p>Policy intersection is <span class="diff-add"><span>OPTIONAL but, a </span></span>useful <span class="diff-add"><span>tool </span></span>when two or more parties express 
+                <a title="policy" href="#policy">policy</a> and want to limit the <a title="policy alternative" href="#policy_alternative">policy alternatives</a> to those that are
                     mutually compatible. For example, when a requester and a provider express
                     requirements on a message exchange, intersection identifies compatible policy
                     alternatives (if any) included in both requester and provider policies.
-                    Intersection is a commutative function that takes two policies and returns a
-                    policy. There are two modes for intersection: strict and lax. How the mode is
-                    selected or indicated for the policy intersection is outside the scope of this
-                    specification. </p><p>Because the set of behaviors indicated by a <a title="policy alternative" href="#policy_alternative">policy alternative</a> depends on the domain-specific semantics of
+                    <span class="diff-add"><span>Policy </span></span>Intersection is a commutative <span class="diff-chg"><span>operation performed on </span></span>two policies <span class="diff-add"><span>that 
+                    yields a policy that</span></span><span class="diff-del"><span>and </span></span><span class="diff-chg"><span>contains </span></span>a <span class="diff-add"><span>collection of the compatible policy alternatives. 
+                    (Note: while policy intersection at times is analogous with set intersection, 
+                    it does not imply formal
+                    </span></span><span class="diff-del"><span>policy. </span></span><span class="diff-add"><span>set intersection semantics). </span></span>There are two modes for 
+                    intersection: strict and lax. How the mode is selected or indicated for the policy 
+                    intersection is outside the scope of this
+                    specification. 
+                </p><p>Because the set of behaviors indicated by a <a title="policy alternative" href="#policy_alternative">policy alternative</a> depends on the domain-specific semantics of
                     the collected assertions, determining whether two policy alternatives are
                     compatible generally involves domain-specific processing. If a domain-specific
                     intersection processing algorithm is required this will be known from the QNames
@@ -1080,13 +1100,15 @@
                                         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>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
+                            containing all of the <span class="diff-add"><span>occurrences of all of the </span></span>assertions <span class="diff-chg"><span>from each </span></span><span class="diff-add"><span>of the
+                            alternatives (i.e., the bag union of the two).</span></span><span class="diff-del"><span>alternatives.</span></span></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
                             intersections between all pairs of compatible alternatives, choosing one
                             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><span class="diff-chg"><span>(01) &lt;wsp:Policy
+                    the aggregate behavior indicated by multiple assertions of the same <a title="policy assertion type" href="#policy_assertion_type">policy assertion type</a>.</p><div class="diff-add"><p class="diff-add"><span class="diff-add"><span>An entity applies all the behaviors implied by a policy alternative when that policy alternative is chosen from the intersection result (see </span></span><a href="#Web_services"><b>3.4 Policies of Entities in a Web Services Based System</b></a><span class="diff-add"><span>).  If an entity includes a policy assertion type A in its policy, and this policy assertion type A does not occur in an intersected result, then that entity SHOULD not apply the behavior implied by assertion type A.  If a policy assertion type Z is not included in the input policies being intersected then the intersection result is silent about the behavior implied by the assertion type Z.
+</span></span></p></div><p>As an example of intersection, consider two input policies in normal form:</p><div class="exampleInner"><pre><span class="diff-chg"><span>(01) &lt;wsp:Policy
 &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;
@@ -1135,8 +1157,8 @@
 (12)&nbsp; &nbsp; &nbsp; &nbsp;&lt;/sp:SignedElements&gt;
 (13)&nbsp; &nbsp; &nbsp;&lt;/wsp:All&gt;
 (14)&nbsp; &nbsp;&lt;/wsp:ExactlyOne&gt;
-(15) &lt;/wsp:Policy&gt;</span></span></pre></div><p>Because there is only one alternative (A2) in policy P1 with the same vocabulary
-                    — the assertions have the same type — as another alternative
+(15) &lt;/wsp:Policy&gt;</span></span></pre></div><p>Because there is only one alternative (A2) in policy P1 with the same <span class="diff-chg"><span>assertion
+                    </span></span><span class="diff-del"><span>— the assertions have the same </span></span>type <span class="diff-del"><span>— </span></span>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><span class="diff-chg"><span>(01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
@@ -1164,7 +1186,45 @@
                     these two assertions are compatible depends on the domain-specific semantics of
                     the <code>sp:SignedParts</code> assertion. To leverage intersection, assertion
                     authors are encouraged to factor assertions such that two assertions of the same
-                    assertion type are always (or at least typically) compatible.</p></div><div class="div2">
+                    assertion type are always (or at least typically) compatible.</p><div class="diff-add"><p class="diff-add"><span class="diff-add"><span>As another example of intersection of WS-Addressing assertions that utilize the framework intersection algorithm, consider two input policies:</span></span></p></div><div class="diff-add"><div class="exampleInner"><pre class="diff-add">&lt;wsp:Policy
+      xmlns:wsp="http://www.w3.org/ns/ws-policy"
+      xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" &gt;
+  &lt;wsp:ExactlyOne&gt;
+    &lt;wsp:All&gt;        &lt;!-- Alternative A5 --&gt;
+      &lt;wsam:Addressing&gt;
+        &lt;wsp:Policy/&gt;
+      &lt;/wsam:Addressing&gt;
+    &lt;/wsp:All&gt;
+  &lt;/wsp:ExactlyOne&gt;
+&lt;/wsp:Policy&gt;</pre></div></div><div class="diff-add"><p class="diff-add"><span class="diff-add"><span>Lines (04)-(06) in the above policy expression contain an addressing 
+                    policy assertion with the empty </span></span><code><span class="diff-add"><span>&lt;wsp:Policy/&gt;</span></span></code> <span class="diff-add"><span>in line (05). 
+                    The empty </span></span><code><span class="diff-add"><span>&lt;wsp:Policy/&gt;</span></span></code> <span class="diff-add"><span>is a nested policy expression with an 
+                alternative that has zero assertions. In the example above, the addressing 
+                assertion indicates the use of addressing without any restriction.</span></span></p></div><div class="diff-add"><div class="exampleInner"><pre class="diff-add">&lt;wsp:Policy
+      xmlns:wsp="http://www.w3.org/ns/ws-policy"
+      xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" &gt;
+  &lt;wsp:ExactlyOne&gt;
+    &lt;wsp:All&gt;       &lt;!-- Alternative A6 --&gt;
+      &lt;wsam:Addressing&gt;
+        &lt;wsp:Policy&gt;
+          &lt;wsam:AnonymousResponses/&gt;
+        &lt;/wsp:Policy&gt;
+      &lt;/wsam:Addressing&gt;
+    &lt;/wsp:All&gt;
+  &lt;/wsp:ExactlyOne&gt;
+&lt;/wsp:Policy&gt;</pre></div></div><div class="diff-add"><p class="diff-add"><span class="diff-add"><span>Lines (04)-(08) in the above policy expression contain an addressing 
+                policy assertion with a nested policy expression in lines (05)-(06). 
+                The nested policy expression indicates that the provider requires request 
+                messages to use response endpoint EPRs that contain the anonymous URI. 
+                The nested policy expression contains an alternative that has one 
+                    assertion, </span></span><code><span class="diff-add"><span>wsam:AnonymousResponses</span></span></code><span class="diff-add"><span>.</span></span></p></div><div class="diff-add"><p class="diff-add"><span class="diff-add"><span>The two assertions in alternatives A5 and A6 have the same assertion type 
+                and have nested policy expressions. The nested policy expression within
+                 the addressing assertion in the alternative A5 contains an alternative 
+                 that has zero assertions. The nested policy expression within the
+                  addressing assertion in the alternative A6 contains an alternative 
+                  that has one assertion. The nested policy expressions within these 
+                  two assertions are incompatible because the alternative in one is
+                   incompatible with the alternative in the other.</span></span></p></div><div class="diff-add"><p class="diff-add"><span class="diff-add"><span>Therefore, the two assertions are incompatible and hence the two alternatives are incompatible.</span></span></p></div></div><div class="div2">
 <h3><a name="IRI_Policy_Expressions" id="IRI_Policy_Expressions"></a>4.6 Use of IRIs in Policy Expressions</h3><p>Policy expressions use IRIs for some identifiers. This document does not define a
                     base URI but relies on the mechanisms defined in XML Base [<a href="#XMLBASE">[XML BASE]</a>] and RFCs 3023 [<a href="#RFC3023">[IETF RFC 3023]</a>], 3986 [<a href="#RFC3986">[IETF RFC 3986]</a>] and
                     3987 [<a href="#RFC3987">[IETF RFC 3987]</a>] for establishing a base URI against which
@@ -1378,7 +1438,12 @@
                         Editors. Organization for the Advancement of Structured Information
                         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.   (See http://uddi.org/pubs/uddi-v3.0.1-20031014.htm.)</dd><dt class="label"><span class="diff-chg"><a name="WS-SecurityPolicy"></a>WS-SecurityPolicy</span></dt><dd><div class="diff-chg">
+                        3.0</a> specification is available at http://uddi.org/pubs/uddi_v3.htm.   (See http://uddi.org/pubs/uddi-v3.0.1-20031014.htm.)</dd><dt class="label"><span class="diff-add"><a name="WS-AddressingMetadata"></a>WS-Addressing Metadata</span></dt><dd><div class="diff-add">
+                        <a href="http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/"><cite><span class="diff-add"><span>Web Services Addressing 1.0 - Metadata</span></span></cite></a><span class="diff-add"><span>, M. Gudgin, M. Hadley, T.
+                        Rogers and Ü. Yalçinalp, Editors. World Wide Web Consortium, 16 May 2007. This version of
+                        the Web Services Addressing 1.0 - Metadata is
+                        http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/. The </span></span><a href="http://www.w3.org/TR/ws-addr-metadata"><span class="diff-add"><span>latest version of Web Services Addressing 1.0 -
+                            Metadata</span></span></a> <span class="diff-add"><span>is available at http://www.w3.org/TR/ws-addr-metadata. </span></span>  (See http://www.w3.org/TR/2007/WD-ws-addr-metadata-20070516/.)</div></dd><dt class="label"><span class="diff-add"><a name="WS-SecurityPolicy"></a>WS-SecurityPolicy</span></dt><dd><div class="diff-add">
                         <a href="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"><cite>WS-SecurityPolicy v1.0</cite></a>, A. Nadalin, M. Gudgin, A.
                         Barbir, and H. Granqvist, Editors. Organization for the Advancement of
                         Structured Information Standards, 8 December 2005. Available at
@@ -1424,7 +1489,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 <span class="diff-chg"><span>30 March, </span></span>2007 is
-                below:</p><ul><li><p><span class="diff-add"><span>Editorial changes to align with the OASIS WS-SecurityPolicy specification.</span></span><span class="diff-del"><span>None.</span></span></p></li></ul></div><div class="div1">
+                below:</p><ul><li><p><span class="diff-add"><span>Editorial changes to align with the OASIS WS-SecurityPolicy specification.</span></span><span class="diff-del"><span>None.</span></span></p></li><div class="diff-add"><li class="diff-add"><p><span class="diff-add"><span>Clarified the meaning of a policy intersection result.</span></span></p></li></div></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
@@ -1482,4 +1547,36 @@
                             Editors' action 
                             <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/248"><span class="diff-add"><span>248</span></span></a>.
                         </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070501</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">ASV</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Reset Section <a href="#change-description"><b>D. Changes in this Version of the Document</b></a>.
+                        </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070513</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">ASV</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the 
+                        <a href="http://lists.w3.org/Archives/Public/public-ws-policy/2007May/0005.html"><span class="diff-add"><span>resolution</span></span></a> 
+                            for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4479"><span class="diff-add"><span>4479</span></span></a>. 
+                            Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/259"><span class="diff-add"><span>259</span></span></a>.
+                        </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070524</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">DBO</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the 
+                        <a href="http://lists.w3.org/Archives/Public/public-ws-policy/2007May/0283.html"><span class="diff-add"><span>resolution</span></span></a> 
+                            for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4554"><span class="diff-add"><span>4554</span></span></a>. 
+                            Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/297"><span class="diff-add"><span>297</span></span></a>.
+                            </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070528</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">MH</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the changes proposed at F2F
+                            <a href="http://www.w3.org/2007/05/23-ws-policy-minutes.html#item08"><span class="diff-add"><span>indicated by this reference</span></span></a> 
+                            for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4552"><span class="diff-add"><span>4552</span></span></a>. 
+                            Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/275"><span class="diff-add"><span>275</span></span></a>.
+                            </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070528</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">MH</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the changes proposed at F2F
+                            for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4556"><span class="diff-add"><span>4556</span></span></a>. 
+                            Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/276"><span class="diff-add"><span>276</span></span></a>.
+                            </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070529</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">PY</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the changes proposed at the Ottawa F2F
+                            for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4553"><span class="diff-add"><span>4553</span></span></a>. 
+                            Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/278"><span class="diff-add"><span>278</span></span></a>.
+                        </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070529</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">PY</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the changes proposed at the Ottawa F2F
+                            for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4555"><span class="diff-add"><span>4555</span></span></a>. 
+                            Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/279"><span class="diff-add"><span>279</span></span></a>.
+                        </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070529</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">PY</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the changes proposed at the Ottawa F2F
+                            for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4554"><span class="diff-add"><span>4554</span></span></a>. 
+                            Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/280"><span class="diff-add"><span>280</span></span></a>.
+                        </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070529</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">ASV</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the <a href="http://lists.w3.org/Archives/Public/public-ws-policy/2007May/0210.html"><span class="diff-add"><span>resolution</span></span></a>
+                            for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4577"><span class="diff-add"><span>4577</span></span></a>. 
+                            Editors' action 
+                            <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/274"><span class="diff-add"><span>274</span></span></a>.
+                        </td></div></tr></div><div class="diff-add"><tr class="diff-add"><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070529</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">ASV</td></div><div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the <a href="http://lists.w3.org/Archives/Public/public-ws-policy/2007May/att-0274/ws-policyframework-context-draft-mm1-051507-1.htm__charset_UTF-8"><span class="diff-add"><span>resolution</span></span></a>
+                            for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4579"><span class="diff-add"><span>4579</span></span></a>. 
+                            Editors' action 
+                            <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/312"><span class="diff-add"><span>312</span></span></a>.
                         </td></div></tr></div></tbody></table><br></div></div></body></html>
\ No newline at end of file
Received on Wednesday, 30 May 2007 05:25:13 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 8 January 2008 14:21:03 GMT