W3C home > Mailing lists > Public > public-ws-policy-eds@w3.org > November 2006

2006/ws/policy ws-policy-framework-diff20061102.xml,1.3,1.4 ws-policy-attachment-diff20061102.xml,1.3,1.4 ws-policy-attachment-diff20061102.html,1.3,1.4 ws-policy-framework-diff20061102.html,1.3,1.4

From: Asir Vedamuthu via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 10 Nov 2006 05:16:05 +0000
To: public-ws-policy-eds@w3.org
Message-Id: <E1GiOkH-0002fP-5U@lionel-hutz.w3.org>

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

Modified Files:
	ws-policy-framework-diff20061102.xml 
	ws-policy-attachment-diff20061102.xml 
	ws-policy-attachment-diff20061102.html 
	ws-policy-framework-diff20061102.html 
Log Message:
Re-generated DIFFs

Index: ws-policy-framework-diff20061102.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework-diff20061102.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ws-policy-framework-diff20061102.html	3 Nov 2006 20:54:02 -0000	1.3
+++ ws-policy-framework-diff20061102.html	10 Nov 2006 05:16:02 -0000	1.4
@@ -93,8 +93,8 @@
 <h2><a name="status">Status of this Document</a></h2><p><strong>This document is an editors' copy that has
         no official standing.</strong></p><p></p></div>
     <hr><div class="toc">
-<h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#tocRange">Introduction</a><br>&nbsp;&nbsp;&nbsp;&nbsp;1.1 <a href="#Example">Example</a><br>2. <a href="#Notation_Terminlogy">Notations and Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.1 <a href="#Notational_Conventions">Notational Conventions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.2 <a href="#Extensibility">Extensibility</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.3 <a href="#XML_Namespaces">XML Namespaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.4 <a href="#Terminology">Terminology</a><br>3. <a href="#Policy_Model">Policy Model</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.1 <a href="#rPolicy_Assertion">Policy Assertion</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.2 <a href="#rPolicy_Alternative">Policy Alternative</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.3 <a href="#rPolicy">Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.4 <a href="#Web_services">Policies of Entities in a Web Services Based System</a><br>4. <a href="#rPolicy_Expression">Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.1 <ahref="#Normal_Form_Policy_Expression">Normal Form Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.2 <a href="#Policy_Identification">Policy Identification</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.3 <a href="#Compact_Policy_Expression">Compact Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.1 <a href="#Optional_Policy_Assertions">Optional Policy Assertions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.2 <a href="#Policy_Assertion_Nesting">Policy Assertion Nesting</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.3 <a href="#Policy_Operators">Policy Operators</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.4 <a href="#Policy_References">Policy References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.5 <a href="#Policy_Inclusion">Policy Inclusion</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.4 <a href="#Policy_Intersection">Policy Intersection</a><br>5. <a href="#Security_Considerations">Security Considerations</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.1 <a href=#information-disclosure-threats">Information Disclosure Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.2 <a href="#spoofing-and-tampering-threats">Spoofing and Tampering Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.3 <a href="#downgrade-threats">Downgrade Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.4 <a href="#repudiation-threats">Repudiation Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.5 <a href="#denial-of-service-threats">Denial of Service Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.6 <a href="#general-xml-considerations">General XML Considerations</a><br>6. <a href="#Conformance">Conformance</a><br></p>
-<h3><a id="appendix" name="appendix">Appendices</a></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>&nbsp;&nbsp;&nbsp;&nbsp;A.2 <a href="#Informative-References">Other References</a><br>B. <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br>C. <a href="#change-description">Changes in this Version of the Document</a> (Non-Normative)<br>D. <a href="#change-log">Web Services Policy 1.5 - Framework Change Log</a> (Non-Normative)<br></p></div><hr><div class="body">
+<h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#tocRange">Introduction</a><br>&nbsp;&nbsp;&nbsp;&nbsp;1.1 <a href="#Example">Example</a><br>2. <a href="#Notation_Terminlogy">Notations and Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.1 <a href="#Notational_Conventions">Notational Conventions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.2 <a href="#Extensibility">Extensibility</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.3 <a href="#XML_Namespaces">XML Namespaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.4 <a href="#Terminology">Terminology</a><br>3. <a href="#Policy_Model">Policy Model</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.1 <a href="#rPolicy_Assertion">Policy Assertion</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.2 <a href="#rPolicy_Alternative">Policy Alternative</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.3 <a href="#rPolicy">Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.4 <a href="#Web_services">Policies of Entities in a Web Services Based System</a><br>4. <a href="#rPolicy_Expression">Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.1 <ahref="#Normal_Form_Policy_Expression">Normal Form Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.2 <a href="#Policy_Identification">Policy Identification</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.3 <a href="#Compact_Policy_Expression">Compact Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.1 <a href="#Optional_Policy_Assertions">Optional Policy Assertions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.2 <a href="#Policy_Assertion_Nesting">Policy Assertion Nesting</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.3 <a href="#Policy_Operators">Policy Operators</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.4 <a href="#Policy_References">Policy References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.5 <a href="#Policy_Inclusion">Policy Inclusion</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.4 <a href="#ignorable-policy-assertions">Ignorable Policy Assertions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.5 <a href="#Policy_Intersection">Policy Intersection</a><br>5. a href="#Security_Considerations">Security Considerations</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.1 <a href="#information-disclosure-threats">Information Disclosure Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.2 <a href="#spoofing-and-tampering-threats">Spoofing and Tampering Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.3 <a href="#downgrade-threats">Downgrade Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.4 <a href="#repudiation-threats">Repudiation Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.5 <a href="#denial-of-service-threats">Denial of Service Threats</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.6 <a href="#general-xml-considerations">General XML Considerations</a><br>6. <a href="#Conformance">Conformance</a><br></p>
+<h3><a id="appendix" name="appendix">Appendices</a></h3><p class="toc">A. <a href="#ietf-draft">The application/wspolicy+xml Media Type</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.1 <a href="#ietf-reg">Registration</a><br>B. <a href="#References">References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.1 <a href="#Normative-References">Normative References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.2 <a href="#Informative-References">Other References</a><br>C. <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br>D. <a href="#change-description">Changes in this Version of the Document</a> (Non-Normative)<br>E. <a href="#change-log">Web Services Policy 1.5 - Framework Change Log</a> (Non-Normative)<br></p></div><hr><div class="body">
         <div class="div1">
             
 <h2><a name="tocRange"></a>1. Introduction</h2>
@@ -141,24 +141,24 @@
             
             <div class="exampleOuter">
                 <p class="exampleHead" style="text-align: left"><a name="ex-wsp-use-security-assertations"></a><i><span>Example 1-1. </span>Use of Web Services Policy with security policy assertions.</i></p>
-                <div class="exampleInner"><pre>
+                <div class="exampleInner"><pre><span class="diff-chg">
                 
 (01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
-(03)     &lt;sp:wsp:All&gt;
+(03)     &lt;wsp:All&gt;
 (04)&nbsp; &nbsp; &nbsp;   &lt;sp:SignedParts/&gt;
 (05)           &lt;sp:Body/&gt;
 (06)&nbsp; &nbsp; &nbsp;   &lt;/sp:SignedParts/&gt;
 (07)&nbsp; &nbsp;  &lt;/wsp:All&gt;
-(08)     &lt;sp:wsp:All&gt;
+(08)     &lt;wsp:All&gt;
 (09)&nbsp; &nbsp; &nbsp;   &lt;sp:EncryptedParts/&gt;
 (10)           &lt;sp:Body/&gt;
 (11)&nbsp; &nbsp; &nbsp;   &lt;/sp:EncryptedParts/&gt;
 (12)&nbsp; &nbsp;  &lt;/wsp:All&gt;
 (13)&nbsp; &nbsp;&lt;/wsp:ExactlyOne&gt;
-(14) &lt;/wsp:Policy&gt;</pre></div> 
+(14) &lt;/wsp:Policy&gt;</span></pre></div> 
             </div>     
             <p>Lines (03-06) represent one
                 policy alternative for signing a message body.</p>
@@ -349,6 +349,17 @@
 <dl>
    
       <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 ignored for policy intersection (as defined in 
+	        <a href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection">4.5 Policy Intersection</a>).</p>
+      </dd>
+   
+   
+      <dt class="label">
          <a href="#nested_policy_expression">nested policy expression</a>
       </dt>
       <dd>
@@ -484,6 +495,17 @@
 	       Assertions indicate domain-specific (e.g.,
 	    security, transactions) semantics and are expected to be
 	    defined in separate, domain-specific specifications.</p>
+	    
+	    <div class="diff-add"><p class="diff-add"><span class="diff-add">An assertion MAY indicate that it is an ignorable policy assertion 
+	    (see </span><a href="#ignorable-policy-assertions"><b>4.4 Ignorable Policy Assertions</b></a><span class="diff-add">). 
+	    </span>[<a title="ignorable policy assertion" name="ignorable_policy_assertion">Definition</a>: <span class="diff-add">An 
+	    </span><b><span class="diff-add">ignorable policy assertion</span></b> <span class="diff-add">is 
+	    an assertion that may be ignored for policy intersection (as defined in 
+	        </span><a href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection"><span class="diff-add">4.5 Policy Intersection</span></a><span class="diff-add">).</span>] <span class="diff-add">By default, an assertion is not 
+	    ignorable for policy intersection.	          
+	    </span></p></div>
+	    
+	    
 
 	    <p>Assertions are typed by the authors
 	    that define them.  [<a title="policy assertion type" name="policy_assertion_type">Definition</a>: A <b>policy assertion type</b> 
@@ -589,12 +611,12 @@
 	      <p>Applied <span class="diff-chg">to a </span>Web services based system, <a title="policy" href="#policy">policy</a> is used to convey conditions
 	    on an interaction between entities (requester application,
 	      provider service, Web infrastructure component, etc).
-	      <span class="diff-add">An  </span><span class="diff-del">A </span><span class="diff-add">interaction</span><span class="diff-del">policy </span><span class="diff-add">involves one or more message exchanges between two 
-	      entities.</span><span class="diff-del">subject </span><span class="diff-add">It </span>is <span class="diff-chg">the </span><span class="diff-add">responsibility of </span><span class="diff-add"><a title="policy assertion" href="#policy_assertion"><span class="diff-add">assertion</span></a></span> <span class="diff-add">authors to</span><span class="diff-del">entity 
-	    (e.g., </span><span class="diff-add">define 
-	      the interaction scope of </span>an <span class="diff-chg">assertion including any constraints </span><span class="diff-add">on the 
-	      </span><span class="diff-add"><a title="policy subject" href="#policy_subject"><span class="diff-add">policy</span><span class="diff-del">with </span><span class="diff-add">subjects</span></a></span> <span class="diff-add">to </span>which <span class="diff-add">the</span><span class="diff-del">a 
-	    policy </span><span class="diff-chg">assertion </span><span class="diff-add">may </span>be <span class="diff-chg">attached </span><span class="diff-add">and a clear 
+	      <span class="diff-add">An  </span><span class="diff-del">A </span><span class="diff-add">interaction</span><span class="diff-del">policy </span><span class="diff-add">involves one or</span><span class="diff-del">subject </span><span class="diff-add">more message exchanges between two 
+	      entities. It </span>is <span class="diff-chg">the </span><span class="diff-add">responsibility of </span><span class="diff-add"><a title="policy assertion" href="#policy_assertion"><span class="diff-add">assertion</span></a></span> <span class="diff-add">authors to define 
+	      the interaction</span><span class="diff-del">entity 
+	    (e.g., </span><span class="diff-add">scope of </span>an <span class="diff-chg">assertion including any constraints </span><span class="diff-add">on the 
+	      </span><span class="diff-add"><a title="policy subject" href="#policy_subject"><span class="diff-add">policy subjects</span></a></span> <span class="diff-add">to</span><span class="diff-del">with </span>which <span class="diff-add">the</span><span class="diff-del">a 
+	    policy </span><span class="diff-add">assertion may</span><span class="diff-del">can </span>be <span class="diff-chg">attached </span><span class="diff-add">and a clear 
 	      specification of the message (s) within that interaction scope to which the 
 	      assertion applies. </span></p>
 	    
@@ -721,22 +743,22 @@
     form of a policy expression <span class="rfc2119">SHOULD</span> be used where practical.</p>
 
 	      <p>For example, the following is the normal form of a policy expression.</p>
-<div class="exampleInner"><pre>(01) &lt;wsp:Policy
+<div class="exampleInner"><pre><span class="diff-chg">(01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" &gt;
 (02)&nbsp; &nbsp;&lt;wsp:ExactlyOne&gt;
-(03)     &lt;sp:wsp:All&gt;
+(03)     &lt;wsp:All&gt;
 (04)&nbsp; &nbsp; &nbsp;   &lt;sp:SignedParts/&gt;
 (05)           &lt;sp:Body/&gt;
 (06)&nbsp; &nbsp; &nbsp;   &lt;/sp:SignedParts/&gt;
 (07)&nbsp; &nbsp;  &lt;/wsp:All&gt;
-(08)     &lt;sp:wsp:All&gt;
+(08)     &lt;wsp:All&gt;
 (09)&nbsp; &nbsp; &nbsp;   &lt;sp:EncryptedParts/&gt;
 (10)           &lt;sp:Body/&gt;
 (11)&nbsp; &nbsp; &nbsp;   &lt;/sp:EncryptedParts/&gt;
 (12)&nbsp; &nbsp;  &lt;/wsp:All&gt;
 (13)&nbsp; &nbsp;&lt;/wsp:ExactlyOne&gt;
-(14) &lt;/wsp:Policy&gt;</pre></div>
+(14) &lt;/wsp:Policy&gt;</span></pre></div>
 
 <p>Lines (03-07) and Lines (08-11) express the two alternatives in the
 policy. If the first alternative is selected, the message body needs to be signed [<a href="#WS-SecurityPolicy">[WS-SecurityPolicy]</a>] is supported;
@@ -937,7 +959,7 @@
 assertions. The reason for requiring at least an empty <code>&lt;wsp:Policy/&gt;</code> 
 Element above is to ensure that two assertions of the same type will always be 
 compatible and an intersection would not fail 
-(see Section <a href="#Policy_Intersection"><b>4.4 Policy Intersection</b></a>).</p>
+(see Section <a href="#Policy_Intersection"><b>4.5 Policy Intersection</b></a>).</p>
 <p>Note: This specification does not define processing for arbitrary
 <code class="elt">wsp:Policy</code>  Element Information Items in the descendants
 of an assertion parameter, e.g., in the <em>children</em> property of one of the <em>children</em> as in
@@ -1267,7 +1289,8 @@
 
 
 <dt class="label"><code class="attr">/wsp:PolicyReference/@Digest</code> </dt>
-<dd><p>This optional attribute specifies the digest of the referenced policy expression. This is used to ensure the included policy is the expected policy. &nbsp;If omitted, there is no implied value.</p></dd>
+    <dd><p>This <span class="diff-del">optional </span>attribute <span class="diff-add">is of type </span><span class="diff-add"><code class="attr"><span class="diff-add">xs:boolean</span></code> </span> <span class="diff-add">and </span>specifies the digest of the referenced policy expression. This is used to ensure the included policy is the expected policy.
+    <span class="diff-chg">If </span>omitted, there is no implied value.</p></dd>
 
 
 <dt class="label"><code class="attr">/wsp:PolicyReference/@DigestAlgorithm</code> </dt>
@@ -1344,27 +1367,70 @@
 <p>There are times when it is desirable to "re-use" a portion of a policy expression. Generally, this can be accomplished by placing the common assertions in a separate policy expression and referencing it. </p>
 </div>
 </div>
+<div class="diff-add"><div class="div2">
+
+<h3><a name="ignorable-policy-assertions"></a>4.4 <span class="diff-add">Ignorable Policy Assertions</span></h3>
+<p><span class="diff-add">The </span><code class="attr"><span class="diff-add">wsp:Ignorable</span></code>  <span class="diff-add">attribute indicates if a policy assertion is an 
+</span><a title="ignorable policy assertion" href="#ignorable_policy_assertion"><span class="diff-add">ignorable policy assertion</span></a><span class="diff-add">. The schema 
+outline for this attribute is as follows:</span></p>
+<div class="exampleInner"><pre>&lt;Assertion ( wsp:Ignorable="xs:boolean" )? &hellip; &gt; &hellip; &lt;/Assertion&gt;</pre></div>    
+<p><span class="diff-add">The following describes the Attribute Information Item defined in the schema outline above:</span></p>
+<dl>   
+    <dt class="label"><span class="diff-add"><code class="attr"><span class="diff-add">/Assertion/@wsp:Ignorable</span></code> </span></dt> 
+    <dd><div class="diff-add"><p><span class="diff-add">This attribute is of type </span><code><span class="diff-add">xs:boolean</span></code><span class="diff-add">. If the actual 
+    value (See XML Schema Part 1 [</span><a href="#XMLSchemaPart1">[XML Schema Structures]</a><span class="diff-add">]) is true, 
+    the assertion is an </span><a title="ignorable policy assertion" href="#ignorable_policy_assertion"><span class="diff-add">ignorable policy assertion</span></a><span class="diff-add">. If the actual value is false, 
+    the assertion is not an </span><a title="ignorable policy assertion" href="#ignorable_policy_assertion"><span class="diff-add">ignorable policy assertion</span></a><span class="diff-add">. Omitting 
+    this attribute is semantically equivalent to including it with a value of false.</span></p></div></dd>
+    
+</dl>
+</div></div>
 <div class="div2">
 
-<h3><a name="Policy_Intersection"></a>4.4 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 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, associative function that takes two policies and returns a policy.</p>
+<h3><a name="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 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 <span class="diff-chg">commutative </span><span class="diff-del">associative </span>function that 
+takes two policies and returns a policy. <span class="diff-add">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.
+</span></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 will be known from the QNames of the specific <a title="policy assertion type" href="#policy_assertion_type">assertion types</a>
+is required <span class="diff-add">this </span>will be known from the QNames of the specific <a title="policy assertion type" href="#policy_assertion_type">assertion types</a>
 involved in the policy alternatives. As a first approximation, an algorithm is defined herein 
-that approximates compatibility in a domain-independent manner; specifically, 
-for two <a title="policy alternative" href="#policy_alternative">policy alternatives</a>  to be compatible, they must at least have the same 
-<a title="policy alternative vocabulary" href="#policy_alternative_vocabulary">policy alternative vocabulary</a> (see Section <a href="#rPolicy_Alternative"><b>3.2 Policy Alternative</b></a>).
-</p>
+that approximates compatibility in a domain-independent <span class="diff-add">manner:</span><span class="diff-del">manner; specifically, 
+for two policy alternatives  to be compatible, they must at least have the same 
+policy alternative vocabulary (see Section ).
+</span></p>
 <ul>
 <li><p>Two <a title="policy assertion" href="#policy_assertion">policy assertions</a> are compatible if they have the same <a title="policy assertion type" href="#policy_assertion_type">type</a> and</p></li>
 <li><p>If either assertion contains a nested <a title="policy expression" href="#policy_expression">policy expression</a>, the two assertions are compatible if they both have a nested policy expression and the alternative in the nested policy expression of one is compatible with the alternative in the nested policy expression of the other.</p></li>
 </ul>
 <p><a title="policy assertion parameter" href="#policy_assertion_parameter">Assertion parameters</a> are not part of the compatibility determination defined herein but may be part of other, domain-specific compatibility processing. </p>
 <ul>
-<li><p>Two <a title="policy alternative" href="#policy_alternative">policy alternatives</a> are compatible if each assertion in one is compatible with an assertion in the other, and vice-versa. If two alternatives are compatible, their intersection is an alternative containing all of the assertions in both alternatives.</p></li>
+<li>
+    <p><span class="diff-add">If the mode is strict,</span><span class="diff-del">Two </span><span class="diff-add">two </span><a title="policy alternative" href="#policy_alternative">policy alternatives</a> <span class="diff-add">A and B </span>are <span class="diff-add">compatible:
+        </span><span class="diff-add"><ul><li><p><span class="diff-add">if each assertion in A is </span>compatible <span class="diff-add">with an 
+            assertion in B, and</span></p></li>
+            <li><p>if each assertion in <span class="diff-chg">B </span>is compatible with an assertion in <span class="diff-add">A.</span></p></li>
+    </ul></span></p>   
+    <div class="diff-add"><p class="diff-add"><span class="diff-add">If </span>the <span class="diff-add">mode is lax, two </span><a title="policy alternative" href="#policy_alternative"><span class="diff-add">policy alternatives</span></a> <span class="diff-add">A and B are compatible:
+        </span><ul><li><p><span class="diff-add">if each assertion in A that is not an </span><a title="ignorable policy assertion" href="#ignorable_policy_assertion"><span class="diff-add">ignorable policy assertion</span></a>
+         <span class="diff-add">is compatible</span><span class="diff-del">other, </span><span class="diff-add">with an 
+        assertion in B, </span>and</p></li>
+            <li><p><span class="diff-add">if each assertion in B that is not an 
+        </span><a title="ignorable policy assertion" href="#ignorable_policy_assertion"><span class="diff-add">ignorable policy assertion</span></a>
+         <span class="diff-add">is compatible with an 
+            assertion </span><span class="diff-chg">in </span><span class="diff-add">A.</span></p></li>
+   </ul></p></div>
+<div class="diff-add"><p class="diff-add">If two alternatives are compatible, their 
+intersection is an alternative containing all of the assertions in both alternatives.</p></div></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>As an example of intersection, consider two input policies in normal form:</p>
@@ -1576,15 +1642,99 @@
 </div>
     </div>
     <div class="back">
+<div class="diff-add"><div class="div1">
+    
+<h2><a name="ietf-draft"></a>A. <span class="diff-add">The application/wspolicy+xml Media Type</span></h2>
+    <p><span class="diff-add">This appendix defines the </span>"<span class="diff-add">application/wspolicy+xml</span>"
+        <span class="diff-add">media type which can be used to describe Web Services Policy documents
+        serialized as XML. Either </span><code class="attr"><span class="diff-add">wsp:Policy</span></code>  <span class="diff-add">and </span><code class="attr"><span class="diff-add">wsp:PolicyAttachment</span></code>  <span class="diff-add">could be the root element of such a document.</span></p>
+    <div class="div2">
+        
+<h3><a name="ietf-reg"></a>A.1 <span class="diff-add">Registration</span></h3>
+        <dl>
+            <dt class="label"><span class="diff-add"><span class="diff-add">MIME media type name:</span></span></dt><dd><div class="diff-add"><p><span class="diff-add">application</span></p></div></dd>
+            <dt class="label"><span class="diff-add"><span class="diff-add">MIME subtype name:</span></span></dt><dd><div class="diff-add"><p><span class="diff-add">wspolicy+xml</span></p></div></dd>
+            <dt class="label"><span class="diff-add"><span class="diff-add">Required parameters:</span></span></dt><dd><div class="diff-add"><p><span class="diff-add">none</span></p></div></dd>
+            <dt class="label"><span class="diff-add"><span class="diff-add">Optional parameters:</span></span></dt>
+                <dd><div class="diff-add">
+                    <dl>
+                        <dt class="label"><span class="diff-add"><span class="diff-add">charset</span></span></dt>
+                            <dd><div class="diff-add"><p><span class="diff-add">This parameter has identical semantics to the charset parameter
+                                of the </span>"<span class="diff-add">application/xml</span>" <span class="diff-add">media type as specified in
+                                </span><a href="#RFC3023">[RFC 3023]</a><span class="diff-add">.</span></p></div></dd>
+                        
+                    </dl></div></dd>
+            <dt class="label"><span class="diff-add"><span class="diff-add">Encoding considerations:</span></span></dt>
+                <dd><div class="diff-add"><p><span class="diff-add">Identical to those of </span>"<span class="diff-add">application/xml</span>"
+                    <span class="diff-add">as described in </span><a href="#RFC3023">[RFC 3023]</a><span class="diff-add">,
+                    section 3.2, as applied to the Web Services Policy document Infoset.</span></p></div></dd>
+            <dt class="label"><span class="diff-add"><span class="diff-add">Security considerations:</span></span></dt>
+                <dd><div class="diff-add"><p><span class="diff-add">See section </span><a href="#Security_Considerations"><b>5. Security Considerations</b></a> <span class="diff-add">in this document, and the
+                    Security Consideration section in </span><a href="#WS-PolicyAttachment">[Web Services Policy Attachment]</a><span class="diff-add">.</span></p></div></dd>
+            <dt class="label"><span class="diff-add"><span class="diff-add">Interoperability considerations:</span></span></dt>
+                <dd><div class="diff-add"><p><span class="diff-add">There are no known interoperability issues.</span></p></div></dd>
+            <dt class="label"><span class="diff-add"><span class="diff-add">Published specifications:</span></span></dt>
+                <dd><div class="diff-add"><p><span class="diff-add">This document and </span><a href="#WS-PolicyAttachment">[Web Services Policy Attachment]</a><span class="diff-add">.</span></p></div></dd>
+            <dt class="label"><span class="diff-add"><span class="diff-add">Applications which use this media type:</span></span></dt>
+                <dd><div class="diff-add"><p><span class="diff-add">This new media type is being registered to allow for deployment of Web Services
+                Policy and references to Web Services Policy on the World Wide Web.</span></p></div></dd>
+            
+                <dt class="label"><span class="diff-add"><span class="diff-add">Additional information:</span></span></dt>
+                <dd><div class="diff-add"><dl>
+                    
+                        <dt class="label"><span class="diff-add"><span class="diff-add">File extension:</span></span></dt>
+                        <dd><div class="diff-add"><p><span class="diff-add">wspolicy</span></p></div></dd>
+                    
+                    
+                        <dt class="label"><span class="diff-add"><span class="diff-add">Fragment identifiers:</span></span></dt>
+                        <dd><div class="diff-add"><p><span class="diff-add">A syntax identical to that of
+                            </span>"<span class="diff-add">application/xml</span>" <span class="diff-add">as described in </span><a href="#RFC3023">[RFC 3023]</a><span class="diff-add">.</span></p></div></dd>
+                    
+                    
+                        <dt class="label"><span class="diff-add"><span class="diff-add">Base URI:</span></span></dt>
+                        <dd><div class="diff-add"><p><span class="diff-add">As specified in </span><a href="#RFC3023">[RFC 3023]</a><span class="diff-add">, section 6.</span></p>
+                        </div></dd>
+                    
+                    
+                        <dt class="label"><span class="diff-add"><span class="diff-add">Macintosh File Type code:</span></span></dt>
+                        <dd><div class="diff-add"><p><span class="diff-add">WSPOLICY</span></p></div></dd>
+                    
+                    
+                        <dt class="label"><span class="diff-add"><span class="diff-add">Person and email address to contact for further information:</span></span></dt>
+                        <dd><div class="diff-add"><p><span class="diff-add">World Wide Web Consortium &lt;web-human@w3.org&gt;</span></p></div></dd>
+                    
+                        <dt class="label"><span class="diff-add"><span class="diff-add">Intended usage:</span></span></dt><dd><div class="diff-add"><p><span class="diff-add">COMMON</span></p></div></dd>
+                    
+                        <dt class="label"><span class="diff-add"><span class="diff-add">Author/Change controller:</span></span></dt>
+                        <dd><div class="diff-add"><p><span class="diff-add">The Web Services Policy 1.5 specification set is a work product of the World Wide
+                    Web Consortium's 
+                    </span><a href="http://www.w3.org/2002/ws/desc/"><span class="diff-add">Web Service Policy Working Group</span></a><span class="diff-add">.
+                    The W3C has change control over these specifications.</span></p></div></dd>
+                </dl>
+            </div></dd>
+            
+        </dl>
+    </div>
+</div></div>
 <div class="div1">
 
-<h2><a name="References"></a>A. References</h2>
+<h2><a name="References"></a>B. References</h2>
 
     <div class="div2">
         
-<h3><a name="Normative-References"></a>A.1 Normative References</h3>
+<h3><a name="Normative-References"></a>B.1 Normative References</h3>
 
 	<dl>
+	    <dt class="label"><span class="diff-add"><a name="WS-PolicyAttachment"></a>Web Services Policy Attachment</span></dt><dd><div class="diff-add">
+	        <cite><span class="diff-add">Web Services Policy 1.5 - Attachment</span></cite><span class="diff-add">, A. S. Vedamuthu, D. Orchard, M. Hondo, T. Boubez and P. Yendluri,
+	        Editors. World Wide Web Consortium, @@,
+	        @@@@ @@@@.  This version of the
+	        specification of the Web Services Policy 1.5 - Attachment specification is
+	        ws-policy-attachment.html. The </span><a href="http://www.w3.org/TR/ws-policy-attachment"><span class="diff-add">latest
+	            version of Web Services Policy 1.5 - Attachment</span></a> <span class="diff-add">is available at
+	        http://www.w3.org/TR/ws-policy-attachment.
+	    </span>  (See ws-policy-attachment.html.)</div></dd>
+	    
 	  <dt class="label"><a name="RFC2119"></a>[IETF RFC 2119] </dt><dd>
 	    <cite>Key words for use in RFCs to Indicate
 	    Requirement Levels</cite>, S. Bradner, Author. Internet
@@ -1665,11 +1815,14 @@
 	    version of XML Schema Part 2</a> is available at
 	    http://www.w3.org/TR/xmlschema-2.
 	    (See <a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/">http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/</a>.)</dd>
+        <dt class="label"><span class="diff-add"><a name="RFC3023"></a>RFC 3023</span></dt><dd><div class="diff-add"><span class="diff-add">IETF
+        "RFC 3023: XML Media Types", M. Murata, S. St. Laurent, D. Kohn, July
+        1998.</span>  (See http://www.ietf.org/rfc/rfc3023.txt.)</div></dd>
 	</dl>
     </div>
     <div class="div2">
       
-<h3><a name="Informative-References"></a>A.2 Other References</h3>
+<h3><a name="Informative-References"></a>B.2 Other References</h3>
       <dl>
       <dt class="label"><a name="C14NNOTE"></a>[C14N 1.0 Note] </dt><dd>
           <cite>Known Issues with Canonical XML 1.0 (C14N/1.0)</cite>, 
@@ -1723,16 +1876,16 @@
 	  the UDDI 3.0</a> specification is available at
 	  http://uddi.org/pubs/uddi_v3.htm.
 	  (See <a href="http://uddi.org/pubs/uddi-v3.0.1-20031014.htm">http://uddi.org/pubs/uddi-v3.0.1-20031014.htm</a>.)</dd>
-	<dt class="label"><a name="WS-PolicyAttachment"></a>[Web Services Policy Attachment] </dt><dd>
-	  <cite>Web Services Policy 1.5 - Attachment</cite>, A. S. Vedamuthu, D. Orchard, M. Hondo, T. Boubez and P. Yendluri,
+	
+	  <span class="diff-del">Web Services Policy 1.5 - Attachment, A. S. Vedamuthu, D. Orchard, M. Hondo, T. Boubez and P. Yendluri,
 	  Editors. World Wide Web Consortium, @@,
 	  @@@@ @@@@.  This version of the
 	  specification of the Web Services Policy 1.5 - Attachment specification is
-	  ws-policy-attachment.html. The <a href="http://www.w3.org/TR/ws-policy-attachment">latest
-	  version of Web Services Policy 1.5 - Attachment</a> is available at
+	  ws-policy-attachment.html. The latest
+	  version of Web Services Policy 1.5 - Attachment is available at
 	  http://www.w3.org/TR/ws-policy-attachment.
-	  (See <a href="ws-policy-attachment.html">ws-policy-attachment.html</a>.)</dd>
-	<dt class="label"><a name="WS-SecurityPolicy"></a>[WS-SecurityPolicy] </dt><dd>
+	
+	</span><dt class="label"><a name="WS-SecurityPolicy"></a>[WS-SecurityPolicy] </dt><dd>
 	  <cite>WS-SecurityPolicy v1.0</cite>, A. Nadalin,
 	  M. Gudgin, A. Barbir, and H. Granqvist, Editors. Organization for the Advancement of Structured Information Standards, 8
 	  December 2005. Available at
@@ -1778,7 +1931,7 @@
       
 <div class="div1">
   
-<h2><a name="acknowledgments"></a>B. Acknowledgements (Non-Normative)</h2>
+<h2><a name="acknowledgments"></a>C. Acknowledgements (Non-Normative)</h2>
 
   <p>This document is the work of the <a href="http://www.w3.org/2002/ws/policy/">W3C Web Services Policy
   Working Group</a>.</p>
@@ -1803,24 +1956,25 @@
 
 <div class="div1">
   
-<h2><a name="change-description"></a>C. Changes in this Version of the Document (Non-Normative)</h2>
+<h2><a name="change-description"></a>D. Changes in this Version of the Document (Non-Normative)</h2>
     <p>A list of substantive changes since the Working Draft dated <span class="diff-chg">2 November, </span>2006
     is below:</p>
     <ul>
-        <li><p><span class="diff-add">None.</span><span class="diff-del">Enhanced Conformance section.
+        <li><p><span class="diff-add">Added</span><span class="diff-del">Enhanced Conformance section.
         Enhanced Security Considerations section.
         Clarified WS-Policy 1.5 Framework and Attachment XML Namespace URI versioning Policy.
         Clarified the policy model for Web Services.
-        Clarified that an Element (EII) within a policy expression MUST be an assertion.
-        Clarified that policy assertion parameters are opaque to framework processing.
+        Clarified that an Element (EII) within </span>a <span class="diff-add">new</span><span class="diff-del">policy expression MUST be </span><span class="diff-chg">feature: </span><span class="diff-add"><a href="#ignorable-policy-assertions"><b>4.4 Ignorable Policy Assertions</b></a></span><span class="diff-add">.</span><span class="diff-del">assertion.</span></p></li>
+        <li><p><span class="diff-add">Defined</span><span class="diff-del">Clarified that policy </span><span class="diff-chg">an XML Media Type </span>to <span class="diff-add">describe</span><span class="diff-del">framework processing.
         Added PolicyReference extensibility via {Any}
-        Clarified constraints on @xml:id type usage for Policy Identification.
-        Clarified that a wsp:PolicyReference can be used any place where a wsp:Policy element can be used</span></p></li>
+        Clarified constraints on @xml:id type </span><span class="diff-chg">Web Service </span>Policy <span class="diff-add">documents 
+        serialized</span><span class="diff-del">Identification.
+        Clarified that a wsp:PolicyReference can be used any place where a </span><span class="diff-chg">as XML in Appendix </span><span class="diff-add"><a href="#ietf-draft"><b>A. The application/wspolicy+xml Media Type</b></a></span><span class="diff-add">.</span><span class="diff-del">used</span></p></li>
     </ul>
 </div>
         <div class="div1">
             
-<h2><a name="change-log"></a>D. Web Services Policy 1.5 - Framework Change Log (Non-Normative)</h2>
+<h2><a name="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>
@@ -1909,7 +2063,7 @@
                     <tr>
                         <td rowspan="1" colspan="1">20060813</td>
                         <td rowspan="1" colspan="1">ASV</td>
-                        <td rowspan="1" colspan="1">Added a new Section <a href="#change-description"><b>C. Changes in this Version of the Document</b></a> (that provides 
+                        <td rowspan="1" colspan="1">Added a new Section <a href="#change-description"><b>D. Changes in this Version of the Document</b></a> (that provides 
                         a list of substantive chanages since the previous publication).                    	
                         </td>
                     </tr>
@@ -2239,7 +2393,7 @@
                     <div class="diff-add"><tr class="diff-add">
                         <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20061102</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>C. Changes in this Version of the Document</b></a>.
+                        <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">
@@ -2247,7 +2401,52 @@
                         <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">Re-formatted the example in <a href="#denial-of-service-threats"><b>5.5 Denial of Service Threats</b></a>.
                         </td></div>
-                    </tr></div>                                          
+                    </tr></div>  
+                    <div class="diff-add"><tr class="diff-add">
+                        <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20061109</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 editorial changes for Issue 3961
+                   
+                        for Editors' Action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/75"><span class="diff-add">75</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">20061109</td></div>
+                        <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">TIB</td></div>
+                        <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented Editors' Action
+                        <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/73"><span class="diff-add">73</span></a>
+                        to create a normative appendix for MIMe subtype wspolicy+xml.
+                        </td></div>
+                    </tr></div>                                         
+                    <div class="diff-add"><tr class="diff-add">
+                        <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20061109</td></div>
+                        <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">TIB</td></div>
+                        <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented Editors' Action
+                            <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/74"><span class="diff-add">74</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">20061109</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/2006Nov/0072.html"><span class="diff-add">resolution</span></a> for issues
+                            <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3721"><span class="diff-add">3721</span></a> and 
+                            <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3789"><span class="diff-add">3789</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">20061109</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 Editors' Action
+                            <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/70"><span class="diff-add">70</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">20061109</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">Updated Section <a href="#change-description"><b>D. Changes in this Version of the Document</b></a>.
+                        </td></div>
+                    </tr></div>                  
                 
                 </tbody>
             </table><br>

Index: ws-policy-attachment-diff20061102.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment-diff20061102.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ws-policy-attachment-diff20061102.xml	3 Nov 2006 20:54:02 -0000	1.3
+++ ws-policy-attachment-diff20061102.xml	10 Nov 2006 05:16:02 -0000	1.4
@@ -179,7 +179,7 @@
 <td rowspan="1" colspan="1">
 <code>http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization</code>
 </td>
-<td rowspan="1" colspan="1">[<loc href="http://131.107.72.15/MTOM_Service_Indigo/" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">WS-OptimizedSerializationPolicy</loc>]</td>
+<td rowspan="1" colspan="1" diff="del">[<bibref ref="WS-MTOMPolicy" diff="add"></bibref>WS-OptimizedSerializationPolicy]</td>
 </tr>
 <tr>
 <td rowspan="1" colspan="1">
@@ -365,6 +365,17 @@
    </gitem>
    <gitem>
       <label>
+         <loc href="ws-policy-framework.html#ignorable_policy_assertion" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">ignorable policy assertion</loc>
+      </label>
+      <def>
+         <p id="ignorable_policy_assertion">An 
+	    <term>ignorable policy assertion</term> is 
+	    an assertion that may be ignored for policy intersection (as defined in 
+	        <xspecref xmlns:xlink="http://www.w3.org/1999/xlink" href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection" xlink:type="simple" xlink:actuate="onRequest" xlink:show="new">4.5 Policy Intersection</xspecref>).</p>
+      </def>
+   </gitem>
+   <gitem>
+      <label>
          <loc href="#merge" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">merge</loc>
       </label>
       <def>
@@ -447,6 +458,9 @@
   <!-- 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">ignorable_policy_assertion</phrase></p>
+</item>
+<item diff="add">
 <p>policy</p>
 </item>
 <item>
@@ -777,7 +791,7 @@
 <el>/wsp:PolicyAttachment/wsse:Security</el>
 </label>
 <def>
-<p>This optional element allows security information such as
+  <p>This <phrase diff="del">optional </phrase>element <phrase diff="add">is of type </phrase><att diff="add"><phrase diff="add">xs:boolean</phrase></att> <phrase diff="add">and </phrase>allows security information such as
 signatures to be included. The syntax of this element is described in
 WS-Security [<bibref ref="WS-Security"></bibref>].</p>
 </def>
@@ -788,8 +802,10 @@
 </label>
 <def>
 <p>Additional attributes <rfc2119>MAY</rfc2119> be specified but
-<rfc2119>MUST NOT</rfc2119> contradict the semantics of the owner
-element; if an attribute is not recognized, it
+  <rfc2119>MUST NOT</rfc2119> contradict the semantics of the 
+  <emph role="infoset-property" diff="add"> owner
+<phrase diff="del">element; </phrase><phrase diff="add">element</phrase></emph><phrase diff="add">;
+   </phrase>if an attribute is not recognized, it
 <rfc2119>SHOULD</rfc2119> be ignored.</p>
 </def>
 </gitem>
@@ -824,6 +840,54 @@
 <code>http://www.example.com/policies#RmPolicy</code> applies to all
 interactions with the endpoint at
 <code>http://www.example.com/acct</code>.</p>
+<div3 id="uri-domain-expression" diff="add">
+    <head><phrase diff="add">URI Domain Expression</phrase></head>
+    <p><phrase diff="add">This section defines a domain expression for identifying resources as 
+      </phrase><termref def="policy_subject"><phrase diff="add">policy subjects</phrase></termref> <phrase diff="add">for the external attachment mechanism. The following 
+    is a pseudo-schema for the URI domain expression:</phrase></p>
+<eg xml:space="preserve" role="needs-numbering">&lt;wsp:PolicyAttachment … &gt;
+  &lt;wsp:AppliesTo&gt;
+    &lt;wsp:URI … &gt;xs:anyURI&lt;/wsp:URI&gt; *
+  &lt;/wsp:AppliesTo&gt;
+  …
+&lt;/wsp:PolicyAttachment&gt;</eg>
+<p><phrase diff="add">The following describes the URI domain expression element listed in the pseudo-schema outlined above:</phrase></p>
+<glist>
+  <gitem>
+    <label><att><phrase diff="add">/wsp:PolicyAttachment/wsp:AppliesTo/wsp:URI</phrase></att></label>
+    <def><p><phrase diff="add">This element is an absolute IRI that references a resource 
+      as a </phrase><termref def="policy_subject"><phrase diff="add">policy subject</phrase></termref><phrase diff="add">. There is no requirement that the IRI be resolvable; 
+    retrieval mechanisms are beyond the scope of this specification.</phrase></p></def>
+  </gitem>
+  <gitem>
+    <label><att><phrase diff="add">/wsp:PolicyReference/wsp:AppliesTo/wsp:URI/@{any}</phrase></att></label>
+    <def><p><phrase diff="add">Additional attributes </phrase><rfc2119><phrase diff="add">MAY</phrase></rfc2119> <phrase diff="add">be specified but </phrase><rfc2119><phrase diff="add">MUST NOT</phrase></rfc2119> <phrase diff="add">contradict the 
+      semantics of the </phrase><emph role="infoset-property"><phrase diff="add">owner element</phrase></emph><phrase diff="add">; if an attribute is not recognized, 
+      it </phrase><rfc2119><phrase diff="add">SHOULD</phrase></rfc2119> <phrase diff="add">be ignored.</phrase></p></def>
+  </gitem>
+</glist>
+  <p><phrase diff="add">URI domain expressions are used to identify resources that are identified using 
+  IRI or IRI References (such as endpoint, message or operation definitions) with which 
+    </phrase><termref def="policy"><phrase diff="add">policies</phrase></termref> <phrase diff="add">can be associated. For example, URI domain expressions can be used 
+  to identify WSDL 1.1 definitions, WSDL 2.0 components, etc. 
+  IRI References for WSDL 2.0 components 
+    are defined in Appendix C of the Web Services Description Language (WSDL) Version 2.0 
+    Part 1: Core Language [</phrase><bibref ref="WSDL20"></bibref><phrase diff="add">]. The following 
+  example illustrates the use of URI domain expression 
+  with a WSDL 2.0 IRI Reference: </phrase></p>
+  <eg xml:space="preserve" role="needs-numbering">&lt;wsp:PolicyAttachment&gt;
+  &lt;wsp:AppliesTo&gt;
+    &lt;wsp:URI&gt;http://example.org/TicketAgent.wsdl20#wsdl.endpoint(TicketAgentService/Endpoint)&lt;/wsp:URI&gt;
+  &lt;/wsp:AppliesTo&gt;
+  &lt;wsp:PolicyReference URI="http://www.example.com/policies#RmPolicy" /&gt;
+ &lt;/wsp:PolicyAttachment&gt;</eg>
+  <p><phrase diff="add">In this example, the </phrase><termref def="policy_expression"><phrase diff="add">policy expression</phrase></termref> <phrase diff="add">at 
+   </phrase><code><phrase diff="add">http://www.example.com/policies#RmPolicy</phrase></code> <phrase diff="add">applies to all interactions with 
+   the endpoint at </phrase><code><phrase diff="add">http://example.org/TicketAgent.wsdl20#wsdl.endpoint(TicketAgentService/Endpoint)</phrase></code><phrase diff="add">. 
+ Similarly, an XPointer [</phrase><bibref ref="XPointer"></bibref><phrase diff="add">] can be used as an 
+ IRI Reference to identify a description in a WSDL 1.1 [</phrase><bibref ref="WSDL11"></bibref><phrase diff="add">] document.</phrase></p>   
+   
+</div3>
 </div2>
 </div1>
 <div1 id="AttachingPolicyUsingWSDL1.1">
@@ -1733,6 +1797,39 @@
 </tr>
 </tbody>
 </table>
+ <p diff="add">
+   <phrase diff="add">Two {policy} properties are equivalent when they represent policies that 
+   contain the same number of </phrase><termref def="policy_alternative"><phrase diff="add">policy alternatives</phrase></termref><phrase diff="add">, 
+   and each </phrase><termref def="policy_alternative"><phrase diff="add">policy alternative</phrase></termref> <phrase diff="add">in the first policy 
+   is equivalent to some </phrase><termref def="policy_alternative"><phrase diff="add">policy alternative</phrase></termref> 
+   <phrase diff="add">in the second policy, and conversely.
+ </phrase></p>
+  <p diff="add">
+    <phrase diff="add">Two </phrase><termref def="policy_alternative"><phrase diff="add">policy alternatives</phrase></termref> <phrase diff="add">are 
+    equivalent when each </phrase><termref def="policy_assertion"><phrase diff="add">policy assertion</phrase></termref> 
+    <phrase diff="add">in the first </phrase><termref def="policy_alternative"><phrase diff="add">policy alternative</phrase></termref> <phrase diff="add">is  
+    equivalent to some </phrase><termref def="policy_assertion"><phrase diff="add">policy assertion</phrase></termref> 
+    <phrase diff="add">in the second </phrase><termref def="policy_alternative"><phrase diff="add">policy alternative</phrase></termref><phrase diff="add">, and conversely.  
+    If either </phrase><termref def="policy_alternative"><phrase diff="add">policy alternative</phrase></termref> 
+    <phrase diff="add">contains multiple </phrase><termref def="policy_assertion"><phrase diff="add">policy assertions</phrase></termref> <phrase diff="add">of 
+    the same type, </phrase><termref def="policy_alternative"><phrase diff="add">policy alternative</phrase></termref>
+    <phrase diff="add">equality is dependent on the semantics of that assertion type.
+  </phrase></p>
+  <p diff="add">
+    <phrase diff="add">Two </phrase><termref def="policy_assertion"><phrase diff="add">policy assertions</phrase></termref> <phrase diff="add">are equivalent 
+    if they have the same QName, if either policy assertion is an </phrase><termref def="ignorable_policy_assertion"><phrase diff="add">ignorable policy assertion</phrase></termref><phrase diff="add">,
+    both assertions must be </phrase><termref def="ignorable_policy_assertion"><phrase diff="add">ignorable policy assertions</phrase></termref> 
+    <phrase diff="add">and, if either </phrase><termref def="policy_assertion"><phrase diff="add">policy assertion</phrase></termref> 
+    <phrase diff="add">has a nested policy, both assertions must have a 
+    nested policy and the nested policies must be equal.  If either assertion 
+    contains policy assertion parameters, then the policy assertion parameters 
+    SHOULD be compared for equality.  Comparing policy assertion parameters 
+    for equality is not defined by this document, but </phrase><termref def="policy_assertion"><phrase diff="add">policy assertion</phrase></termref> 
+    <phrase diff="add">equality may be further refined by the corresponding </phrase><termref def="policy_assertion"><phrase diff="add">policy assertion</phrase></termref> 
+    <phrase diff="add">specification.
+  </phrase></p>
+  
+
 </div2>
 <div2 id="effective-policy">
 <head>Effective Policy</head>
@@ -2467,6 +2564,12 @@
         2005. This version of the SOAP Message Transmission Optimization Mechanism Recommendation
         is http://www.w3.org/TR/2005/REC-soap12-mtom-20050125/. The <loc href="http://www.w3.org/TR/soap12-mtom/" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">latest version of SOAP Message Transmission
           Optimization Mechanism</loc> is available at http://www.w3.org/TR/soap12-mtom/. </bibl>
+  <bibl id="WS-MTOMPolicy" key="WS-MTOMPolicy" href="http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization/" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple" diff="add">
+    <titleref xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new"><phrase diff="add">MTOM Serialization Policy Assertion (WS-MTOMPolicy)</phrase></titleref><phrase diff="add">, C. Ferris, et al,
+    Authors. International Business Machines Corporation and Microsoft
+    Corporation, Inc., September 2006. Available at
+    http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization/
+  </phrase></bibl>
 <bibl id="SCC14N" key="SCC14N" href="http://uddi.org/pubs/SchemaCentricCanonicalization-20050523.htm" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple">
 <titleref xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new">Schema Centric XML Canonicalization Version
 	1.0</titleref>, S. Aissi, A. Hately, and M. Hondo,
@@ -2528,6 +2631,16 @@
         version of the XML-binary Optimized Packaging Recommendation is
         http://www.w3.org/TR/2005/REC-xop10-20050125/. The <loc href="http://www.w3.org/TR/xop10/" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">latest version of XML-binary Optimized Packaging</loc> is available at
         http://www.w3.org/TR/xop10/. </bibl>
+  <bibl key="XPointer Framework" href="http://www.w3.org/TR/2003/REC-xptr-framework-20030325/" id="XPointer" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple" diff="add">
+    <titleref xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new"><phrase diff="add">XPointer Framework</phrase></titleref><phrase diff="add">,Paul Grosso, Eve
+    Maler, Jonathan Marsh, Norman Walsh, Editors. World Wide Web
+    Consortium, 22 November 2002.  This version of the XPointer
+    Framework Proposed Recommendation is
+    http://www.w3.org/TR/2003/REC-xptr-framework-20030325/ The
+    </phrase><loc href="http://www.w3.org/TR/xptr-framework/" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">latest
+      version of XPointer Framework</phrase></loc> <phrase diff="add">is available at
+    http://www.w3.org/TR/xptr-framework/.
+  </phrase></bibl>
 </blist>
 </div2>
 </div1>
@@ -2772,18 +2885,19 @@
       is below:</p>
      <ulist>
         <item>
-          <p><phrase diff="add">None.</phrase><phrase diff="del">Enhanced the Conformance section.</phrase></p>
-        </item>
+          <p><phrase diff="del">Enhanced the Conformance section.
         
-          <phrase diff="del">Added a new section -  - 
+        
+          </phrase>Added a new <phrase diff="add">domain</phrase><phrase diff="del">section -  - 
              that describes a mechanism for associating policy expressions with 
-             Web service constructs in WSDL 2.0.
-         
-           
-             Clarified that a wsp:PolicyReference can be used any place 
-             where a wsp:Policy element can be used
-           
-      </phrase></ulist>
+             Web service constructs in </phrase><phrase diff="chg">expression: </phrase><specref ref="uri-domain-expression" diff="add"></specref><phrase diff="add">.</phrase><phrase diff="del">2.0.</phrase></p>         
+        </item>
+       <item>
+             <p><phrase diff="add">Defined</phrase><phrase diff="del">Clarified that a wsp:PolicyReference can be used </phrase><phrase diff="chg">the </phrase><phrase diff="add">equivalence</phrase><phrase diff="del">place 
+             where </phrase><phrase diff="chg">of two {policy} properties </phrase><phrase diff="add">in 
+       Section</phrase><phrase diff="del">be </phrase><specref ref="extension-to-wsdl-component-model" diff="add"></specref><phrase diff="add">.</phrase><phrase diff="del">used</phrase></p>
+           </item>
+      </ulist>
 </inform-div1>
 <inform-div1 id="change-log">
 <head>Web Services Policy 1.5 - Attachment Change Log</head>
@@ -3050,7 +3164,46 @@
     <td rowspan="1" colspan="1" diff="add">ASV</td>
     <td rowspan="1" colspan="1" diff="add">Reset Section <specref ref="change-description"></specref>.
     </td>
-  </tr>   
+  </tr>
+  <tr diff="add">
+    <td rowspan="1" colspan="1" diff="add">20061109</td>
+    <td rowspan="1" colspan="1" diff="add">PY</td>
+    <td rowspan="1" colspan="1" diff="add">Implemented the
+      <loc href="http://lists.w3.org/Archives/Public/public-ws-policy/2006Oct/0192.html" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution for Issue 3894.</phrase></loc> 
+      Editors' Action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/71" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">71</phrase></loc>.
+    </td>
+  </tr> 
+  <tr diff="add">
+    <td rowspan="1" colspan="1" diff="add">20061109</td>
+    <td rowspan="1" colspan="1" diff="add">TIB</td>
+    <td rowspan="1" colspan="1" diff="add">Implemented Editors' Action
+      <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/74" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">74</phrase></loc>.
+    </td>
+  </tr>
+  <tr diff="add">
+    <td rowspan="1" colspan="1" diff="add">20061109</td>
+    <td rowspan="1" colspan="1" diff="add">ASV</td>
+    <td rowspan="1" colspan="1" diff="add">Implemented the
+      <loc href="http://lists.w3.org/Archives/Public/public-ws-policy/2006Nov/0072.html" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution</phrase></loc> for issues
+      <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3721" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">3721</phrase></loc> and 
+      <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3789" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">3789</phrase></loc>.
+    </td>
+  </tr>
+  <tr diff="add">
+    <td rowspan="1" colspan="1" diff="add">20061109</td>
+    <td rowspan="1" colspan="1" diff="add">ASV</td>
+    <td rowspan="1" colspan="1" diff="add">Implemented the 
+      <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/72" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution</phrase></loc> for issues
+      <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3599" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">3599</phrase></loc> and 
+      <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3730" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">3730</phrase></loc>.
+    </td>
+  </tr>
+  <tr diff="add">
+    <td rowspan="1" colspan="1" diff="add">20061109</td>
+    <td rowspan="1" colspan="1" diff="add">ASV</td>
+    <td rowspan="1" colspan="1" diff="add">Updated Section <specref ref="change-description"></specref>.
+    </td>
+  </tr>                                        
 </tbody>
 </table>
 </inform-div1>

Index: ws-policy-attachment-diff20061102.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment-diff20061102.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ws-policy-attachment-diff20061102.html	3 Nov 2006 20:54:02 -0000	1.3
+++ ws-policy-attachment-diff20061102.html	10 Nov 2006 05:16:02 -0000	1.4
@@ -95,7 +95,7 @@
 <h2><a name="status">Status of this Document</a></h2><p><strong>This document is an editors' copy that has
         no official standing.</strong></p><p></p></div>
 <hr><div class="toc">
-<h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#tocRange">Introduction</a><br>2. <a href="#NotationsTerminology">Notations and Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.1 <a href="#NotationalConventions">Notational Conventions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.2 <a href="#XMLNamespaces">XML Namespaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.3 <a href="#Glossary">Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.4 <a href="#Example">Example</a><br>3. <a href="#rPolicyAttachment">Policy Attachment</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.1 <a href="#rEffectivePolicy">Effective Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.2 <a href="#PolicyAttachmentMechanisms">Policy Attachment Mechanisms</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.3 <a href="#XMLElementAttachement">XML Element Attachment</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.4 <a href="#ExternalPolicyAttachment">External Policy Attachment</a><br>4. <a href="#AttachingPolicyUsingWSDL1.1">Attaching Policies Using WSDL 1.1</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.1 <a href="#CaculatingEffectivyPolicywithWSDL1.1">Calculating Effective Policy in WSDL 1.1</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.1 <a href="#ServicePolicySubject">Service Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.2 <a href="#EndpointPolicySubject">Endpoint Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.3 <a href="#OperationPolicySubject">Operation Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.4 <a href="#MessagePolicySubject">Message Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.5 <a href="#Example2">Example</a><br>5. <a href="#ws-policy-attachment-for-wsdl20">WS-Policy Attachment for WSDL 2.0</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.1 <a href="#wsdl20-example">Example</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.2 <a href="#attaching-policy-expressions">Attaching Policy Expressions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.3 <a href="#extension-to-wsdl-component-model">Extension to WSDL Component Model</a><br>&nbsp&nbsp;&nbsp;&nbsp;5.4 <a href="#effective-policy">Effective Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.1 <a href="#service-policy-subject">Service Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.2 <a href="#endpoint-policy-subject">Endpoint Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.3 <a href="#operation-policy-subject">Operation Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.4 <a href="#message-policy-subject-input">Message Policy Subject (input message)</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.5 <a href="#message-policy-subject-output">Message Policy Subject (output message)</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.6 <a href="#message-policy-subject-input-fault">Message Policy Subject (input fault message)</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.7 <a href="#message-policy-subject-output-fault">Message Policy Subject (output fault message)</a><br>. <a href="#AttachingPoliciesUsingUDDI">Attaching Policies Using UDDI</a><br>&nbsp;&nbsp;&nbsp;&nbsp;6.1 <a href="#CalculatingEffectivePolicyElementPolicyUDDI">Calculating Effective Policy and Element Policy in UDDI</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;6.1.1 <a href="#ServiceProviderPolicySubjectUDDI">Service Provider Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;6.1.2 <a href="#ServicePolicySubjectUDDI">Service Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;6.1.3 <a href="#EndpointPolicySubjectUDDI">Endpoint Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;6.2 <a href="#ReferencingRemotePolicyExpressions">Referencing Remote Policy Expressions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;6.3 <a href="#RegisteringReusablePolicyExpressions">Registering Reusable Policy Expressions</a><br>&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="#N11633">External Policy Attachment Conformance</a><br>&nbsp;&nbsp;&nbsp;&nbsp;8.2 <a href="#N11651">WSDL 1.1 Attachment Conformance</a><br>&nbsp;&nbsp;&nbsp;&nbsp;8.3 <a href="#N11660">WSDL 2.0 Attachment Conformance</a><br></p>
+<h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#tocRange">Introduction</a><br>2. <a href="#NotationsTerminology">Notations and Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.1 <a href="#NotationalConventions">Notational Conventions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.2 <a href="#XMLNamespaces">XML Namespaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.3 <a href="#Glossary">Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.4 <a href="#Example">Example</a><br>3. <a href="#rPolicyAttachment">Policy Attachment</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.1 <a href="#rEffectivePolicy">Effective Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.2 <a href="#PolicyAttachmentMechanisms">Policy Attachment Mechanisms</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.3 <a href="#XMLElementAttachement">XML Element Attachment</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.4 <a href="#ExternalPolicyAttachment">External Policy Attachment</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;3.4.1 <a href="#uri-domain-expression">URI Domain Expression</a><br>4. <a hef="#AttachingPolicyUsingWSDL1.1">Attaching Policies Using WSDL 1.1</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.1 <a href="#CalculatingEffectivyPolicywithWSDL1.1">Calculating Effective Policy in WSDL 1.1</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.1 <a href="#ServicePolicySubject">Service Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.2 <a href="#EndpointPolicySubject">Endpoint Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.3 <a href="#OperationPolicySubject">Operation Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.4 <a href="#MessagePolicySubject">Message Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.5 <a href="#Example2">Example</a><br>5. <a href="#ws-policy-attachment-for-wsdl20">WS-Policy Attachment for WSDL 2.0</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.1 <a href="#wsdl20-example">Example</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.2 <a href="#attaching-policy-expressions">Attaching Policy Expressions</a><br>&nbp;&nbsp;&nbsp;&nbsp;5.3 <a href="#extension-to-wsdl-component-model">Extension to WSDL Component Model</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.4 <a href="#effective-policy">Effective Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.1 <a href="#service-policy-subject">Service Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.2 <a href="#endpoint-policy-subject">Endpoint Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.3 <a href="#operation-policy-subject">Operation Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.4 <a href="#message-policy-subject-input">Message Policy Subject (input message)</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.5 <a href="#message-policy-subject-output">Message Policy Subject (output message)</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.4.6 <a href="#message-policy-subject-input-fault">Message Policy Subject (input fault message)</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nsp;&nbsp;5.4.7 <a href="#message-policy-subject-output-fault">Message Policy Subject (output fault message)</a><br>6. <a href="#AttachingPoliciesUsingUDDI">Attaching Policies Using UDDI</a><br>&nbsp;&nbsp;&nbsp;&nbsp;6.1 <a href="#CalculatingEffectivePolicyElementPolicyUDDI">Calculating Effective Policy and Element Policy in UDDI</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;6.1.1 <a href="#ServiceProviderPolicySubjectUDDI">Service Provider Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;6.1.2 <a href="#ServicePolicySubjectUDDI">Service Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;6.1.3 <a href="#EndpointPolicySubjectUDDI">Endpoint Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;6.2 <a href="#ReferencingRemotePolicyExpressions">Referencing Remote Policy Expressions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;6.3 <a href="#RegisteringReusablePolicyExpressions">Registering Reusable Policy Expressions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;6.4 <a href="#RegisteringPoliciesUDDIVrsion3">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="#N117CD">External Policy Attachment Conformance</a><br>&nbsp;&nbsp;&nbsp;&nbsp;8.2 <a href="#N117EB">WSDL 1.1 Attachment Conformance</a><br>&nbsp;&nbsp;&nbsp;&nbsp;8.3 <a href="#N117FA">WSDL 2.0 Attachment Conformance</a><br></p>
 <h3><a id="appendix" name="appendix">Appendices</a></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>&nbsp;&nbsp;&nbsp;&nbsp;A.2 <a href="#Informative-References">Other References</a><br>B. <a href="#AppendixA">UDDI tModel Definitions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.1 <a href="#RemotePolicyReferenceCategorySystem">Remote Policy Reference Category System</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.1.1 <a href="#DesigGoals1">Design Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.1.2 <a href="#tModelDefinition1">tModel Definition</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.1.3 <a href="#ModelStructure1">tModel Structure</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.2 <a href="#WS-PolicyTypesCategorySystem">Web Services Policy Types Category System</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.2.1 <a href="#DesignGoals2">Design Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&bsp;&nbsp;&nbsp;B.2.2 <a href="#tModelDefinition2">tModel Definition</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.2.3 <a href="#ModelStructure2">tModel Structure</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.3 <a href="#LocalPolicyReferenceCategorySystem">Local Policy Reference Category System</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.3.1 <a href="#DesignGoals3">Design Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.3.2 <a href="#tModelDefinition3">tModel Definition</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.3.3 <a href="#ModelStructure3">tModel Structure</a><br>C. <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br>D. <a href="#change-description">Changes in this Version of the Document</a> (Non-Normative)<br>E. <a href="#change-log">Web Services Policy 1.5 - Attachment Change Log</a> (Non-Normative)<br></p></div><hr><div class="body">
 <div class="div1">
 
@@ -208,7 +208,7 @@
 <td rowspan="1" colspan="1">
 <code>http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization</code>
 </td>
-<td rowspan="1" colspan="1">[<a href="http://131.107.72.15/MTOM_Service_Indigo/">WS-OptimizedSerializationPolicy</a>]</td>
+<div class="diff-del"><td rowspan="1" colspan="1" class="diff-del">[<div class="diff-add"><a href="#WS-MTOMPolicy">[WS-MTOMPolicy]</a></div>WS-OptimizedSerializationPolicy]</td></div>
 </tr>
 <tr>
 <td rowspan="1" colspan="1">
@@ -395,6 +395,17 @@
    
    
       <dt class="label">
+         <a href="ws-policy-framework.html#ignorable_policy_assertion">ignorable policy assertion</a>
+      </dt>
+      <dd>
+         <p id="ignorable_policy_assertion">An 
+	    <b>ignorable policy assertion</b> is 
+	    an assertion that may be ignored for policy intersection (as defined in 
+	        <a href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection">4.5 Policy Intersection</a>).</p>
+      </dd>
+   
+   
+      <dt class="label">
          <a href="#merge">merge</a>
       </dt>
       <dd>
@@ -477,8 +488,11 @@
   
 <ul>
 <li>
-<p>policy</p>
+<p><span class="diff-add">ignorable_policy_assertion</span></p>
 </li>
+<div class="diff-add"><li class="diff-add">
+<p>policy</p>
+</li></div>
 <li>
 <p>policy_alternative</p>
 </li>
@@ -813,7 +827,7 @@
 <code class="elt">/wsp:PolicyAttachment/wsse:Security</code> 
 </dt>
 <dd>
-<p>This optional element allows security information such as
+  <p>This <span class="diff-del">optional </span>element <span class="diff-add">is of type </span><span class="diff-add"><code class="attr"><span class="diff-add">xs:boolean</span></code> </span> <span class="diff-add">and </span>allows security information such as
 signatures to be included. The syntax of this element is described in
 WS-Security [<a href="#WS-Security">[WS-Security 2004]</a>].</p>
 </dd>
@@ -824,8 +838,10 @@
 </dt>
 <dd>
 <p>Additional attributes <span class="rfc2119">MAY</span> be specified but
-<span class="rfc2119">MUST NOT</span> contradict the semantics of the owner
-element; if an attribute is not recognized, it
+  <span class="rfc2119">MUST NOT</span> contradict the semantics of the 
+  <span class="diff-add"><em> owner
+<span class="diff-del">element; </span><span class="diff-add">element</span></em></span><span class="diff-add">;
+   </span>if an attribute is not recognized, it
 <span class="rfc2119">SHOULD</span> be ignored.</p>
 </dd>
 
@@ -860,6 +876,55 @@
 <code>http://www.example.com/policies#RmPolicy</code> applies to all
 interactions with the endpoint at
 <code>http://www.example.com/acct</code>.</p>
+<div class="diff-add"><div class="div3">
+    
+<h4><a name="uri-domain-expression"></a>3.4.1 <span class="diff-add">URI Domain Expression</span></h4>
+    <p><span class="diff-add">This section defines a domain expression for identifying resources as 
+      </span><a title="" href="#policy_subject"><span class="diff-add">policy subjects</span></a> <span class="diff-add">for the external attachment mechanism. The following 
+    is a pseudo-schema for the URI domain expression:</span></p>
+<div class="exampleInner"><pre>&lt;wsp:PolicyAttachment &hellip; &gt;
+  &lt;wsp:AppliesTo&gt;
+    &lt;wsp:URI &hellip; &gt;xs:anyURI&lt;/wsp:URI&gt; *
+  &lt;/wsp:AppliesTo&gt;
+  &hellip;
+&lt;/wsp:PolicyAttachment&gt;</pre></div>
+<p><span class="diff-add">The following describes the URI domain expression element listed in the pseudo-schema outlined above:</span></p>
+<dl>
+  
+    <dt class="label"><span class="diff-add"><code class="attr"><span class="diff-add">/wsp:PolicyAttachment/wsp:AppliesTo/wsp:URI</span></code> </span></dt>
+    <dd><div class="diff-add"><p><span class="diff-add">This element is an absolute IRI that references a resource 
+      as a </span><a title="" href="#policy_subject"><span class="diff-add">policy subject</span></a><span class="diff-add">. There is no requirement that the IRI be resolvable; 
+    retrieval mechanisms are beyond the scope of this specification.</span></p></div></dd>
+  
+  
+    <dt class="label"><span class="diff-add"><code class="attr"><span class="diff-add">/wsp:PolicyReference/wsp:AppliesTo/wsp:URI/@{any}</span></code> </span></dt>
+    <dd><div class="diff-add"><p><span class="diff-add">Additional attributes </span><span class="rfc2119"><span class="diff-add">MAY</span></span> <span class="diff-add">be specified but </span><span class="rfc2119"><span class="diff-add">MUST NOT</span></span> <span class="diff-add">contradict the 
+      semantics of the </span><em><span class="diff-add">owner element</span></em><span class="diff-add">; if an attribute is not recognized, 
+      it </span><span class="rfc2119"><span class="diff-add">SHOULD</span></span> <span class="diff-add">be ignored.</span></p></div></dd>
+  
+</dl>
+  <p><span class="diff-add">URI domain expressions are used to identify resources that are identified using 
+  IRI or IRI References (such as endpoint, message or operation definitions) with which 
+    </span><a title="" href="#policy"><span class="diff-add">policies</span></a> <span class="diff-add">can be associated. For example, URI domain expressions can be used 
+  to identify WSDL 1.1 definitions, WSDL 2.0 components, etc. 
+  IRI References for WSDL 2.0 components 
+    are defined in Appendix C of the Web Services Description Language (WSDL) Version 2.0 
+    Part 1: Core Language [</span><a href="#WSDL20">[WSDL 2.0 Core Language]</a><span class="diff-add">]. The following 
+  example illustrates the use of URI domain expression 
+  with a WSDL 2.0 IRI Reference: </span></p>
+  <div class="exampleInner"><pre>&lt;wsp:PolicyAttachment&gt;
+  &lt;wsp:AppliesTo&gt;
+    &lt;wsp:URI&gt;http://example.org/TicketAgent.wsdl20#wsdl.endpoint(TicketAgentService/Endpoint)&lt;/wsp:URI&gt;
+  &lt;/wsp:AppliesTo&gt;
+  &lt;wsp:PolicyReference URI="http://www.example.com/policies#RmPolicy" /&gt;
+ &lt;/wsp:PolicyAttachment&gt;</pre></div>
+  <p><span class="diff-add">In this example, the </span><a title="" href="#policy_expression"><span class="diff-add">policy expression</span></a> <span class="diff-add">at 
+   </span><code><span class="diff-add">http://www.example.com/policies#RmPolicy</span></code> <span class="diff-add">applies to all interactions with 
+   the endpoint at </span><code><span class="diff-add">http://example.org/TicketAgent.wsdl20#wsdl.endpoint(TicketAgentService/Endpoint)</span></code><span class="diff-add">. 
+ Similarly, an XPointer [</span><a href="#XPointer">[XPointer Framework]</a><span class="diff-add">] can be used as an 
+ IRI Reference to identify a description in a WSDL 1.1 [</span><a href="#WSDL11">[WSDL 1.1]</a><span class="diff-add">] document.</span></p>   
+   
+</div></div>
 </div>
 </div>
 <div class="div1">
@@ -1780,6 +1845,39 @@
 </tr>
 </tbody>
 </table><br>
+ <div class="diff-add"><p class="diff-add">
+   <span class="diff-add">Two {policy} properties are equivalent when they represent policies that 
+   contain the same number of </span><a title="" href="#policy_alternative"><span class="diff-add">policy alternatives</span></a><span class="diff-add">, 
+   and each </span><a title="" href="#policy_alternative"><span class="diff-add">policy alternative</span></a> <span class="diff-add">in the first policy 
+   is equivalent to some </span><a title="" href="#policy_alternative"><span class="diff-add">policy alternative</span></a> 
+   <span class="diff-add">in the second policy, and conversely.
+ </span></p></div>
+  <div class="diff-add"><p class="diff-add">
+    <span class="diff-add">Two </span><a title="" href="#policy_alternative"><span class="diff-add">policy alternatives</span></a> <span class="diff-add">are 
+    equivalent when each </span><a title="" href="#policy_assertion"><span class="diff-add">policy assertion</span></a> 
+    <span class="diff-add">in the first </span><a title="" href="#policy_alternative"><span class="diff-add">policy alternative</span></a> <span class="diff-add">is  
+    equivalent to some </span><a title="" href="#policy_assertion"><span class="diff-add">policy assertion</span></a> 
+    <span class="diff-add">in the second </span><a title="" href="#policy_alternative"><span class="diff-add">policy alternative</span></a><span class="diff-add">, and conversely.  
+    If either </span><a title="" href="#policy_alternative"><span class="diff-add">policy alternative</span></a> 
+    <span class="diff-add">contains multiple </span><a title="" href="#policy_assertion"><span class="diff-add">policy assertions</span></a> <span class="diff-add">of 
+    the same type, </span><a title="" href="#policy_alternative"><span class="diff-add">policy alternative</span></a>
+    <span class="diff-add">equality is dependent on the semantics of that assertion type.
+  </span></p></div>
+  <div class="diff-add"><p class="diff-add">
+    <span class="diff-add">Two </span><a title="" href="#policy_assertion"><span class="diff-add">policy assertions</span></a> <span class="diff-add">are equivalent 
+    if they have the same QName, if either policy assertion is an </span><a title="" href="#ignorable_policy_assertion"><span class="diff-add">ignorable policy assertion</span></a><span class="diff-add">,
+    both assertions must be </span><a title="" href="#ignorable_policy_assertion"><span class="diff-add">ignorable policy assertions</span></a> 
+    <span class="diff-add">and, if either </span><a title="" href="#policy_assertion"><span class="diff-add">policy assertion</span></a> 
+    <span class="diff-add">has a nested policy, both assertions must have a 
+    nested policy and the nested policies must be equal.  If either assertion 
+    contains policy assertion parameters, then the policy assertion parameters 
+    SHOULD be compared for equality.  Comparing policy assertion parameters 
+    for equality is not defined by this document, but </span><a title="" href="#policy_assertion"><span class="diff-add">policy assertion</span></a> 
+    <span class="diff-add">equality may be further refined by the corresponding </span><a title="" href="#policy_assertion"><span class="diff-add">policy assertion</span></a> 
+    <span class="diff-add">specification.
+  </span></p></div>
+  
+
 </div>
 <div class="div2">
 
@@ -2351,19 +2449,19 @@
 <h2><a name="Conformance"></a>8. Conformance</h2>
 <div class="div2">
 
-<h3><a name="N11633"></a>8.1 External Policy Attachment Conformance</h3>
+<h3><a name="N117CD"></a>8.1 External Policy Attachment Conformance</h3>
 <p>An element information item whose namespace name is <span class="diff-chg">"http://www.w3.org/@@@@/@@/ws-policy" </span>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 (<span class="diff-chg"><a href="http://www.w3.org/@@@@/@@/ws-policy.xsd"><span class="diff-chg">http://www.w3.org/@@@@/@@/ws-policy.xsd</span></a></span>) 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="N11651"></a>8.2 WSDL 1.1 Attachment Conformance</h3>
+<h3><a name="N117EB"></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="N11660"></a>8.3 WSDL 2.0 Attachment Conformance</h3>
+<h3><a name="N117FA"></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>
@@ -2518,6 +2616,12 @@
         2005. This version of the SOAP Message Transmission Optimization Mechanism Recommendation
         is http://www.w3.org/TR/2005/REC-soap12-mtom-20050125/. The <a href="http://www.w3.org/TR/soap12-mtom/">latest version of SOAP Message Transmission
           Optimization Mechanism</a> is available at http://www.w3.org/TR/soap12-mtom/.   (See <a href="http://www.w3.org/TR/2005/REC-soap12-mtom-20050125/">http://www.w3.org/TR/2005/REC-soap12-mtom-20050125/</a>.)</dd>
+  <dt class="label"><span class="diff-add"><a name="WS-MTOMPolicy"></a>WS-MTOMPolicy</span></dt><dd><div class="diff-add">
+    <cite><span class="diff-add">MTOM Serialization Policy Assertion (WS-MTOMPolicy)</span></cite><span class="diff-add">, C. Ferris, et al,
+    Authors. International Business Machines Corporation and Microsoft
+    Corporation, Inc., September 2006. Available at
+    http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization/
+  </span>  (See http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization/.)</div></dd>
 <dt class="label"><a name="SCC14N"></a>[SCC14N] </dt><dd>
 <cite>Schema Centric XML Canonicalization Version
 	1.0</cite>, S. Aissi, A. Hately, and M. Hondo,
@@ -2579,6 +2683,16 @@
         version of the XML-binary Optimized Packaging Recommendation is
         http://www.w3.org/TR/2005/REC-xop10-20050125/. The <a href="http://www.w3.org/TR/xop10/">latest version of XML-binary Optimized Packaging</a> is available at
         http://www.w3.org/TR/xop10/.   (See <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/">http://www.w3.org/TR/2005/REC-xop10-20050125/</a>.)</dd>
+  <dt class="label"><span class="diff-add"><a name="XPointer"></a>XPointer Framework</span></dt><dd><div class="diff-add">
+    <cite><span class="diff-add">XPointer Framework</span></cite><span class="diff-add">,Paul Grosso, Eve
+    Maler, Jonathan Marsh, Norman Walsh, Editors. World Wide Web
+    Consortium, 22 November 2002.  This version of the XPointer
+    Framework Proposed Recommendation is
+    http://www.w3.org/TR/2003/REC-xptr-framework-20030325/ The
+    </span><a href="http://www.w3.org/TR/xptr-framework/"><span class="diff-add">latest
+      version of XPointer Framework</span></a> <span class="diff-add">is available at
+    http://www.w3.org/TR/xptr-framework/.
+  </span>  (See http://www.w3.org/TR/2003/REC-xptr-framework-20030325/.)</div></dd>
 </dl>
 </div>
 </div>
@@ -2838,18 +2952,19 @@
       is below:</p>
      <ul>
         <li>
-          <p><span class="diff-add">None.</span><span class="diff-del">Enhanced the Conformance section.</span></p>
-        </li>
+          <p><span class="diff-del">Enhanced the Conformance section.
         
-          <span class="diff-del">Added a new section -  - 
+        
+          </span>Added a new <span class="diff-add">domain</span><span class="diff-del">section -  - 
              that describes a mechanism for associating policy expressions with 
-             Web service constructs in WSDL 2.0.
-         
-           
-             Clarified that a wsp:PolicyReference can be used any place 
-             where a wsp:Policy element can be used
-           
-      </span></ul>
+             Web service constructs in </span><span class="diff-chg">expression: </span><span class="diff-add"><a href="#uri-domain-expression"><b>3.4.1 URI Domain Expression</b></a></span><span class="diff-add">.</span><span class="diff-del">2.0.</span></p>         
+        </li>
+       <li>
+             <p><span class="diff-add">Defined</span><span class="diff-del">Clarified that a wsp:PolicyReference can be used </span><span class="diff-chg">the </span><span class="diff-add">equivalence</span><span class="diff-del">place 
+             where </span><span class="diff-chg">of two {policy} properties </span><span class="diff-add">in 
+       Section</span><span class="diff-del">be </span><span class="diff-add"><a href="#extension-to-wsdl-component-model"><b>5.3 Extension to WSDL Component Model</b></a></span><span class="diff-add">.</span><span class="diff-del">used</span></p>
+           </li>
+      </ul>
 </div>
 <div class="div1">
 
@@ -3111,7 +3226,46 @@
     <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>   
+  </tr></div>
+  <div class="diff-add"><tr class="diff-add">
+    <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20061109</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
+      <a href="http://lists.w3.org/Archives/Public/public-ws-policy/2006Oct/0192.html"><span class="diff-add">resolution for Issue 3894.</span></a> 
+      Editors' Action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/71"><span class="diff-add">71</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">20061109</td></div>
+    <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">TIB</td></div>
+    <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented Editors' Action
+      <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/74"><span class="diff-add">74</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">20061109</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/2006Nov/0072.html"><span class="diff-add">resolution</span></a> for issues
+      <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3721"><span class="diff-add">3721</span></a> and 
+      <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3789"><span class="diff-add">3789</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">20061109</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://www.w3.org/2005/06/tracker/wspolicyeds/actions/72"><span class="diff-add">resolution</span></a> for issues
+      <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3599"><span class="diff-add">3599</span></a> and 
+      <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3730"><span class="diff-add">3730</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">20061109</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">Updated Section <a href="#change-description"><b>D. Changes in this Version of the Document</b></a>.
+    </td></div>
+  </tr></div>                                        
 </tbody>
 </table><br>
 </div>

Index: ws-policy-framework-diff20061102.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework-diff20061102.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ws-policy-framework-diff20061102.xml	3 Nov 2006 20:54:02 -0000	1.3
+++ ws-policy-framework-diff20061102.xml	10 Nov 2006 05:16:02 -0000	1.4
@@ -114,24 +114,24 @@
             
             <example id="ex-wsp-use-security-assertations">
                 <head>Use of Web Services Policy with security policy assertions.</head>
-                <eg xml:space="preserve">
+                <eg xml:space="preserve"><phrase diff="chg">
                 
 (01) &lt;wsp:Policy
         xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
         xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
-(03)     &lt;sp:wsp:All&gt;
+(03)     &lt;wsp:All&gt;
 (04)        &lt;sp:SignedParts/&gt;
 (05)           &lt;sp:Body/&gt;
 (06)        &lt;/sp:SignedParts/&gt;
 (07)     &lt;/wsp:All&gt;
-(08)     &lt;sp:wsp:All&gt;
+(08)     &lt;wsp:All&gt;
 (09)        &lt;sp:EncryptedParts/&gt;
 (10)           &lt;sp:Body/&gt;
 (11)        &lt;/sp:EncryptedParts/&gt;
 (12)     &lt;/wsp:All&gt;
 (13)   &lt;/wsp:ExactlyOne&gt;
-(14) &lt;/wsp:Policy&gt;</eg> 
+(14) &lt;/wsp:Policy&gt;</phrase></eg> 
             </example>     
             <p>Lines (03-06) represent one
                 policy alternative for signing a message body.</p>
@@ -317,6 +317,17 @@
 <glist>
    <gitem>
       <label>
+         <loc href="#ignorable_policy_assertion" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" 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 ignored for policy intersection (as defined in 
+	        <xspecref xmlns:xlink="http://www.w3.org/1999/xlink" href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection" xlink:type="simple" xlink:actuate="onRequest" xlink:show="new">4.5 Policy Intersection</xspecref>).</p>
+      </def>
+   </gitem>
+   <gitem>
+      <label>
          <loc href="#nested_policy_expression" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">nested policy expression</loc>
       </label>
       <def>
@@ -450,6 +461,17 @@
 	       Assertions indicate domain-specific (e.g.,
 	    security, transactions) semantics and are expected to be
 	    defined in separate, domain-specific specifications.</p>
+	    
+	    <p diff="add"><phrase diff="add">An assertion MAY indicate that it is an ignorable policy assertion 
+	    (see </phrase><specref ref="ignorable-policy-assertions"></specref><phrase diff="add">). 
+	    </phrase><termdef id="ignorable_policy_assertion" term="ignorable policy assertion"><phrase diff="add">An 
+	    </phrase><term><phrase diff="add">ignorable policy assertion</phrase></term> <phrase diff="add">is 
+	    an assertion that may be ignored for policy intersection (as defined in 
+	        </phrase><xspecref href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new"><phrase diff="add">4.5 Policy Intersection</phrase></xspecref><phrase diff="add">).</phrase></termdef> <phrase diff="add">By default, an assertion is not 
+	    ignorable for policy intersection.	          
+	    </phrase></p>
+	    
+	    
 
 	    <p>Assertions are typed by the authors
 	    that define them.  <termdef id="policy_assertion_type" term="policy assertion type">A <term>policy assertion type</term> 
@@ -552,12 +574,12 @@
 	      <p>Applied <phrase diff="chg">to a </phrase>Web services based system, <termref def="policy">policy</termref> is used to convey conditions
 	    on an interaction between entities (requester application,
 	      provider service, Web infrastructure component, etc).
-	      <phrase diff="add">An  </phrase><phrase diff="del">A </phrase><phrase diff="add">interaction</phrase><phrase diff="del">policy </phrase><phrase diff="add">involves one or more message exchanges between two 
-	      entities.</phrase><phrase diff="del">subject </phrase><phrase diff="add">It </phrase>is <phrase diff="chg">the </phrase><phrase diff="add">responsibility of </phrase><termref def="policy_assertion" diff="add"><phrase diff="add">assertion</phrase></termref> <phrase diff="add">authors to</phrase><phrase diff="del">entity 
-	    (e.g., </phrase><phrase diff="add">define 
-	      the interaction scope of </phrase>an <phrase diff="chg">assertion including any constraints </phrase><phrase diff="add">on the 
-	      </phrase><termref def="policy_subject" diff="add"><phrase diff="add">policy</phrase><phrase diff="del">with </phrase><phrase diff="add">subjects</phrase></termref> <phrase diff="add">to </phrase>which <phrase diff="add">the</phrase><phrase diff="del">a 
-	    policy </phrase><phrase diff="chg">assertion </phrase><phrase diff="add">may </phrase>be <phrase diff="chg">attached </phrase><phrase diff="add">and a clear 
+	      <phrase diff="add">An  </phrase><phrase diff="del">A </phrase><phrase diff="add">interaction</phrase><phrase diff="del">policy </phrase><phrase diff="add">involves one or</phrase><phrase diff="del">subject </phrase><phrase diff="add">more message exchanges between two 
+	      entities. It </phrase>is <phrase diff="chg">the </phrase><phrase diff="add">responsibility of </phrase><termref def="policy_assertion" diff="add"><phrase diff="add">assertion</phrase></termref> <phrase diff="add">authors to define 
+	      the interaction</phrase><phrase diff="del">entity 
+	    (e.g., </phrase><phrase diff="add">scope of </phrase>an <phrase diff="chg">assertion including any constraints </phrase><phrase diff="add">on the 
+	      </phrase><termref def="policy_subject" diff="add"><phrase diff="add">policy subjects</phrase></termref> <phrase diff="add">to</phrase><phrase diff="del">with </phrase>which <phrase diff="add">the</phrase><phrase diff="del">a 
+	    policy </phrase><phrase diff="add">assertion may</phrase><phrase diff="del">can </phrase>be <phrase diff="chg">attached </phrase><phrase diff="add">and a clear 
 	      specification of the message (s) within that interaction scope to which the 
 	      assertion applies. </phrase></p>
 	    
@@ -682,22 +704,22 @@
     form of a policy expression <rfc2119>SHOULD</rfc2119> be used where practical.</p>
 
 	      <p>For example, the following is the normal form of a policy expression.</p>
-<eg xml:space="preserve">(01) &lt;wsp:Policy
+<eg xml:space="preserve"><phrase diff="chg">(01) &lt;wsp:Policy
         xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
         xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" &gt;
 (02)   &lt;wsp:ExactlyOne&gt;
-(03)     &lt;sp:wsp:All&gt;
+(03)     &lt;wsp:All&gt;
 (04)        &lt;sp:SignedParts/&gt;
 (05)           &lt;sp:Body/&gt;
 (06)        &lt;/sp:SignedParts/&gt;
 (07)     &lt;/wsp:All&gt;
-(08)     &lt;sp:wsp:All&gt;
+(08)     &lt;wsp:All&gt;
 (09)        &lt;sp:EncryptedParts/&gt;
 (10)           &lt;sp:Body/&gt;
 (11)        &lt;/sp:EncryptedParts/&gt;
 (12)     &lt;/wsp:All&gt;
 (13)   &lt;/wsp:ExactlyOne&gt;
-(14) &lt;/wsp:Policy&gt;</eg>
+(14) &lt;/wsp:Policy&gt;</phrase></eg>
 
 <p>Lines (03-07) and Lines (08-11) express the two alternatives in the
 policy. If the first alternative is selected, the message body needs to be signed [<bibref ref="WS-SecurityPolicy"></bibref>] is supported;
@@ -1222,7 +1244,8 @@
 </gitem>
 <gitem>
 <label><att>/wsp:PolicyReference/@Digest</att></label>
-<def><p>This optional attribute specifies the digest of the referenced policy expression. This is used to ensure the included policy is the expected policy.  If omitted, there is no implied value.</p></def>
+    <def><p>This <phrase diff="del">optional </phrase>attribute <phrase diff="add">is of type </phrase><att diff="add"><phrase diff="add">xs:boolean</phrase></att> <phrase diff="add">and </phrase>specifies the digest of the referenced policy expression. This is used to ensure the included policy is the expected policy.
+    <phrase diff="chg">If </phrase>omitted, there is no implied value.</p></def>
 </gitem>
 <gitem>
 <label><att>/wsp:PolicyReference/@DigestAlgorithm</att></label>
@@ -1298,26 +1321,68 @@
 <p>There are times when it is desirable to "re-use" a portion of a policy expression. Generally, this can be accomplished by placing the common assertions in a separate policy expression and referencing it. </p>
 </div3>
 </div2>
+<div2 id="ignorable-policy-assertions" diff="add">
+<head><phrase diff="add">Ignorable Policy Assertions</phrase></head>
+<p><phrase diff="add">The </phrase><att><phrase diff="add">wsp:Ignorable</phrase></att> <phrase diff="add">attribute indicates if a policy assertion is an 
+</phrase><termref def="ignorable_policy_assertion"><phrase diff="add">ignorable policy assertion</phrase></termref><phrase diff="add">. The schema 
+outline for this attribute is as follows:</phrase></p>
+<eg xml:space="preserve" role="needs-numbering">&lt;Assertion ( wsp:Ignorable="xs:boolean" )? … &gt; … &lt;/Assertion&gt;</eg>    
+<p><phrase diff="add">The following describes the Attribute Information Item defined in the schema outline above:</phrase></p>
+<glist>   
+    <gitem><label><att><phrase diff="add">/Assertion/@wsp:Ignorable</phrase></att></label> 
+    <def><p><phrase diff="add">This attribute is of type </phrase><code><phrase diff="add">xs:boolean</phrase></code><phrase diff="add">. If the actual 
+    value (See XML Schema Part 1 [</phrase><bibref ref="XMLSchemaPart1"></bibref><phrase diff="add">]) is true, 
+    the assertion is an </phrase><termref def="ignorable_policy_assertion"><phrase diff="add">ignorable policy assertion</phrase></termref><phrase diff="add">. If the actual value is false, 
+    the assertion is not an </phrase><termref def="ignorable_policy_assertion"><phrase diff="add">ignorable policy assertion</phrase></termref><phrase diff="add">. Omitting 
+    this attribute is semantically equivalent to including it with a value of false.</phrase></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 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, associative function that takes two policies and returns a policy.</p>
+<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 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 <phrase diff="chg">commutative </phrase><phrase diff="del">associative </phrase>function that 
+takes two policies and returns a policy. <phrase diff="add">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.
+</phrase></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 will be known from the QNames of the specific <termref def="policy_assertion_type">assertion types</termref>
+is required <phrase diff="add">this </phrase>will be known from the QNames of the specific <termref def="policy_assertion_type">assertion types</termref>
 involved in the policy alternatives. As a first approximation, an algorithm is defined herein 
-that approximates compatibility in a domain-independent manner; specifically, 
-for two <termref def="policy_alternative">policy alternatives</termref>  to be compatible, they must at least have the same 
-<termref def="policy_alternative_vocabulary">policy alternative vocabulary</termref> (see Section <specref ref="rPolicy_Alternative"></specref>).
-</p>
+that approximates compatibility in a domain-independent <phrase diff="add">manner:</phrase><phrase diff="del">manner; specifically, 
+for two policy alternatives  to be compatible, they must at least have the same 
+policy alternative vocabulary (see Section ).
+</phrase></p>
 <ulist>
 <item><p>Two <termref def="policy_assertion">policy assertions</termref> are compatible if they have the same <termref def="policy_assertion_type">type</termref> and</p></item>
 <item><p>If either assertion contains a nested <termref def="policy_expression">policy expression</termref>, the two assertions are compatible if they both have a nested policy expression and the alternative in the nested policy expression of one is compatible with the alternative in the nested policy expression of the other.</p></item>
 </ulist>
 <p><termref def="policy_assertion_parameter">Assertion parameters</termref> are not part of the compatibility determination defined herein but may be part of other, domain-specific compatibility processing. </p>
 <ulist>
-<item><p>Two <termref def="policy_alternative">policy alternatives</termref> are compatible if each assertion in one is compatible with an assertion in the other, and vice-versa. If two alternatives are compatible, their intersection is an alternative containing all of the assertions in both alternatives.</p></item>
+<item>
+    <p><phrase diff="add">If the mode is strict,</phrase><phrase diff="del">Two </phrase><phrase diff="add">two </phrase><termref def="policy_alternative">policy alternatives</termref> <phrase diff="add">A and B </phrase>are <phrase diff="add">compatible:
+        </phrase><ulist diff="add"><item><p><phrase diff="add">if each assertion in A is </phrase>compatible <phrase diff="add">with an 
+            assertion in B, and</phrase></p></item>
+            <item><p>if each assertion in <phrase diff="chg">B </phrase>is compatible with an assertion in <phrase diff="add">A.</phrase></p></item>
+    </ulist></p>   
+    <p diff="add"><phrase diff="add">If </phrase>the <phrase diff="add">mode is lax, two </phrase><termref def="policy_alternative"><phrase diff="add">policy alternatives</phrase></termref> <phrase diff="add">A and B are compatible:
+        </phrase><ulist><item><p><phrase diff="add">if each assertion in A that is not an </phrase><termref def="ignorable_policy_assertion"><phrase diff="add">ignorable policy assertion</phrase></termref>
+         <phrase diff="add">is compatible</phrase><phrase diff="del">other, </phrase><phrase diff="add">with an 
+        assertion in B, </phrase>and</p></item>
+            <item><p><phrase diff="add">if each assertion in B that is not an 
+        </phrase><termref def="ignorable_policy_assertion"><phrase diff="add">ignorable policy assertion</phrase></termref>
+         <phrase diff="add">is compatible with an 
+            assertion </phrase><phrase diff="chg">in </phrase><phrase diff="add">A.</phrase></p></item>
+   </ulist></p>
+<p diff="add">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 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>As an example of intersection, consider two input policies in normal form:</p>
@@ -1521,6 +1586,78 @@
 </div1>
     </body>
     <back>
+<div1 id="ietf-draft" diff="add">
+    <head><phrase diff="add">The application/wspolicy+xml Media Type</phrase></head>
+    <p><phrase diff="add">This appendix defines the </phrase><attval><phrase diff="add">application/wspolicy+xml</phrase></attval>
+        <phrase diff="add">media type which can be used to describe Web Services Policy documents
+        serialized as XML. Either </phrase><att><phrase diff="add">wsp:Policy</phrase></att> <phrase diff="add">and </phrase><att><phrase diff="add">wsp:PolicyAttachment</phrase></att> <phrase diff="add">could be the root element of such a document.</phrase></p>
+    <div2 id="ietf-reg">
+        <head><phrase diff="add">Registration</phrase></head>
+        <glist>
+            <gitem><label><phrase diff="add">MIME media type name:</phrase></label><def><p><phrase diff="add">application</phrase></p></def></gitem>
+            <gitem><label><phrase diff="add">MIME subtype name:</phrase></label><def><p><phrase diff="add">wspolicy+xml</phrase></p></def></gitem>
+            <gitem><label><phrase diff="add">Required parameters:</phrase></label><def><p><phrase diff="add">none</phrase></p></def></gitem>
+            <gitem><label><phrase diff="add">Optional parameters:</phrase></label>
+                <def>
+                    <glist>
+                        <gitem><label><phrase diff="add">charset</phrase></label>
+                            <def><p><phrase diff="add">This parameter has identical semantics to the charset parameter
+                                of the </phrase><attval><phrase diff="add">application/xml</phrase></attval> <phrase diff="add">media type as specified in
+                                </phrase><bibref ref="RFC3023"></bibref><phrase diff="add">.</phrase></p></def></gitem>
+                        
+                    </glist></def></gitem>
+            <gitem><label><phrase diff="add">Encoding considerations:</phrase></label>
+                <def><p><phrase diff="add">Identical to those of </phrase><attval><phrase diff="add">application/xml</phrase></attval>
+                    <phrase diff="add">as described in </phrase><bibref ref="RFC3023"></bibref><phrase diff="add">,
+                    section 3.2, as applied to the Web Services Policy document Infoset.</phrase></p></def></gitem>
+            <gitem><label><phrase diff="add">Security considerations:</phrase></label>
+                <def><p><phrase diff="add">See section </phrase><specref ref="Security_Considerations"></specref> <phrase diff="add">in this document, and the
+                    Security Consideration section in </phrase><bibref ref="WS-PolicyAttachment"></bibref><phrase diff="add">.</phrase></p></def></gitem>
+            <gitem><label><phrase diff="add">Interoperability considerations:</phrase></label>
+                <def><p><phrase diff="add">There are no known interoperability issues.</phrase></p></def></gitem>
+            <gitem><label><phrase diff="add">Published specifications:</phrase></label>
+                <def><p><phrase diff="add">This document and </phrase><bibref ref="WS-PolicyAttachment"></bibref><phrase diff="add">.</phrase></p></def></gitem>
+            <gitem><label><phrase diff="add">Applications which use this media type:</phrase></label>
+                <def><p><phrase diff="add">This new media type is being registered to allow for deployment of Web Services
+                Policy and references to Web Services Policy on the World Wide Web.</phrase></p></def></gitem>
+            <gitem>
+                <label><phrase diff="add">Additional information:</phrase></label>
+                <def><glist>
+                    <gitem>
+                        <label><phrase diff="add">File extension:</phrase></label>
+                        <def><p><phrase diff="add">wspolicy</phrase></p></def>
+                    </gitem>
+                    <gitem>
+                        <label><phrase diff="add">Fragment identifiers:</phrase></label>
+                        <def><p><phrase diff="add">A syntax identical to that of
+                            </phrase><attval><phrase diff="add">application/xml</phrase></attval> <phrase diff="add">as described in </phrase><bibref ref="RFC3023"></bibref><phrase diff="add">.</phrase></p></def>
+                    </gitem>
+                    <gitem>
+                        <label><phrase diff="add">Base URI:</phrase></label>
+                        <def><p><phrase diff="add">As specified in </phrase><bibref ref="RFC3023"></bibref><phrase diff="add">, section 6.</phrase></p>
+                        </def>
+                    </gitem>
+                    <gitem>
+                        <label><phrase diff="add">Macintosh File Type code:</phrase></label>
+                        <def><p><phrase diff="add">WSPOLICY</phrase></p></def>
+                    </gitem>
+                    <gitem>
+                        <label><phrase diff="add">Person and email address to contact for further information:</phrase></label>
+                        <def><p><phrase diff="add">World Wide Web Consortium &lt;web-human@w3.org&gt;</phrase></p></def></gitem>
+                    <gitem>
+                        <label><phrase diff="add">Intended usage:</phrase></label><def><p><phrase diff="add">COMMON</phrase></p></def></gitem>
+                    <gitem>
+                        <label><phrase diff="add">Author/Change controller:</phrase></label>
+                        <def><p><phrase diff="add">The Web Services Policy 1.5 specification set is a work product of the World Wide
+                    Web Consortium's 
+                    </phrase><loc href="http://www.w3.org/2002/ws/desc/" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">Web Service Policy Working Group</phrase></loc><phrase diff="add">.
+                    The W3C has change control over these specifications.</phrase></p></def></gitem>
+                </glist>
+            </def>
+            </gitem>
+        </glist>
+    </div2>
+</div1>
 <div1 id="References">
 <head>References</head>
 
@@ -1528,6 +1665,16 @@
         <head>Normative References</head>
 
 	<blist>
+	    <bibl id="WS-PolicyAttachment" key="Web Services Policy Attachment" href="ws-policy-attachment.html" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple" diff="add">
+	        <titleref xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new"><phrase diff="add">Web Services Policy 1.5 - Attachment</phrase></titleref><phrase diff="add">, A. S. Vedamuthu, D. Orchard, M. Hondo, T. Boubez and P. Yendluri,
+	        Editors. World Wide Web Consortium, @@,
+	        @@@@ @@@@.  This version of the
+	        specification of the Web Services Policy 1.5 - Attachment specification is
+	        ws-policy-attachment.html. The </phrase><loc href="http://www.w3.org/TR/ws-policy-attachment" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">latest
+	            version of Web Services Policy 1.5 - Attachment</phrase></loc> <phrase diff="add">is available at
+	        http://www.w3.org/TR/ws-policy-attachment.
+	    </phrase></bibl>
+	    
 	  <bibl key="IETF RFC 2119" href="http://www.ietf.org/rfc/rfc2119.txt" id="RFC2119" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple">
 	    <titleref xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new">Key words for use in RFCs to Indicate
 	    Requirement Levels</titleref>, S. Bradner, Author. Internet
@@ -1608,6 +1755,9 @@
 	    version of XML Schema Part 2</loc> is available at
 	    http://www.w3.org/TR/xmlschema-2.
 	  </bibl>
+        <bibl key="RFC 3023" href="http://www.ietf.org/rfc/rfc3023.txt" id="RFC3023" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple" diff="add"><phrase diff="add">IETF
+        "RFC 3023: XML Media Types", M. Murata, S. St. Laurent, D. Kohn, July
+        1998.</phrase></bibl>
 	</blist>
     </div2>
     <div2 id="Informative-References">
@@ -1665,16 +1815,16 @@
 	  the UDDI 3.0</loc> specification is available at
 	  http://uddi.org/pubs/uddi_v3.htm.
 	</bibl>
-	<bibl id="WS-PolicyAttachment" key="Web Services Policy Attachment" href="ws-policy-attachment.html" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple">
-	  <titleref xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new">Web Services Policy 1.5 - Attachment</titleref>, A. S. Vedamuthu, D. Orchard, M. Hondo, T. Boubez and P. Yendluri,
+	
+	  <phrase diff="del">Web Services Policy 1.5 - Attachment, A. S. Vedamuthu, D. Orchard, M. Hondo, T. Boubez and P. Yendluri,
 	  Editors. World Wide Web Consortium, @@,
 	  @@@@ @@@@.  This version of the
 	  specification of the Web Services Policy 1.5 - Attachment specification is
-	  ws-policy-attachment.html. The <loc href="http://www.w3.org/TR/ws-policy-attachment" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">latest
-	  version of Web Services Policy 1.5 - Attachment</loc> is available at
+	  ws-policy-attachment.html. The latest
+	  version of Web Services Policy 1.5 - Attachment is available at
 	  http://www.w3.org/TR/ws-policy-attachment.
-	</bibl>
-	<bibl id="WS-SecurityPolicy" key="WS-SecurityPolicy" href="http://www.oasis-open.org/committees/download.php/15979/oasis-wssx-ws-securitypolicy-1.0.pdf" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple">
+	
+	</phrase><bibl id="WS-SecurityPolicy" key="WS-SecurityPolicy" href="http://www.oasis-open.org/committees/download.php/15979/oasis-wssx-ws-securitypolicy-1.0.pdf" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple">
 	  <titleref xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" 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
@@ -1747,15 +1897,16 @@
     <p>A list of substantive changes since the Working Draft dated <phrase diff="chg">2 November, </phrase>2006
     is below:</p>
     <ulist>
-        <item><p><phrase diff="add">None.</phrase><phrase diff="del">Enhanced Conformance section.
+        <item><p><phrase diff="add">Added</phrase><phrase diff="del">Enhanced Conformance section.
         Enhanced Security Considerations section.
         Clarified WS-Policy 1.5 Framework and Attachment XML Namespace URI versioning Policy.
         Clarified the policy model for Web Services.
-        Clarified that an Element (EII) within a policy expression MUST be an assertion.
-        Clarified that policy assertion parameters are opaque to framework processing.
+        Clarified that an Element (EII) within </phrase>a <phrase diff="add">new</phrase><phrase diff="del">policy expression MUST be </phrase><phrase diff="chg">feature: </phrase><specref ref="ignorable-policy-assertions" diff="add"></specref><phrase diff="add">.</phrase><phrase diff="del">assertion.</phrase></p></item>
+        <item><p><phrase diff="add">Defined</phrase><phrase diff="del">Clarified that policy </phrase><phrase diff="chg">an XML Media Type </phrase>to <phrase diff="add">describe</phrase><phrase diff="del">framework processing.
         Added PolicyReference extensibility via {Any}
-        Clarified constraints on @xml:id type usage for Policy Identification.
-        Clarified that a wsp:PolicyReference can be used any place where a wsp:Policy element can be used</phrase></p></item>
+        Clarified constraints on @xml:id type </phrase><phrase diff="chg">Web Service </phrase>Policy <phrase diff="add">documents 
+        serialized</phrase><phrase diff="del">Identification.
+        Clarified that a wsp:PolicyReference can be used any place where a </phrase><phrase diff="chg">as XML in Appendix </phrase><specref ref="ietf-draft" diff="add"></specref><phrase diff="add">.</phrase><phrase diff="del">used</phrase></p></item>
     </ulist>
 </inform-div1>
         <inform-div1 id="change-log">
@@ -2192,7 +2343,52 @@
                         <td rowspan="1" colspan="1" diff="add">ASV</td>
                         <td rowspan="1" colspan="1" diff="add">Re-formatted the example in <specref ref="denial-of-service-threats"></specref>.
                         </td>
-                    </tr>                                          
+                    </tr>  
+                    <tr diff="add">
+                        <td rowspan="1" colspan="1" diff="add">20061109</td>
+                        <td rowspan="1" colspan="1" diff="add">PY</td>
+                        <td rowspan="1" colspan="1" diff="add">Implemented the editorial changes for Issue 3961
+                   
+                        for Editors' Action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/75" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">75</phrase></loc>.
+                        </td>
+                    </tr>                                         
+                    <tr diff="add">
+                        <td rowspan="1" colspan="1" diff="add">20061109</td>
+                        <td rowspan="1" colspan="1" diff="add">TIB</td>
+                        <td rowspan="1" colspan="1" diff="add">Implemented Editors' Action
+                        <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/73" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">73</phrase></loc>
+                        to create a normative appendix for MIMe subtype wspolicy+xml.
+                        </td>
+                    </tr>                                         
+                    <tr diff="add">
+                        <td rowspan="1" colspan="1" diff="add">20061109</td>
+                        <td rowspan="1" colspan="1" diff="add">TIB</td>
+                        <td rowspan="1" colspan="1" diff="add">Implemented Editors' Action
+                            <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/74" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">74</phrase></loc>.
+                        </td>
+                    </tr> 
+                    <tr diff="add">
+                        <td rowspan="1" colspan="1" diff="add">20061109</td>
+                        <td rowspan="1" colspan="1" diff="add">ASV</td>
+                        <td rowspan="1" colspan="1" diff="add">Implemented the
+                            <loc href="http://lists.w3.org/Archives/Public/public-ws-policy/2006Nov/0072.html" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution</phrase></loc> for issues
+                            <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3721" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">3721</phrase></loc> and 
+                            <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3789" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">3789</phrase></loc>.
+                        </td>
+                    </tr>
+                    <tr diff="add">
+                        <td rowspan="1" colspan="1" diff="add">20061109</td>
+                        <td rowspan="1" colspan="1" diff="add">ASV</td>
+                        <td rowspan="1" colspan="1" diff="add">Implemented Editors' Action
+                            <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/70" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">70</phrase></loc>.
+                        </td>
+                    </tr>
+                    <tr diff="add">
+                        <td rowspan="1" colspan="1" diff="add">20061109</td>
+                        <td rowspan="1" colspan="1" diff="add">ASV</td>
+                        <td rowspan="1" colspan="1" diff="add">Updated Section <specref ref="change-description"></specref>.
+                        </td>
+                    </tr>                  
                 
                 </tbody>
             </table>
Received on Friday, 10 November 2006 05:16:45 GMT

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