- From: Asir Vedamuthu via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 24 Jan 2007 05:00:35 +0000
- To: public-ws-policy-eds@w3.org
Update of /sources/public/2006/ws/policy
In directory hutz:/tmp/cvs-serv29116
Modified Files:
ws-policy-framework-diff20061117.xml
ws-policy-framework-diff20061117.html
ws-policy-attachment-diff20061117.html
ws-policy-attachment-diff20061117.xml
Log Message:
Regenerated DIFF docs since Last Call drafts
Index: ws-policy-attachment-diff20061117.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment-diff20061117.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ws-policy-attachment-diff20061117.html 8 Jan 2007 22:55:34 -0000 1.1
+++ ws-policy-attachment-diff20061117.html 24 Jan 2007 05:00:33 -0000 1.2
@@ -97,7 +97,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> 2.1 <a href="#NotationalConventions">Notational Conventions</a><br> 2.2 <a href="#XMLNamespaces">XML Namespaces</a><br> 2.3 <a href="#Glossary">Terminology</a><br> 2.4 <a href="#Example">Example</a><br>3. <a href="#rPolicyAttachment">Policy Attachment</a><br> 3.1 <a href="#rEffectivePolicy">Effective Policy</a><br> 3.2 <a href="#PolicyAttachmentMechanisms">Policy Attachment Mechanisms</a><br> 3.3 <a href="#XMLElementAttachement">XML Element Attachment</a><br> 3.4 <a href="#ExternalPolicyAttachment">External Policy Attachment</a><br> 3.4.1 <a href="#uri-domain-expression">URI Domain Expression</a><br> &bsp; 3.5 <a href="#IRI_Policy_Attachment">Use of IRIs in Policy Attachment</a><br>4. <a href="#AttachingPolicyUsingWSDL1.1">Attaching Policies Using WSDL 1.1</a><br> 4.1 <a href="#CalculatingEffectivyPolicywithWSDL1.1">Calculating Effective Policy in WSDL 1.1</a><br> 4.1.1 <a href="#ServicePolicySubject">Service Policy Subject</a><br> 4.1.2 <a href="#EndpointPolicySubject">Endpoint Policy Subject</a><br> 4.1.3 <a href="#OperationPolicySubject">Operation Policy Subject</a><br> 4.1.4 <a href="#MessagePolicySubject">Message Policy Subject</a><br> 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> 5.1 <a href="#wsdl20-example">Example</a><br> nbsp; 5.2 <a href="#attaching-policy-expressions">Attaching Policy Expressions</a><br> 5.3 <a href="#extension-to-wsdl-component-model">Extension to WSDL Component Model</a><br> 5.4 <a href="#effective-policy">Effective Policy</a><br> 5.4.1 <a href="#service-policy-subject">Service Policy Subject</a><br> 5.4.2 <a href="#endpoint-policy-subject">Endpoint Policy Subject</a><br> 5.4.3 <a href="#operation-policy-subject">Operation Policy Subject</a><br> 5.4.4 <a href="#message-policy-subject-input">Message Policy Subject (input message)</a><br> 5.4.5 <a href="#message-policy-subject-output">Message Policy Subject (output message)</a><br> 5.4.6 <a href="#message-policy-subject-inut-fault">Message Policy Subject (input fault message)</a><br> 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> 6.1 <a href="#CalculatingEffectivePolicyElementPolicyUDDI">Calculating Effective Policy and Element Policy in UDDI</a><br> 6.1.1 <a href="#ServiceProviderPolicySubjectUDDI">Service Provider Policy Subject</a><br> 6.1.2 <a href="#ServicePolicySubjectUDDI">Service Policy Subject</a><br> 6.1.3 <a href="#EndpointPolicySubjectUDDI">Endpoint Policy Subject</a><br> 6.2 <a href="#ReferencingRemotePolicyExpressions">Referencing Remote Policy Expressions</a><br> 6.3 <a href="#RegisteringReusablePolicyExpressions">Registerng Reusable Policy Expressions</a><br> 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> 8.1 <a href="#N11735">External Policy Attachment Conformance</a><br> 8.2 <a href="#N1174C">WSDL 1.1 Attachment Conformance</a><br> 8.3 <a href="#N1175B">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> 2.1 <a href="#NotationalConventions">Notational Conventions</a><br> 2.2 <a href="#XMLNamespaces">XML Namespaces</a><br> 2.3 <a href="#Glossary">Terminology</a><br> 2.4 <a href="#Example">Example</a><br>3. <a href="#rPolicyAttachment">Policy Attachment</a><br> 3.1 <a href="#rEffectivePolicy">Effective Policy</a><br> 3.2 <a href="#PolicyAttachmentMechanisms">Policy Attachment Mechanisms</a><br> 3.3 <a href="#XMLElementAttachement">XML Element Attachment</a><br> 3.4 <a href="#ExternalPolicyAttachment">External Policy Attachment</a><br> 3.4.1 <a href="#uri-domain-expression">URI Domain Expression</a><br> &bsp; 3.5 <a href="#IRI_Policy_Attachment">Use of IRIs in Policy Attachment</a><br>4. <a href="#AttachingPolicyUsingWSDL1.1">Attaching Policies Using WSDL 1.1</a><br> 4.1 <a href="#CalculatingEffectivyPolicywithWSDL1.1">Calculating Effective Policy in WSDL 1.1</a><br> 4.1.1 <a href="#ServicePolicySubject">Service Policy Subject</a><br> 4.1.2 <a href="#EndpointPolicySubject">Endpoint Policy Subject</a><br> 4.1.3 <a href="#OperationPolicySubject">Operation Policy Subject</a><br> 4.1.4 <a href="#MessagePolicySubject">Message Policy Subject</a><br> 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> 5.1 <a href="#wsdl20-example">Example</a><br> nbsp; 5.2 <a href="#attaching-policy-expressions">Attaching Policy Expressions</a><br> 5.3 <a href="#extension-to-wsdl-component-model">Extension to WSDL Component Model</a><br> 5.4 <a href="#effective-policy">Effective Policy</a><br> 5.4.1 <a href="#service-policy-subject">Service Policy Subject</a><br> 5.4.2 <a href="#endpoint-policy-subject">Endpoint Policy Subject</a><br> 5.4.3 <a href="#operation-policy-subject">Operation Policy Subject</a><br> 5.4.4 <a href="#message-policy-subject-input">Message Policy Subject (input message)</a><br> 5.4.5 <a href="#message-policy-subject-output">Message Policy Subject (output message)</a><br> 5.4.6 <a href="#message-policy-subject-inut-fault">Message Policy Subject (input fault message)</a><br> 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> 6.1 <a href="#CalculatingEffectivePolicyElementPolicyUDDI">Calculating Effective Policy and Element Policy in UDDI</a><br> 6.1.1 <a href="#ServiceProviderPolicySubjectUDDI">Service Provider Policy Subject</a><br> 6.1.2 <a href="#ServicePolicySubjectUDDI">Service Policy Subject</a><br> 6.1.3 <a href="#EndpointPolicySubjectUDDI">Endpoint Policy Subject</a><br> 6.2 <a href="#ReferencingRemotePolicyExpressions">Referencing Remote Policy Expressions</a><br> 6.3 <a href="#RegisteringReusablePolicyExpressions">Registerng Reusable Policy Expressions</a><br> 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> 8.1 <a href="#N118E1">External Policy Attachment Conformance</a><br> 8.2 <a href="#N118F8">WSDL 1.1 Attachment Conformance</a><br> 8.3 <a href="#N11907">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> A.1 <a href="#Normative-References">Normative References</a><br> A.2 <a href="#Informative-References">Other References</a><br>B. <a href="#AppendixA">UDDI tModel Definitions</a><br> B.1 <a href="#RemotePolicyReferenceCategorySystem">Remote Policy Reference Category System</a><br> B.1.1 <a href="#DesigGoals1">Design Goals</a><br> B.1.2 <a href="#tModelDefinition1">tModel Definition</a><br> B.1.3 <a href="#ModelStructure1">tModel Structure</a><br> B.2 <a href="#WS-PolicyTypesCategorySystem">Web Services Policy Types Category System</a><br> B.2.1 <a href="#DesignGoals2">Design Goals</a><br> &bsp; B.2.2 <a href="#tModelDefinition2">tModel Definition</a><br> B.2.3 <a href="#ModelStructure2">tModel Structure</a><br> B.3 <a href="#LocalPolicyReferenceCategorySystem">Local Policy Reference Category System</a><br> B.3.1 <a href="#DesignGoals3">Design Goals</a><br> B.3.2 <a href="#tModelDefinition3">tModel Definition</a><br> 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">
@@ -174,7 +174,7 @@
<ul>
<li>
<p>An element extensibility point is referred to using {any} in place of the element name. This
-indicates that any element name can be used, from any namespace other than the http://www.w3.org/@@@@/@@/ws-policy
+indicates that any element name can be used, from any namespace other than the http://www.w3.org/ns/ws-policy
namespace. </p>
</li>
<li>
@@ -280,7 +280,7 @@
<code>(none), wsp</code>
</td>
<td rowspan="1" colspan="1">
-<code>http://www.w3.org/@@@@/@@/ws-policy</code>
+<code>http://www.w3.org/ns/ws-policy</code>
</td>
<td rowspan="1" colspan="1">This specification</td>
</tr>
@@ -315,9 +315,9 @@
</table><br>
<p>
All information items defined by this specification
- are identified by the XML namespace URI [<a href="#XML-NS">[XML Namespaces]</a>] http://www.w3.org/@@@@/@@/ws-policy. A <a href="http://www.w3.org/@@@@/@@/ws-policy">normative XML
+ are identified by the XML namespace URI [<a href="#XML-NS">[XML Namespaces]</a>] http://www.w3.org/ns/ws-policy. A <a href="http://www.w3.org/ns/ws-policy">normative XML
Schema</a> [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>, <a href="#XMLSchemaPart2">[XML Schema Datatypes]</a>] document can be obtained by
- dereferencing the XML namespace URI.</p>
+ dereferencing the <span class="diff-add">namespace document at the WS-Policy 1.5</span><span class="diff-del">XML </span>namespace URI.</p>
<p>
In this document reference is made to the <code class="attr">wsu:Id</code>
attribute in a utility schema (<a href="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd</a>). The
@@ -530,7 +530,7 @@
<p class="exampleHead" style="text-align: left"><a name="Table2"></a><i><span>Example 2-1. </span>Example RM Policy Expression.</i></p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:rmp="http://docs.oasis-open.org/ws-rx/wsrmp/200602"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="RmPolicy" >
(02) <rmp:RMAssertion>
@@ -545,7 +545,7 @@
<p class="exampleHead" style="text-align: left"><a name="Table3"></a><i><span>Example 2-2. </span>Example X509 Security Policy Expression.</i></p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="X509EndpointPolicy" >
(02) <sp:AsymmetricBinding>
@@ -619,13 +619,13 @@
at different points in a WSDL description that apply to one policy
subject, and other attachments may be made by UDDI and other
mechanisms.</p>
-<p>When multiple attachments are made, [<a title="effective policy" name="effective_policy">Definition</a>: the
-<b>effective policy</b>, for a given <a title="" href="#policy_subject">policy subject</a>, is the
+<p>When multiple attachments are made, <span class="diff-add">their relevent policies can be combined. </span>[<a title="effective policy" name="effective_policy">Definition</a>: <span class="diff-chg">The
+</span><b>effective policy</b>, for a given <a title="" href="#policy_subject">policy subject</a>, is the
combination of relevant policies. The relevant policies are those
attached to <a title="" href="#policy_scope">policy scopes</a> that
contain the <a title="" href="#policy_subject">policy subject</a>.]
</p>
-<p>This combination can be achieved by: [<a title="merge" name="merge">Definition</a>: a <b>merge</b>
+<p>This combination can be achieved <span class="diff-add">through a</span><span class="diff-del">by: </span><span class="diff-add">merge. </span>[<a title="merge" name="merge">Definition</a>: <span class="diff-chg">A </span><b>merge</b>
consists of serializing each policy as a
<a title="" href="#policy_expression">policy expression</a>, replacing their
<code class="elt">wsp:Policy</code> element with a
@@ -647,6 +647,10 @@
as part of their intrinsic definition. The second allows
policies to be associated with arbitrary policy subjects
independently from their definition.</p>
+ <div class="diff-add"><p class="diff-add"><span class="diff-add">The </span><a title="" href="#policy_scope"><span class="diff-add">policy scope</span></a> <span class="diff-add">of an attachment is specific to the </span><a title="" href="#policy_attachment"><span class="diff-add">policy attachment</span></a>
+ <span class="diff-add">Mechanism using it. Accordingly, any </span><a title="" href="#policy_attachment"><span class="diff-add">policy attachment</span></a> <span class="diff-add">mechanism </span><span class="rfc2119"><span class="diff-add">MUST</span></span> <span class="diff-add">define
+ the </span><a title="" href="#policy_scope"><span class="diff-add">policy scope</span></a> <span class="diff-add">of the attachment.</span></p></div>
+
</div>
<div class="div2">
@@ -669,7 +673,7 @@
</xs:simpleType>
</xs:attribute>
</xs:schema></pre></div>
-<p>The namespace URI [<a href="#XML-NS">[XML Namespaces]</a>] for this attribute is <code>http://www.w3.org/@@@@/@@/ws-policy</code>.</p>
+<p>The namespace URI [<a href="#XML-NS">[XML Namespaces]</a>] for this attribute is <code>http://www.w3.org/ns/ws-policy</code>.</p>
<p>The <code class="attr">wsp:PolicyURIs</code> attribute contains a white
space-separated list of one or more IRIs [<a href="#RFC3987">[IETF RFC 3987]</a>]. When this attribute is used,
each of the values identifies a <a title="" href="#policy_expression">policy expression</a> as defined by
@@ -682,11 +686,11 @@
<b>element policy</b> is the <a title="" href="#policy">policy</a> attached to the <a title="" href="#policy_subject">policy subjects</a> associated with
the element information item that contains it.]
</p>
-<p>Note that the <a title="" href="#policy_scope">policy scope</a> of the attachment is specific to the
-<a title="" href="#policy_attachment">policy attachment</a> Mechanism using it; accordingly, any <a title="" href="#policy_attachment">policy
-attachment</a> mechanism using this attribute <span class="rfc2119">MUST</span>
-define the <a title="" href="#policy_scope">policy scope</a> of the attachment.</p>
-<p>An example of <a title="element policy" href="#element_policy">element policy</a> through the use of this global
+<p><span class="diff-del">Note that the policy scope of the attachment is specific to the
+policy attachment Mechanism using it; accordingly, any policy
+attachment mechanism using this attribute MUST
+define the policy scope of the attachment.
+</span>An example of <a title="element policy" href="#element_policy">element policy</a> through the use of this global
attribute is given below using the sample policies stated in Section
<a href="#Example"><b>2.4 Example</b></a>.</p>
<p>If the <a title="" href="#policy">policies</a> referenced by the following XML element</p>
@@ -698,24 +702,28 @@
whose XML 1.0 representation is listed in <a href="#Table4">Example 3-1</a>:</p>
<div class="exampleOuter">
<p class="exampleHead" style="text-align: left"><a name="Table4"></a><i><span>Example 3-1. </span>Example Merged Policy Expression.</i></p>
-<div class="exampleInner"><pre>(01) <wsp:Policy
- xmlns:rmp="http://docs.oasis-open.org/ws-rx/wsrmp/200602"
- xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
-(02) <rmp:RMAssertion>
-(03) <rmp:InactivityTimeout Milliseconds="600000" />
-(04) <rmp:BaseRetransmissionInterval Milliseconds="3000" />
-(05) <rmp:ExponentialBackoff />
-(06) <rmp:AcknowledgementInterval Milliseconds="200" />
-(07) </rmp:RMAssertion>
-(08) <sp:AsymmetricBinding>
-(09) <wsp:Policy>
-(10) <!-- Details omitted for readability -->
-(11) <sp:IncludeTimestamp />
-(12) <sp:OnlySignEntireHeadersAndBody />
-(13) </wsp:Policy>
-(14) </sp:AsymmetricBinding>
-(15) </wsp:Policy></pre></div>
+<div class="exampleInner"><pre><span class="diff-chg">(01) <wsp:Policy
+ xmlns:rmp="http://docs.oasis-open.org/ws-rx/wsrmp/200602"
+ xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
+(02) <wsp:All>
+(03) <rmp:RMAssertion>
+(04) <rmp:InactivityTimeout Milliseconds="600000" />
+(05) <rmp:BaseRetransmissionInterval Milliseconds="3000" />
+(06) <rmp:ExponentialBackoff />
+(07) <rmp:AcknowledgementInterval Milliseconds="200" />
+(08) </rmp:RMAssertion>
+(09) </wsp:All>
+(10) <wsp:All>
+(11) <sp:AsymmetricBinding>
+(12) <wsp:Policy>
+(13) <!-- Details omitted for readability -->
+(14) <sp:IncludeTimestamp />
+(15) <sp:OnlySignEntireHeadersAndBody />
+(16) </wsp:Policy>
+(17) </sp:AsymmetricBinding>
+(18) </wsp:All>
+(19) </wsp:Policy></span></pre></div>
</div>
<p>Note that this <a title="element policy" href="#element_policy">element policy</a> has no meaningful IRI.</p>
<p>The presence of the <code class="attr">wsp:PolicyURIs</code> attribute does not
@@ -828,7 +836,7 @@
<code class="elt">/wsp:PolicyAttachment/wsse:Security</code>
</dt>
<dd>
- <p>This element is of type <code class="attr">xs:boolean</code> and allows security information such as
+ <p>This element is of type <code class="attr"><span class="diff-chg">wsse:Security</span></code> and 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>
@@ -907,11 +915,17 @@
IRI or IRI References (such as endpoint, message or operation definitions) with which
<a title="" href="#policy">policies</a> can be associated. For example, URI domain expressions can be used
to identify WSDL 1.1 definitions, WSDL 2.0 components, etc.
+ <span class="diff-add">When a URI
+ domain expression identifies multiple resources, i.e. WSDL 1.1 supports multiple
+ operations with the same name (sometimes called operation name overloading),
+ the Policy applies to all the resources that are identified.
+ </span></p>
+ <div class="diff-add"><p class="diff-add">
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 [<a href="#WSDL20">[WSDL 2.0 Core Language]</a>]. The following
example illustrates the use of URI domain expression
- with a WSDL 2.0 IRI Reference: </p>
+ with a WSDL 2.0 IRI Reference: </p></div>
<div class="exampleInner"><pre><wsp:PolicyAttachment>
<wsp:AppliesTo>
<wsp:URI>http://example.org/TicketAgent.wsdl20#wsdl.endpoint(TicketAgentService/Endpoint)</wsp:URI>
@@ -921,8 +935,17 @@
<p>In this example, the <a title="" href="#policy_expression">policy expression</a> at
<code>http://www.example.com/policies#RmPolicy</code> applies to all interactions with
the endpoint at <code>http://example.org/TicketAgent.wsdl20#wsdl.endpoint(TicketAgentService/Endpoint)</code>.
- Similarly, an XPointer [<a href="#XPointer">[XPointer Framework]</a>] can be used as an
- IRI Reference to identify a description in a WSDL 1.1 [<a href="#WSDL11">[WSDL 1.1]</a>] document.</p>
+ </p>
+ <div class="diff-add"><p class="diff-add">
+ <span class="diff-add">IRI</span><span class="diff-del">Similarly, </span><span class="diff-chg">References for </span><span class="diff-add">WSDL</span><span class="diff-del">[] </span><span class="diff-chg">1.1 elements are defined </span><span class="diff-add">in</span><span class="diff-del">an
+ IRI </span><span class="diff-chg">WSDL 1.1 Element </span><span class="diff-add">Identifiers
+ [</span><a href="#WSDL11EI">[WSDL11 ElementIds]</a><span class="diff-add">].
+ </span></p></div>
+ <div class="diff-add"><p class="diff-add">
+ <span class="diff-add">The</span><span class="diff-del">a </span><span class="diff-chg">scope of </span><span class="diff-add">URI domain</span><span class="diff-del">a </span><span class="diff-add">expressions for WSDL 2.0 components or </span>WSDL 1.1
+ <span class="diff-add">elements is</span><span class="diff-del">[] </span><span class="diff-add">limited to the subjects defined in
+ Section </span><a href="#ws-policy-attachment-for-wsdl20"><b>5. WS-Policy Attachment for WSDL 2.0</b></a> <span class="diff-add">and
+ </span><a href="#AttachingPolicyUsingWSDL1.1"><b>4. Attaching Policies Using WSDL 1.1</b></a><span class="diff-add">.</span><span class="diff-del">document.</span></p></div>
</div>
</div>
@@ -940,41 +963,80 @@
<div class="div1">
<h2><a name="AttachingPolicyUsingWSDL1.1"></a>4. Attaching Policies Using WSDL 1.1</h2>
-<p>The <span class="rfc2119">RECOMMENDED</span> means of associating a <a title="" href="#policy">policy</a>
-with a <a title="" href="#policy_subject">policy subject</a> that has a WSDL 1.1 [<a href="#WSDL11">[WSDL 1.1]</a>]
-description is to attach a reference to the <a title="" href="#policy">policy</a> within the WSDL
-component corresponding to the target <a title="" href="#policy_subject">policy subject</a>. </p>
-<p>WSDL 1.1 disallows the use of extensibility elements on certain
-elements and the use of extensibility attributes on others. However,
-the WS-I Basic Profile 1.1 [<a href="#BP11">[BP 1.1]</a>] overrules this
-restriction and allows element extensibility everywhere. Therefore,
-the <a title="" href="#policy">policy</a> reference <span class="rfc2119">SHOULD</span> be attached using
-<code class="elt">wsp:PolicyReference</code> as child element unless it is
-absolutely necessary to maintain the original WSDL 1.1 restriction, in
-which case the <code class="attr">@wsp:PolicyURIs</code> attribute MAY be used
-for the following WSDL elements:</p>
+ <div class="diff-add"><p class="diff-add">
+ <span class="diff-add">This section describes a mechanism for associating policy expressions with Web service constructs in WSDL 1.1 [</span><a href="#WSDL11">[WSDL 1.1]</a><span class="diff-add">].
+ The mechanism consists of:
+ </span></p></div>
+ <div class="diff-add"><ul>
+ <li>
+
+<p><span class="diff-add">A model for attaching policies to WSDL 1.1 constructs. </span>The <span class="diff-add">model defines:
+ </span><ul>
+ <li>
+ <p><span class="diff-add">A</span><span class="diff-del">RECOMMENDED </span><span class="diff-chg">partitioning </span>of <span class="diff-add">WSDL constructs into service, endpoint, operation
+ and</span><span class="diff-del">associating </span><span class="diff-add">message policy subjects.
+ </span></p>
+ </li>
+ <li><p>
+ <span class="diff-add">The semantics of attaching </span>a <a title="" href="#policy">policy</a>
+ <span class="diff-chg">to each </span><a title="" href="#policy_subject">policy subject</a>
+</p></li>
+ <li><p>
+ <span class="diff-add">How </span><span class="diff-chg">to combine policies attached to </span><span class="diff-add">more</span><span class="diff-del">[]
+description </span><span class="diff-chg">than one </span><span class="diff-add">WSDL construct
+ within</span><span class="diff-del">attach </span>a <span class="diff-chg">single policy </span><span class="diff-add">subject.
+ </span></p></li>
+ </ul></p>
+ </li>
+ <li><p>
+ <span class="diff-add">An</span><span class="diff-del">the </span><span class="diff-add">XML representation of </span>policy <span class="diff-chg">expressions </span><span class="diff-add">attached to</span><span class="diff-del">the </span>WSDL
+<span class="diff-del">component </span><span class="diff-chg">1.1 </span><span class="diff-add">constructs.
+ </span></p></li>
+ <li><p>
+ <span class="diff-add">The</span><span class="diff-del">to </span><span class="diff-chg">annotation of </span><span class="diff-add">such </span>policy <span class="diff-add">expressions as required extensions using the
+ WSDL-defined extensibility flag</span><span class="diff-del">subject. </span><code class="attr"><span class="diff-add">@wsdl:required</span></code> <span class="diff-add">.
+ </span></p></li>
+ </ul></div>
+
+<p>
+ WSDL 1.1 disallows the use of extensibility elements on certain elements and
+ the use of extensibility attributes on others. However, the WS-I Basic Profile 1.1
+ [<a href="#BP11">[BP 1.1]</a>] overrules this restriction and allows element extensibility everywhere.
+
+ Therefore, <span class="diff-add">when attaching a reference directly to
+</span>the <span class="diff-add">WSDL element</span><span class="diff-del">policy </span><span class="diff-add">the policy
+
+ </span>reference SHOULD be attached using <code class="elt">wsp:PolicyReference</code> as child element unless
+ it
+
+ is absolutely necessary to maintain the original WSDL 1.1 restriction, in
+<span class="diff-del">which </span><span class="diff-add">which
+
+ </span>case the <code class="attr">@wsp:PolicyURIs</code> attribute MAY be used for the following WSDL elements:
+
<ul>
-<li>
+ <li>
<p>
-<code class="elt">wsdl11:portType</code>
-</p>
+ <code class="elt">wsdl11:portType</code>
+ </p>
</li>
-<li>
-<p>
-<code class="elt">wsdl11:portType/wsdl11:operation/wsdl11:input</code>
-</p>
+ <li>
+ <p>
+ <code class="elt">wsdl11:portType/wsdl11:operation/wsdl11:input</code>
+ </p>
</li>
-<li>
-<p>
-<code class="elt">wsdl11:portType/wsdl11:operation/wsdl11:output</code>
-</p>
+ <li>
+ <p>
+ <code class="elt">wsdl11:portType/wsdl11:operation/wsdl11:output</code>
+ </p>
</li>
-<li>
-<p>
-<code class="elt">wsdl11:portType/wsdl11:operation/wsdl11:fault</code>
-</p>
+ <li>
+ <p>
+ <code class="elt">wsdl11:portType/wsdl11:operation/wsdl11:fault</code>
+ </p>
</li>
-</ul>
+ </ul>
+</p>
<p>If it is necessary to include the actual <a title="" href="#policy_expression">policy expressions</a> within
the WSDL description itself, it is <span class="rfc2119">RECOMMENDED</span> that
their <code class="elt">wsp:Policy</code> elements be included as children of
@@ -1235,7 +1297,7 @@
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:wsoap12="http://schemas.xmlsoap.org/wsdl/soap12/"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" >
(02) <wsp:Policy wsu:Id="RmPolicy" >
(03) <rmp:RMAssertion>
@@ -1294,7 +1356,7 @@
<p class="exampleHead" style="text-align: left"><a name="Table6"></a><i><span>Example 4-2. </span>Example Message Security Policy Expression.</i></p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="SecureMessagePolicy" >
(02) <sp:SignedParts>
@@ -1331,10 +1393,13 @@
</p>
</li>
<li>
-<p>An XML representation of policy expressions attached to WSDL 2.0 constructs
- and annotating those policy expressions as required extensions using the
+<p>An XML representation of policy expressions attached to WSDL 2.0 <span class="diff-add">constructs.</span></p>
+ </li>
+ <div class="diff-add"><li class="diff-add"><p>
+ <span class="diff-add">The</span><span class="diff-del">constructs
+ and </span><span class="diff-chg">annotation </span><span class="diff-add">of such</span><span class="diff-del">those </span>policy expressions as required extensions using the
WSDL-defined extensibility flag <code>@wsdl20:required</code>.</p>
-</li>
+</li></div>
</ul>
<p>
<a href="#XMLNamespaces"><b>2.2 XML Namespaces</b></a> lists all the XML Namespaces that are used in this section. (XML
@@ -1345,23 +1410,23 @@
<p>The example below illustrates the use of WS-Policy Attachment for WSDL 2.0:</p>
<div class="exampleOuter">
<p class="exampleHead" style="text-align: left"><a name="table-wsdl20-example"></a><i><span>Example 5-1. </span>Example Policy Attached to WSDL 2.0</i></p>
-<div class="exampleInner"><pre>(01) <wsdl20:description>
+<div class="exampleInner"><pre><span class="diff-chg">(01) <wsdl20:description>
(02) …
-(03) <Policy wsu:Id="common">
+(03) <wsp:Policy wsu:Id="common">
(04) <mtom:OptimizedMimeSerialization wsp:Optional="true"/>
(05) <wsap:UsingAddressing />
-(06) </Policy>
+(06) </wsp:Policy>
-(07) <Policy wsu:Id="secure">
-(08) <ExactlyOne>
+(07) <wsp:Policy wsu:Id="secure">
+(08) <wsp:ExactlyOne>
(09) <sp:TransportBinding>…</sp:TransportBinding>
(10) <sp:AsymmetricBinding>…</sp:AsymmetricBinding >
-(11) </ExactlyOne>
-(12) </Policy>
+(11) </wsp:ExactlyOne>
+(12) </wsp:Policy>
(13) <wsdl20:binding name="SecureBinding"
(14) interface="tns:RealTimeDataInterface" >
-(15) <PolicyReference URI="#secure" />
+(15) <wsp:PolicyReference URI="#secure" />
(16) <wsdl20:operation name="GetRealQuote" >…</wsdl20:operation>
(17) …
(18) </wsdl20:binding>
@@ -1370,12 +1435,12 @@
(20) interface="tns:RealTimeDataInterface" >
(21) <wsdl20:endpoint name="RealTimeDataPort"
(22) binding="tns:SecureBinding">
-(23) <PolicyReference URI="#common" />
+(23) <wsp:PolicyReference URI="#common" />
(24) …
(25) </wsdl20:endpoint>
(26) </wsdl20:service>
(27) …
-(28) </wsdl20:description></pre></div>
+(28) </wsdl20:description></span></pre></div>
</div>
<p>The <code>SecureBinding</code> WSDL binding description describes a binding for
an interface that provides real-time quotes and book information on securities.
@@ -1402,20 +1467,20 @@
<a title="effective policy" href="#effective_policy">effective policy</a> for the <code>RealTimeDataPort</code> endpoint.</p>
<div class="exampleOuter">
<p class="exampleHead" style="text-align: left"><a name="table-wsdl20-effective-policy-example"></a><i><span>Example 5-2. </span>Effective Policy for the RealTimeDataPort endpoint</i></p>
-<div class="exampleInner"><pre>(01) <Policy>
-(02) <All>
-(03) <Policy>
+<div class="exampleInner"><pre><span class="diff-chg">(01) <wsp:Policy>
+(02) <wsp:All>
+(03) <wsp:Policy>
(04) <mtom:OptimizedMimeSerialization wsp:Optional="true"/>
(05) <wsap:UsingAddressing />
-(06) </Policy>
-(07) <Policy>
-(08) <ExactlyOne>
+(06) </wsp:Policy>
+(07) <wsp:Policy>
+(08) <wsp:ExactlyOne>
(09) <sp:TransportBinding>…</sp:TransportBinding>
(10) <sp:AsymmetricBinding>…</sp:AsymmetricBinding >
-(11) </ExactlyOne>
-(12) </Policy>
-(13) </All>
-(14) </Policy></pre></div>
+(11) </wsp:ExactlyOne>
+(12) </wsp:Policy>
+(13) </wsp:All>
+(14) </wsp:Policy></span></pre></div>
</div>
</div>
<div class="div2">
@@ -1503,8 +1568,8 @@
</p>
</li>
</ul>
-<p>Any of these elements <span class="rfc2119">MAY</span> have one or more <code>Policy</code> or
- <code>PolicyReference</code> child elements.</p>
+<p>Any of these elements <span class="rfc2119">MAY</span> have one or more <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> child elements.</p>
<p>Policy attachment points in a WSDL document are associated with specific <a title="" href="#policy_subject">policy subjects</a>
as described in the table below. There are four <a title="" href="#policy_subject">policy subjects</a> in
WSDL: the service policy subject, the endpoint policy subject, the operation
@@ -1683,20 +1748,20 @@
<p>The common mechanism of associating a <a title="" href="#policy_expression">policy expression</a> with a <a title="" href="#policy_subject">policy subject</a> is
to attach a reference to the <a title="" href="#policy_expression">policy expression</a> to the <a title="" href="#policy_subject">policy subject</a>. As
described in the WS-Policy specification [<a href="#WS-Policy">[Web Services Policy Framework]</a>], a reference to a <a title="" href="#policy_expression">policy expression</a> is
- represented using the <code>PolicyReference</code> element. A policy attachment
- to a WSDL element is represented by attaching a <code>PolicyReference</code>
+ represented using the <code><span class="diff-chg">wsp:PolicyReference</span></code> element. A policy attachment
+ to a WSDL element is represented by attaching a <code><span class="diff-chg">wsp:PolicyReference</span></code>
element as a child element of the WSDL element.</p>
<p>
<a title="" href="#policy_expression">Policy expressions</a> can be included within a WSDL document or may reside external
to a WSDL document. If including <a title="" href="#policy_expression">policy expressions</a> with a WSDL document is the
- chosen approach, it is <span class="rfc2119">RECOMMENDED</span> that the <code>Policy</code> elements are
+ chosen approach, it is <span class="rfc2119">RECOMMENDED</span> that the <code><span class="diff-chg">wsp:Policy</span></code> elements are
included as children of the <code>wsdl20:description</code> element after the
<code>wsdl20:types</code> element and referenced using the
- <code>PolicyReference</code> elements.</p>
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements.</p>
<p>To mandate the processing of a <a title="" href="#policy_expression">policy expression</a> attached to a policy attachment
point in a WSDL document, the expression <span class="rfc2119">MUST</span> be marked as required using the
<code>@wsdl20:required</code> flag.</p>
-<p>If the <code>Policy</code> elements are included as children of the
+<p>If the <code><span class="diff-chg">wsp:Policy</span></code> elements are included as children of the
<code>wsdl20:description</code> element, these Policy elements <span class="rfc2119">MUST NOT</span> be
marked as required using the <code>@wsdl20:required</code>. (Note: these
<a title="" href="#policy_expression">policy expressions</a> may be included as children of the <code>wsdl20:description</code>
@@ -1761,43 +1826,43 @@
<tbody>
<tr>
<td rowspan="1" colspan="1">Service</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the <code>wsdl20:service</code>
element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Endpoint</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the <code>wsdl20:endpoint</code>
element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Binding</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the <code>wsdl20:binding</code>
element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Binding Operation</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:binding/wsdl20:operation</code> element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Binding Fault</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:binding/wsdl20:fault</code> element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Binding Message Reference</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:binding/wsdl20:operation/wsdl20:input</code> or
<code>wsdl20:binding/wsdl20:operation/wsdl20:output</code>
@@ -1805,8 +1870,8 @@
</tr>
<tr>
<td rowspan="1" colspan="1">Binding Fault Reference</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:binding/wsdl20:operation/wsdl20:infault</code>
or <code>wsdl20:binding/wsdl20:operation/wsdl20:outfault</code>
@@ -1814,30 +1879,30 @@
</tr>
<tr>
<td rowspan="1" colspan="1">Interface</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the <code>wsdl20:interface</code>
element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Interface Operation</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:interface/wsdl20:operation</code> element, if
any.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Interface Fault</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:interface/wsdl20:fault</code> element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Interface Message Reference</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:interface/wsdl20:operation/wsdl20:input</code>
or <code>wsdl20:interface/wsdl20:operation/wsdl20:output</code>
@@ -1845,8 +1910,8 @@
</tr>
<tr>
<td rowspan="1" colspan="1">Interface Fault Reference</td>
-<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <a title="" href="#policy">policy</a> corresponding to the <a title="merge" href="#merge">merge</a> of <code><span class="diff-chg">wsp:Policy</span></code> or
+ <code><span class="diff-chg">wsp:PolicyReference</span></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:interface/wsdl20:operation/wsdl20:infault</code>
or
@@ -2441,8 +2506,7 @@
<div class="div1">
<h2><a name="SecurityConsiderations"></a>7. Security Considerations</h2>
-<p>It is <span class="rfc2119">RECOMMENDED</span> that <a title="" href="#policy_attachment">policy attachments</a> be
-signed to prevent tampering. This also provides a mechanism for
+<p>It is <span class="rfc2119">RECOMMENDED</span> that <a title="" href="#policy_attachment">policy attachments</a> be <span class="diff-chg">integrity </span><span class="diff-add">protected </span>to <span class="diff-add">permit the detection of</span><span class="diff-del">prevent </span>tampering. <span class="diff-add">This can be done using a technology such as XML DSig [</span><span class="diff-add"><a href="#XML-Signature">[XML-Signature]</a></span><span class="diff-add">], SSL/TLS [</span><span class="diff-add"><a href="#RFC2246">[IETF RFC 2246]</a></span><span class="diff-add">], or WS-Security 2004 [</span><span class="diff-add"><a href="#WS-Security">[WS-Security 2004]</a></span><span class="diff-add">]. </span>This also provides a mechanism for
authenticating <a title="" href="#policy_attachment">policy attachments</a> by determining if the signer has the
right to "speak for" the scope of the <a title="" href="#policy_attachment">policy attachment</a>.</p>
<p>Policies <span class="rfc2119">SHOULD NOT</span> be accepted unless they are
@@ -2458,19 +2522,19 @@
<h2><a name="Conformance"></a>8. Conformance</h2>
<div class="div2">
-<h3><a name="N11735"></a>8.1 External Policy Attachment Conformance</h3>
-<p>An element information item whose namespace name is "http://www.w3.org/@@@@/@@/ws-policy" and whose local part is PolicyAttachment conforms to this specification if it is valid according to the XML Schema [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>] for that element as defined by this specification (<a href="http://www.w3.org/@@@@/@@/ws-policy.xsd">http://www.w3.org/@@@@/@@/ws-policy.xsd</a>) and additionally adheres to all the constraints contained in Section <a href="#ExternalPolicyAttachment"><b>3.4 External Policy Attachment</b></a> of this specification. Such a conformant element information item constitutes an external policy attachment. </p>
+<h3><a name="N118E1"></a>8.1 External Policy Attachment Conformance</h3>
+<p>An element information item whose namespace name is "http://www.w3.org/ns/ws-policy" and whose local part is PolicyAttachment conforms to this specification if it is valid according to the XML Schema [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>] for that element as defined by this specification (<a href="http://www.w3.org/ns/ws-policy.xsd">http://www.w3.org/ns/ws-policy.xsd</a>) and additionally adheres to all the constraints contained in Section <a href="#ExternalPolicyAttachment"><b>3.4 External Policy Attachment</b></a> of this specification. Such a conformant element information item constitutes an external policy attachment. </p>
</div>
<div class="div2">
-<h3><a name="N1174C"></a>8.2 WSDL 1.1 Attachment Conformance</h3>
+<h3><a name="N118F8"></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="N1175B"></a>8.3 WSDL 2.0 Attachment Conformance</h3>
+<h3><a name="N11907"></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>
@@ -2637,6 +2701,15 @@
<h3><a name="Informative-References"></a>A.2 Other References</h3>
<dl>
+
+ <dt class="label"><span class="diff-add"><a name="RFC2246"></a>IETF RFC 2246</span></dt><dd><div class="diff-add"><span class="diff-add">IETF
+ "RFC 2246: The TLS Protocol", T. Dierks, C. Allen, January
+ 1999.</span> (See http://www.ietf.org/rfc/rfc2246.txt.)</div></dd>
+ <dt class="label"><span class="diff-add"><a name="WSDL11EI"></a>WSDL11 ElementIds</span></dt><dd><div class="diff-add">
+ <cite><span class="diff-add">WSDL 1.1 Element Identifiers</span></cite>
+ <span class="diff-add">D. Orchard, Editor. World Wide Web Consortium, 15 November 2006.
+ TBD: URI
+ </span> (See http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/wsdl11elementidentifiers.html.)</div></dd>
<dt class="label"><a name="MTOM"></a>[MTOM] </dt><dd>
<cite>SOAP Message Transmission Optimization Mechanism</cite>, M. Gudgin, N.
Mendelsohn, M. Nottingham and H. Ruellan, Editors. World Wide Web Consortium, 25 January
@@ -3296,7 +3369,7 @@
</tr></div>
<div class="diff-add"><tr class="diff-add">
<div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20061218</td></div>
- <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">FH</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">FJH</td></div>
<div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the
<a href="http://www.w3.org/2006/12/13-ws-policy-irc#T17-45-16"><span class="diff-add">resolution</span></a> for issue
<a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4039"><span class="diff-add">4039</span></a> to close editors' action
@@ -3317,8 +3390,78 @@
<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">20070116</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">DBO</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/116"><span class="diff-add">116</span></a> and
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/124"><span class="diff-add">124</span></a>
+ Resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4211"><span class="diff-add">4211</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">20070117</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">FJH</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Applied the resolution for issues 4045 and 4127 using <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4045#c2"><span class="diff-add">first</span></a>
+ and <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4045#c3"><span class="diff-add">second</span></a> parts as outlined in working group
+ <a href="http://www.w3.org/2007/01/17-ws-policy-irc#T22-50-02"><span class="diff-add">resolution</span></a>. This closes editors actions
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/139"><span class="diff-add">139</span></a> and
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/111"><span class="diff-add">111</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">20070121</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">MH</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/129"><span class="diff-add">129</span></a>
+ Resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4207"><span class="diff-add">4207</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">20070122</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 resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4230"><span class="diff-add">4230</span></a>.
+ Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/135"><span class="diff-add">135</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">20070122</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">UY</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4209"><span class="diff-add">4209</span></a>.
+ Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/131"><span class="diff-add">131</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">20070122</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">UY</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Implemented the resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4226"><span class="diff-add">4226</span></a>.
+ Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/134"><span class="diff-add">134</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">20070123</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">Applied <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4045#c3"><span class="diff-add">missed
+ items </span></a>(re
+ issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4045"><span class="diff-add">4045</span></a>)
+ to section <a href="#uri-domain-expression"><b>3.4.1 URI Domain Expression</b></a> and <a href="#ws-policy-attachment-for-wsdl20"><b>5. WS-Policy Attachment for WSDL 2.0</b></a>.
+ </td></div>
+ </tr></div>
+ <div class="diff-add"><tr class="diff-add">
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070123</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">Applied a <a href="http://lists.w3.org/Archives/Public/public-ws-policy/2007Jan/0124.html"><span class="diff-add">missed
+ item </span></a>(re
+ issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4226"><span class="diff-add">4226</span></a>)
+ to section <a href="#ws-policy-attachment-for-wsdl20"><b>5. WS-Policy Attachment for WSDL 2.0</b></a>: added wsp prefix to <a href="#table-wsdl20-effective-policy-example">Example 5-2</a>
+ and all occurrences of <div class="diff-add"><code class="elt">Policy</code> </div> and <div class="diff-add"><code class="elt">PolicyReference</code> </div>.
+ </td></div>
+ </tr></div>
+ <div class="diff-add"><tr class="diff-add">
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070123</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">Fixed a typo in <a href="#Informative-References"><b>A.2 Other References</b></a>: "[IETF RFC 3023]IETF "RFC 2246:".
+ </td></div>
+ </tr></div>
</tbody>
</table><br>
</div>
Index: ws-policy-framework-diff20061117.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework-diff20061117.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ws-policy-framework-diff20061117.html 8 Jan 2007 22:55:34 -0000 1.1
+++ ws-policy-framework-diff20061117.html 24 Jan 2007 05:00:33 -0000 1.2
@@ -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> 1.1 <a href="#Example">Example</a><br>2. <a href="#Notation_Terminlogy">Notations and Terminology</a><br> 2.1 <a href="#Notational_Conventions">Notational Conventions</a><br> 2.2 <a href="#Extensibility">Extensibility</a><br> 2.3 <a href="#XML_Namespaces">XML Namespaces</a><br> 2.4 <a href="#Terminology">Terminology</a><br>3. <a href="#Policy_Model">Policy Model</a><br> 3.1 <a href="#rPolicy_Assertion">Policy Assertion</a><br> 3.2 <a href="#rPolicy_Alternative">Policy Alternative</a><br> 3.3 <a href="#rPolicy">Policy</a><br> 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> 4.1 <ahref="#Normal_Form_Policy_Expression">Normal Form Policy Expression</a><br> 4.2 <a href="#Policy_Identification">Policy Identification</a><br> 4.3 <a href="#Compact_Policy_Expression">Compact Policy Expression</a><br> 4.3.1 <a href="#Optional_Policy_Assertions">Optional Policy Assertions</a><br> 4.3.2 <a href="#Policy_Assertion_Nesting">Policy Assertion Nesting</a><br> 4.3.3 <a href="#Policy_Operators">Policy Operators</a><br> 4.3.4 <a href="#Policy_References">Policy References</a><br> 4.3.5 <a href="#Policy_Inclusion">Policy Inclusion</a><br> 4.4 <a href="#ignorable-policy-assertions">Ignorable Policy Assertions</a><br> 4.5 <a href="#Policy_Intersection">Policy Intersection</a><br>&nbp; 4.6 <a href="#IRI_Policy_Expressions">Use of IRIs in Policy Expressions</a><br>5. <a href="#Security_Considerations">Security Considerations</a><br> 5.1 <a href="#information-disclosure-threats">Information Disclosure Threats</a><br> 5.2 <a href="#spoofing-and-tampering-threats">Spoofing and Tampering Threats</a><br> 5.3 <a href="#downgrade-threats">Downgrade Threats</a><br> 5.4 <a href="#repudiation-threats">Repudiation Threats</a><br> 5.5 <a href="#denial-of-service-threats">Denial of Service Threats</a><br> 5.6 <a href="#general-xml-considerations">General XML Considerations</a><br>6. <a href="#Conformance">Conformance</a><br></p>
+<h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#tocRange">Introduction</a><br> 1.1 <a href="#Example">Example</a><br>2. <a href="#Notation_Terminlogy">Notations and Terminology</a><br> 2.1 <a href="#Notational_Conventions">Notational Conventions</a><br> 2.2 <a href="#Extensibility">Extensibility</a><br> 2.3 <a href="#XML_Namespaces">XML Namespaces</a><br> 2.4 <a href="#Terminology">Terminology</a><br>3. <a href="#Policy_Model">Policy Model</a><br> 3.1 <a href="#rPolicy_Assertion">Policy Assertion</a><br> 3.2 <a href="#rPolicy_Alternative">Policy Alternative</a><br> 3.3 <a href="#rPolicy">Policy</a><br> 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> 4.1 <ahref="#Normal_Form_Policy_Expression">Normal Form Policy Expression</a><br> 4.2 <a href="#Policy_Identification">Policy Identification</a><br> 4.3 <a href="#Compact_Policy_Expression">Compact Policy Expression</a><br> 4.3.1 <a href="#Optional_Policy_Assertions">Optional Policy Assertions</a><br> 4.3.2 <a href="#Policy_Assertion_Nesting">Policy Assertion Nesting</a><br> 4.3.3 <a href="#Policy_Operators">Policy Operators</a><br> 4.3.4 <a href="#Policy_References">Policy References</a><br> 4.3.5 <a href="#Policy_Inclusion">Policy Inclusion</a><br> 4.3.6 <a href="#normalization">Normalization</a><br> 4.4 <a href="#ignorable-policy-assertions">Ignorable Policy Assertins</a><br> 4.5 <a href="#Policy_Intersection">Policy Intersection</a><br> 4.6 <a href="#IRI_Policy_Expressions">Use of IRIs in Policy Expressions</a><br>5. <a href="#Security_Considerations">Security Considerations</a><br> 5.1 <a href="#information-disclosure-threats">Information Disclosure Threats</a><br> 5.2 <a href="#spoofing-and-tampering-threats">Spoofing and Tampering Threats</a><br> 5.3 <a href="#downgrade-threats">Downgrade Threats</a><br> 5.4 <a href="#repudiation-threats">Repudiation Threats</a><br> 5.5 <a href="#denial-of-service-threats">Denial of Service Threats</a><br> 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="#media-type">The application/wspolicy+xml Media Type</a><br> A.1 <a href="#ietf-reg">Registration</a><br>B. <a href="#References">References</a><br> B.1 <a href="#Normative-References">Normative References</a><br> 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">
@@ -106,32 +106,41 @@
entities in a Web services-based system.
</p>
- <p>A <a title="policy" href="#policy">policy</a> is a collection of policy alternatives,
- where a <a title="policy alternative" href="#policy_alternative">policy alternative </a> is a collection of policy assertions.
- A <a title="policy assertion" href="#policy_assertion">policy assertion</a> represents an individual requirement, capability, or other property of a behavior.
- A <a title="policy expression" href="#policy_expression">policy expression</a> is an XML Infoset representation of a policy,
- either in a normal form or in an equivalent compact form. Some policy assertions
+ <p>A <a title="policy" href="#policy">policy</a> is a collection of policy <span class="diff-add">alternatives.</span><span class="diff-del">alternatives,
+ where a </span><span class="diff-add">A
+ </span><a title="policy alternative" href="#policy_alternative">policy alternative </a> is a collection of policy assertions.
+ A <a title="policy assertion" href="#policy_assertion">policy assertion</a> represents <span class="diff-add">a</span><span class="diff-del">an individual </span>requirement, capability, or other property of a behavior.
+ A <a title="policy expression" href="#policy_expression">policy expression</a> is an XML Infoset representation of <span class="diff-chg">its </span>policy,
+ either in a normal form or in <span class="diff-chg">its </span>equivalent compact form. Some policy assertions
specify traditional requirements and capabilities that
- will ultimately manifest on the wire (e.g., authentication
+ will <span class="diff-del">ultimately </span>manifest <span class="diff-add">themselves in</span><span class="diff-del">on </span>the <span class="diff-chg">messages exchanged(e.g., </span>authentication
scheme, transport protocol selection). Other policy
- assertions have no wire manifestation yet are critical to
- proper service selection and usage (e.g., privacy policy,
+ assertions have no wire manifestation <span class="diff-add">in the messages exchanged, </span>yet are <span class="diff-chg">relevant </span>to
+ <span class="diff-del">proper </span>service selection and usage (e.g., privacy policy,
QoS characteristics). Web Services Policy 1.5 - Framework provides a single policy
language to allow both kinds of assertions to be expressed and evaluated
in a consistent manner.</p>
-<p>Web Services Policy 1.5 - Framework does not specify policy discovery or
- policy attachments. A <a title="policy expression" href="#policy_expression">policy attachment</a> is a mechanism for associating
- policy with one or more policy scopes, where a <a title="policy scope" href="#policy_scope">policy scope</a> is a collection of
- policy subjects to which a policy may apply. A <a title="policy subject" href="#policy_subject">policy subject</a> is an entity
+ <p>Web Services Policy 1.5 - Framework does not <span class="diff-add">cover discovery of policy,</span><span class="diff-del">specify </span>policy <span class="diff-add">scopes and</span><span class="diff-del">discovery </span><span class="diff-add">subjects,
+ </span>or
+ <span class="diff-del">policy </span><span class="diff-add">their respective attachment mechanisms.
+ </span><span class="diff-del">attachments. </span>A <a title="policy expression" href="#policy_expression">policy attachment</a> is a mechanism for associating
+ policy with one or more policy <span class="diff-add">scopes.</span><span class="diff-del">scopes, where </span><span class="diff-chg">A </span><a title="policy scope" href="#policy_scope">policy scope</a> is
+ a collection of policy subjects to which a policy <span class="diff-add">applies.
+ </span><span class="diff-del">may apply. </span>A <a title="policy subject" href="#policy_subject">policy subject</a> is an entity
(e.g., an endpoint, message, resource, interaction) with which a
- policy can be associated. Other specifications are
+ policy can be associated. <span class="diff-del">Other specifications are
free to define technology-specific mechanisms for
associating policy with various entities and
- resources. Web Services Policy 1.5 - Attachment [<a href="#WS-PolicyAttachment">[Web Services Policy Attachment]</a>]
- defines such mechanisms, especially for associating policy
- with arbitrary XML elements [<a href="#XML10">[XML 1.0]</a>], WSDL artifacts [<a href="#WSDL11">[WSDL 1.1]</a>, <a href="#WSDL20">[WSDL 2.0 Core Language]</a>], and UDDI
- elements [<a href="#UDDIAPI20">[UDDI API 2.0]</a>, <a href="#UDDIDataStructure20">[UDDI Data Structure 2.0]</a>, <a href="#UDDI30">[UDDI 3.0]</a>].</p>
+ resources. </span>Web Services Policy 1.5 - Attachment [<a href="#WS-PolicyAttachment">[Web Services Policy Attachment]</a>]
+ defines such <span class="diff-add">policy attachment </span>mechanisms, especially for associating policy
+ with arbitrary XML elements [<a href="#XML10">[XML 1.0]</a>], WSDL artifacts [<a href="#WSDL11">[WSDL 1.1]</a>,
+ <a href="#WSDL20">[WSDL 2.0 Core Language]</a>], and UDDI elements [<a href="#UDDIAPI20">[UDDI API 2.0]</a>,
+ <a href="#UDDIDataStructure20">[UDDI Data Structure 2.0]</a>, <a href="#UDDI30">[UDDI 3.0]</a>].
+ <span class="diff-add">Other specifications are free to define either extensions to the mechanisms
+ defined in Web Services Policy 1.5 - Attachment [</span><span class="diff-add"><a href="#WS-PolicyAttachment">[Web Services Policy Attachment]</a></span><span class="diff-add">], or additional
+ mechanisms not covered by Web Services Policy 1.5 - Attachment [</span><span class="diff-add"><a href="#WS-PolicyAttachment">[Web Services Policy Attachment]</a></span><span class="diff-add">],
+ for purposes of associating policy with policy scopes and subjects.</span></p>
<div class="div2">
@@ -146,7 +155,7 @@
(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:SignedParts/>
@@ -197,7 +206,7 @@
</ul>
</li>
<li>
- <p>The character "|" is used to indicate a choice
+ <p>The character "|" is used to indicate <span class="diff-add">an exclusive</span><span class="diff-del">a </span>choice
between alternatives.</p>
</li>
<li>
@@ -206,7 +215,7 @@
respect to cardinality or choice.</p>
</li>
<li>
- <p>This document relies on the XML Information Set [<a href="#XMLInfoset">[XML Information Set]</a>]. Information items properties are
+ <p>This document relies on the XML Information Set [<a href="#XMLInfoset">[XML Information Set]</a>]. Information <span class="diff-chg">item </span>properties are
indicated by the style <em>infoset property</em>.</p>
</li>
<li>
@@ -226,7 +235,8 @@
<ul>
<li>
<p>An element extensibility point is referred to using {any} in place of the element name. This
-indicates that any element name can be used, from any namespace. </p>
+ indicates that any element name can be used, from any <span class="diff-add">namespace,
+ unless specified otherwise such as in Section </span><span class="diff-add"><a href="#Policy_Operators"><b>4.3.3 Policy Operators</b></a></span><span class="diff-add">.</span><span class="diff-del">namespace. </span></p>
</li>
<li>
<p>An attribute extensibility point is referred to using @{any} in place of the attribute name. This
@@ -245,15 +255,17 @@
<div class="div2">
<h3><a name="Extensibility"></a>2.2 Extensibility</h3>
- <p>Within normative outlines, ellipses (i.e., "…")
+ <p>Within normative outlines, <span class="diff-add">in this specification, </span>ellipses (i.e., "…")
indicate a point of extensibility that allows other Element or Attribute
Information Items. Information Items <span class="rfc2119">MAY</span> be added at the
indicated extension points but <span class="rfc2119">MUST NOT</span> contradict the semantics
of the element information item indicated by the <em>parent</em>
- or <em>owner</em> property of the extension. If an
- Attribute Information Item is not recognized, it <span class="rfc2119">SHOULD</span>
- be ignored; if an Element Information Item is not recognized, it
- <span class="rfc2119">MUST</span> be treated as an assertion.</p>
+ or <em>owner</em> property of the extension. <span class="diff-chg">In </span><span class="diff-add">this context,</span><span class="diff-del">an
+ </span><span class="diff-add">if an </span>Attribute Information Item is not recognized, it <span class="rfc2119">SHOULD</span>
+ be <span class="diff-chg">ignored. If </span>an Element Information Item is not recognized, it
+ <span class="rfc2119">MUST</span> be treated as <span class="diff-chg">a </span><span class="diff-add">policy assertion,
+ unless specified otherwise
+ such as in Section </span><span class="diff-add"><a href="#Policy_References"><b>4.3.4 Policy References</b></a></span><span class="diff-add">.</span><span class="diff-del">assertion.</span></p>
</div>
<div class="div2">
@@ -280,7 +292,7 @@
</tr>
<tr>
<td rowspan="1" colspan="1"><code>wsp</code></td>
-<td rowspan="1" colspan="1"><code>http://www.w3.org/@@@@/@@/ws-policy</code></td>
+<td rowspan="1" colspan="1"><code>http://www.w3.org/ns/ws-policy</code></td>
<td rowspan="1" colspan="1">This specification</td>
</tr>
<tr>
@@ -296,8 +308,8 @@
</tbody>
</table><br>
<p>All information items defined by this specification
- are identified by the XML namespace URI [<a href="#XML-NS">[XML Namespaces]</a>] <code>http://www.w3.org/@@@@/@@/ws-policy</code>. A <a href="http://www.w3.org/@@@@/@@/ws-policy">normative XML Schema</a> [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>, <a href="#XMLSchemaPart2">[XML Schema Datatypes]</a>] document can be obtained by
- dereferencing the XML namespace URI.</p>
+ are identified by the XML namespace URI [<a href="#XML-NS">[XML Namespaces]</a>] <code>http://www.w3.org/ns/ws-policy</code>. A <a href="http://www.w3.org/ns/ws-policy">normative XML Schema</a> [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>, <a href="#XMLSchemaPart2">[XML Schema Datatypes]</a>] document can be obtained by
+ dereferencing the <span class="diff-add">namespace document at the WS-Policy</span><span class="diff-del">XML </span><span class="diff-add">1.5 </span>namespace URI.</p>
<p>It is the intent of the W3C Web Services Policy Working Group that
the Web Services Policy 1.5 - Framework and Web Services Policy 1.5 - Attachment XML namespace URI will not change
@@ -485,10 +497,9 @@
<h3><a name="rPolicy_Assertion"></a>3.1 Policy Assertion</h3>
-
<p>[<a title="policy assertion" name="policy_assertion">Definition</a>: A <b>policy assertion</b>
- represents an individual requirement, capability, or other property of a behavior.] A <a title="policy assertion" href="#policy_assertion">policy
- assertion</a> identifies a behavior that is a
+ represents <span class="diff-add">a</span><span class="diff-del">an individual </span>requirement, <span class="diff-add">a </span>capability, or other property of a behavior.]
+ A <a title="policy assertion" href="#policy_assertion">policy assertion</a> identifies a behavior that is a
requirement or capability of a <a title="policy subject" href="#policy_subject">policy subject</a>.
[<a title="policy subject" name="policy_subject">Definition</a>: A <b>policy subject</b> is an entity
(e.g., an endpoint, message, resource, operation) with which a
@@ -526,7 +537,9 @@
binding assertion. </p>
<p>The XML Infoset of a <a title="policy assertion" href="#policy_assertion">policy assertion</a> <span class="rfc2119">MAY</span> contain a non-empty <em>attributes</em> property and/or a non-empty <em>children</em>
- property. Such properties are <a title="policy assertion parameter" href="#policy_assertion_parameter">policy assertion parameters</a>
+ <span class="diff-del">property. </span><span class="diff-add">property.
+ </span>Such <span class="diff-add">properties, excluding the Attribute and Element Information Items from the WS-Policy language
+ XML</span><span class="diff-del">properties </span><span class="diff-add">namespace name </span>are <a title="policy assertion parameter" href="#policy_assertion_parameter">policy assertion parameters</a>
and <span class="rfc2119">MAY</span> be used to
parameterize the behavior indicated by the assertion.
[<a title="policy assertion parameter" name="policy_assertion_parameter">Definition</a>: A <b>policy assertion parameter</b>
@@ -579,6 +592,8 @@
Post-Schema-Validation Infoset (PSVI) (See XML Schema Part 1 [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>]) content, if any) are
specific to the assertion type and are outside the scope
of this document.</p>
+ <div class="diff-add"><p class="diff-add"><span class="diff-add">Note: Depending on the semantics of the domain specific policy assertions a combination of the
+ policy assertions can be required to specify a particular behavior. </span></p></div>
</div>
<div class="div2">
@@ -661,22 +676,36 @@
<p>This section describes how to convey <a title="policy" href="#policy">policy</a> in an interoperable form,
using the XML Infoset representation of a policy. [<a title="policy expression" name="policy_expression">Definition</a>: A <b>policy expression</b>
is an XML Infoset representation of a <a title="policy" href="#policy">policy</a>,
- either in a normal form or in an equivalent compact form.] Other subsections below describe
- several important aspects related to policy expression, namely
- (i) Normal form of a policy expression (ii) Compact form of a policy expression
- (iii) Identification of policy expressions and (iv) Policy intersection.
+ either in a normal form or in an equivalent compact form.]
</p>
- <p> The normal form of a policy expression is the most straightforward
- Infoset representation; equivalent, alternative Infosets allow compactly
- expressing a policy through a number of constructs.</p>
+
+ <div class="diff-add"><p class="diff-add"><span class="diff-add">The </span><span class="diff-del">Other subsections below describe
+ several important aspects related to policy expression, namely
+ (i) </span><span class="diff-chg">normal </span>form <span class="diff-add">(see</span><span class="diff-del">of a policy expression (ii) </span><span class="diff-chg">Section </span><a href="#Normal_Form_Policy_Expression"><b>4.1 Normal Form Policy Expression</b></a><span class="diff-add">)</span><span class="diff-del">form </span>of a policy expression
+ <span class="diff-del">(iii) Identification of policy </span><span class="diff-add">is</span><span class="diff-del">expressions and (iv) </span><span class="diff-chg">the </span><span class="diff-add">most
+ straightforward</span><span class="diff-del">intersection.
- <p>This specification does not define processing for arbitrary <code class="elt">wsp:Policy</code>
- Element Information Items in any context other than as an Element Information Item
- in the <em>children</em> property of an Element
- Information Item that is in the <em>children</em>
- property of an element Information Item defined in section 4.1 below.
- </p>
-
+ </span><span class="diff-chg">XML Infoset representation </span>of <span class="diff-chg">the </span>policy <span class="diff-add">data</span><span class="diff-del">expression is the </span><span class="diff-add">model.
+ Equivalent,</span><span class="diff-del">most </span><span class="diff-add">alternative</span><span class="diff-del">straightforward
+ Infoset </span><span class="diff-chg">representations allow policy authors to </span>compactly
+ <span class="diff-chg">express </span>a policy <span class="diff-add">(see</span><span class="diff-del">through a </span><span class="diff-chg">Section </span><a href="#Compact_Policy_Expression"><b>4.3 Compact Policy Expression</b></a><span class="diff-add">).
+ Policy</span><span class="diff-del">of </span><span class="diff-add">authors</span><span class="diff-del">constructs.
+
+ This </span><span class="diff-chg">might be </span><span class="diff-add">more
+ interested</span><span class="diff-del">not </span><span class="diff-chg">in the compact form </span><span class="diff-add">(see</span><span class="diff-del">wsp:Policy
+ Element </span><span class="diff-add">Section
+ </span><a href="#Compact_Policy_Expression"><b>4.3 Compact Policy Expression</b></a><span class="diff-add">),</span><span class="diff-del">Information </span><span class="diff-chg">where the outlines </span><span class="diff-add">and
+ definitions</span><span class="diff-del">context </span><span class="diff-chg">describe what is valid with regards </span><span class="diff-add">to</span><span class="diff-del">Item
+ in </span>the <span class="diff-add">policy</span><span class="diff-del">children </span><span class="diff-chg">language </span><span class="diff-add">XML
+ Schema.</span></p></div>
+
+ <div class="diff-add"><p class="diff-add"><span class="diff-add">While</span><span class="diff-del">of </span><span class="diff-chg">the </span><span class="diff-add">policy</span><span class="diff-del">Element
+ Information </span><span class="diff-chg">language </span><span class="diff-add">XML Schema</span><span class="diff-del">that </span>is <span class="diff-add">a representation of</span><span class="diff-del">in </span>the <span class="diff-add">compact
+ form,</span><span class="diff-del">children
+ property </span><span class="diff-chg">the normal form is more restrictive as outlined in </span><span class="diff-add">Section
+ </span><a href="#Normal_Form_Policy_Expression"><b>4.1 Normal Form Policy Expression</b></a><span class="diff-add">.</span><span class="diff-del">below.
+ </span></p></div>
+
<div class="div2">
<h3><a name="Normal_Form_Policy_Expression"></a>4.1 Normal Form Policy Expression</h3>
@@ -742,7 +771,7 @@
<p>For example, the following is the normal form of a policy expression.</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:SignedParts/>
@@ -810,13 +839,13 @@
<div class="exampleInner"><pre>(01) <wsp:Policy
Name="http://www.example.com/policies/P1"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <!-- Details omitted for readability -->
(03) </wsp:Policy></pre></div>
<p>The following example illustrates how to associate a policy expression with the IRI-reference <code>"#P1"</code>:</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
wsu:Id="P1"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" >
(02) <!-- Details omitted for readability -->
(03) </wsp:Policy></pre></div>
@@ -829,46 +858,55 @@
XML Infoset, this specification defines three constructs: an attribute
to decorate an <a title="policy assertion" href="#policy_assertion">assertion</a>,
semantics for recursively nested policy operators, and a policy
-reference/inclusion mechanism. Each is described in the subsections
-below.</p>
+ reference/inclusion mechanism. Each <span class="diff-chg">sub section </span><span class="diff-add">below
+ describes</span><span class="diff-del">in </span><span class="diff-chg">a </span><span class="diff-add">construct and its equivalent normal form.
+ </span><span class="diff-del">subsections
+below.
-<p>To interpret a compact <a title="policy expression" href="#policy_expression">expression</a> in an interoperable form,
-a compact expression may be converted to the corresponding normal form
-expression by the following procedure:</p>
+</span>To interpret a compact expression in an interoperable form,
+<span class="diff-del">a compact expression may be converted to the corresponding normal form
+expression by the following procedure:
-<ol>
-<li><p>Start with the <em>document
-element</em> property D of the Document Information Item of the
-policy expression. The <em>namespace
-name</em> of D is always <code>"http://www.w3.org/@@@@/@@/ws-policy"</code>. In the base case,
-the <em>local name</em> property of D is
-<code>"Policy"</code>; in the recursive case, the <em>local name</em> property of D is
-<code>"Policy"</code>, <code>"ExactlyOne"</code>, or
-<code>"All"</code>.</p></li>
-<li><p>Expand Element Information Items in the <em>children</em> property of D that are policy
-references per Section <a href="#Policy_Inclusion"><b>4.3.5 Policy Inclusion</b></a>.</p></li>
-<li><p>Convert each Element Information Item C in the <em>children</em> property of D into normal
-form.</p>
-<ol>
-<li><p>If the <em>namespace name</em>
-property of C is <code>"http://www.w3.org/@@@@/@@/ws-policy"</code> and the <em>local
-name</em> property of C is <code>"Policy"</code>,
-<code>"ExactlyOne"</code>, or <code>"All"</code>, C is an expression
+
+Start with the document
+element property D of the Document Information Item of </span><span class="diff-chg">a
+ </span>policy <span class="diff-add">expression</span><span class="diff-del">expression. The namespace
+name of D is always "http://www.w3.org/ns/ws-policy". In the base case,
+the local name property of D is
+"Policy"; in the recursive case, the local name property of D is
+"Policy", "ExactlyOne", or
+"All".
+Expand Element Information Items </span>in the <span class="diff-add">compact</span><span class="diff-del">children property of D </span><span class="diff-chg">form can </span><span class="diff-add">be</span><span class="diff-del">policy
+references </span><span class="diff-add">converted
+ (see</span><span class="diff-del">per </span>Section <span class="diff-add"><a href="#normalization"><b>4.3.6 Normalization</b></a></span><span class="diff-add">)</span><span class="diff-del">.
+Convert each Element Information Item C in the children property of D into normal
+form.
+
+If the namespace name
+property of C is "http://www.w3.org/ns/ws-policy" and the local
+name property of C is "Policy",
+"ExactlyOne", or "All", C is an expression
of a policy operator; normalize C by recursively applying this
-procedure.</p></li>
-<li><p>Otherwise the Element Information Item C is an assertion;
-normalize C per Sections <a href="#Optional_Policy_Assertions"><b>4.3.1 Optional Policy Assertions</b></a>
-and <a href="#Policy_Assertion_Nesting"><b>4.3.2 Policy Assertion Nesting</b></a>.</p></li>
-</ol>
-</li>
-<li><p>Apply the policy operator indicated by D to the normalized
-Element Information Items in its <em>children</em> property and construct a
-normal form per Section <a href="#Policy_Operators"><b>4.3.3 Policy Operators</b></a>.</p></li>
-</ol>
-<p>Note that an implementation may use a more efficient procedure and
-is not required to explicitly convert a compact expression into the
-normal form as long as the processing results are indistinguishable
-from doing so.</p>
+procedure.
+Otherwise the Element Information Item C is an assertion;
+normalize C per Sections
+and .
+
+
+Apply the policy operator indicated by D </span>to the <span class="diff-del">normalized
+Element Information Items in its children property and construct a
+</span>normal form <span class="diff-chg">(see </span>Section <span class="diff-chg"><a href="#Normal_Form_Policy_Expression"><b>4.1 Normal Form Policy Expression</b></a></span><span class="diff-chg">).</span></p>
+
+<p><span class="diff-add">A</span><span class="diff-del">Note that an </span><span class="diff-add"><a title="policy expression" href="#policy_expression"><span class="diff-add">policy</span><span class="diff-del">implementation </span><span class="diff-add">expression</span></a></span>
+ <span class="diff-add">consists</span><span class="diff-del">may </span><span class="diff-chg">of </span>a <span class="diff-add"><code class="elt">wsp:Policy</code> </span><span class="diff-del">more </span><span class="diff-chg">wrapper element </span>and
+ <span class="diff-add">zero
+</span><span class="diff-del">is not required to explicitly convert a compact expression into the
+normal form as long as the </span><span class="diff-chg">or more child </span><span class="diff-add">and</span><span class="diff-del">indistinguishable
+from </span><span class="diff-chg">descendent elements.</span></p>
+
+
+
+
<div class="div3">
<h4><a name="Optional_Policy_Assertions"></a>4.3.1 Optional Policy Assertions</h4>
@@ -902,13 +940,13 @@
<p>For example, the following compact policy expression:</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <sp:IncludeTimestamp wsp:Optional="true" />
(03) </wsp:Policy></pre></div>
<p>is equivalent to the following normal form policy expression:</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:IncludeTimestamp />
@@ -945,7 +983,7 @@
Item in the <em>children</em> property,
the assertion has no nested policy expression.
</p>
-<p>Note: if the schema outline for an assertion type requires a nested
+<p><span class="diff-add">If</span><span class="diff-del">Note: if </span>the schema outline for an assertion type requires a nested
policy expression but the assertion does not further qualify one or
more aspects of the behavior indicated by the assertion type (i.e., no
assertions are needed in the nested policy expression), the assertion
@@ -953,15 +991,24 @@
<code><wsp:Policy/></code> Element Information Item in its <em>children</em> property; as explained in
Section <a href="#Policy_Operators"><b>4.3.3 Policy Operators</b></a>, this is equivalent to a
nested policy expression with a single alternative that has zero
-assertions. The reason for requiring at least an empty <code><wsp:Policy/></code>
+assertions. <span class="diff-del">The reason for requiring at least an empty <wsp:Policy/>
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.5 Policy Intersection</b></a>).</p>
+(see Section ).</span></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
-<code><Lorem><Ipsum><wsp:Policy> …
-</wsp:Policy></Ipsum></Lorem></code>.</p>
+of an assertion parameter, e.g., in the <em>children</em> property of one of the <em>children</em> as <span class="diff-add">in:</span><span class="diff-del">in
+<Lorem><Ipsum><wsp:Policy> …
+</span><span class="diff-add"><div class="exampleInner"><pre class="diff-add">
+(01)<wsp:Policy>
+(02) <Lorem>
+(03) <Ipsum>
+(04) <wsp:Policy>
+(05) …
+(06) </wsp:Policy>
+(07) </Ipsum>
+(08) </Lorem>
+(09)</wsp:Policy></pre></div></span><span class="diff-del"></wsp:Policy></Ipsum></Lorem></span>.</p>
</dd>
</dl>
@@ -983,7 +1030,7 @@
nested policy expressions in a compact form:</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <sp:TransportBinding>
(03) <wsp:Policy>
(04) <sp:AlgorithmSuite>
@@ -1015,7 +1062,7 @@
<p>The <span class="diff-del">normalized form of the </span>example above is equivalent to the following:</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:TransportBinding>
@@ -1065,22 +1112,140 @@
<h4><a name="Policy_Operators"></a>4.3.3 Policy Operators</h4>
<p><a title="policy" href="#policy">Policies</a> are used to convey a set of capabilities, requirements, and general characteristics of entities (see <a href="#tocRange"><b>1. Introduction</b></a>).
These are generally expressible as a set of <a title="policy alternative" href="#policy_alternative">policy alternatives</a>.
- Policy operators (<code class="elt">wsp:Policy</code> , <code class="elt">wsp:All</code> and <code class="elt">wsp:ExactlyOne</code> )
- are used to group <a title="policy assertion" href="#policy_assertion">policy assertions</a>
+ Policy operators (<code class="elt">wsp:Policy</code> , <code class="elt">wsp:All</code> and <code class="elt">wsp:ExactlyOne</code> <span class="diff-add">elements)</span><span class="diff-del">)
+ </span>are used to group <a title="policy assertion" href="#policy_assertion">policy assertions</a>
into <a title="policy alternative" href="#policy_alternative">policy alternatives</a>.
- In some instances, complex policies expressed in normal form can get relatively large and hard to manage.
-To compactly express complex policies, policy operators
+ <span class="diff-del">In some instances, complex policies expressed in normal form can get relatively large and hard to manage.
+</span>To compactly express complex policies, policy operators
<span class="rfc2119">MAY</span> be recursively nested; that is, one or more
instances of <code class="elt">wsp:Policy</code> , <code class="elt">wsp:All</code> , and/or
<code class="elt">wsp:ExactlyOne</code> <span class="rfc2119">MAY</span> be nested within
<code class="elt">wsp:Policy</code> , <code class="elt">wsp:All</code> , and/or
<code class="elt">wsp:ExactlyOne</code> .</p>
+
+<div class="diff-add"><p class="diff-add"><span class="diff-add">The schema outline for the </span><span class="diff-add"><code class="elt">wsp:Policy</code> </span> <span class="diff-add">element in the compact form is as follows:</span></p></div>
+ <div class="diff-add"><div class="exampleInner"><pre class="diff-add"><wsp:Policy … >
+ ( <wsp:Policy …>…</wsp:Policy> |
+ <wsp:ExactlyOne>…</wsp:ExactlyOne> |
+ <wsp:All>…</wsp:All> |
+ <wsp:PolicyReference … >…</wsp:PolicyReference> |
+ …
+ )*
+</wsp:Policy></pre></div></div>
+ <div class="diff-add"><p class="diff-add"><span class="diff-add">The following describes the Attribute and Element Information Items defined in the schema outline above:</span></p></div>
+ <div class="diff-add"><dl>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:Policy</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is the </span><span class="diff-add"><code class="elt">wsp:Policy</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:Policy/wsp:Policy</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is a nested </span><span class="diff-add"><code class="elt">wsp:Policy</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:Policy/wsp:ExactlyOne</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is a nested </span><span class="diff-add"><code class="elt">wsp:ExactlyOne</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:Policy/wsp:All</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is a nested </span><span class="diff-add"><code class="elt">wsp:All</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:Policy/wsp:PolicyReference</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element references a policy expression to be included per Section
+ </span><a href="#Policy_Inclusion"><b>4.3.5 Policy Inclusion</b></a><span class="diff-add">.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:Policy/@{any}</code> </div></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>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:Policy/{any}</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">Additional elements </span><span class="rfc2119"><span class="diff-add">MAY</span></span> <span class="diff-add">be specified. Such elements
+ </span><span class="rfc2119"><span class="diff-add">MUST NOT</span></span> <span class="diff-add">use the Web Services Policy language
+ XML namespace name and </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">parent element</span></em><span class="diff-add">.</span></p></div></dd>
+ </dl></div>
+
+ <div class="diff-add"><p class="diff-add"><span class="diff-add">The schema outline for the </span><span class="diff-add"><code class="elt">wsp:ExactlyOne</code> </span> <span class="diff-add">element in the compact form is as follows:</span></p></div>
+ <div class="diff-add"><div class="exampleInner"><pre class="diff-add"><wsp:ExactlyOne>
+ ( <wsp:Policy … >…</wsp:Policy> |
+ <wsp:ExactlyOne>…</wsp:ExactlyOne> |
+ <wsp:All>…</wsp:All> |
+ <wsp:PolicyReference … >…</wsp:PolicyReference> |
+ …
+ )*
+</wsp:ExactlyOne></pre></div></div>
+ <div class="diff-add"><p class="diff-add"><span class="diff-add">The following describes the Attribute and Element Information Items defined in the schema outline above:</span></p></div>
+
+ <div class="diff-add"><dl>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:ExactlyOne</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is the </span><span class="diff-add"><code class="elt">wsp:ExactlyOne</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:ExactlyOne/wsp:Policy</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is a nested </span><span class="diff-add"><code class="elt">wsp:Policy</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:ExactlyOne/wsp:ExactlyOne</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is a nested </span><span class="diff-add"><code class="elt">wsp:ExactlyOne</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:ExactlyOne/wsp:All</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is a nested </span><span class="diff-add"><code class="elt">wsp:All operator</code> </span><span class="diff-add">.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:ExactlyOne/wsp:PolicyReference</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element references a policy expression to be included per Section
+ </span><a href="#Policy_Inclusion"><b>4.3.5 Policy Inclusion</b></a><span class="diff-add">.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:ExactlyOne/{any}</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">Additional elements </span><span class="rfc2119"><span class="diff-add">MAY</span></span> <span class="diff-add">be specified. Such elements
+ </span><span class="rfc2119"><span class="diff-add">MUST NOT</span></span> <span class="diff-add">use the Web Services Policy language
+ XML namespace name and </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">parent element</span></em><span class="diff-add">.</span></p></div></dd>
+ </dl></div>
+ <div class="diff-add"><p class="diff-add"><span class="diff-add">The schema outline for the </span><span class="diff-add"><code class="elt">wsp:All</code> </span> <span class="diff-add">element in the compact form is as follows:</span></p></div>
+
+ <div class="diff-add"><div class="exampleInner"><pre class="diff-add"><wsp:All>
+ ( <wsp:Policy … >…</wsp:Policy> |
+ <wsp:ExactlyOne>…</wsp:ExactlyOne> |
+ <wsp:All>…</wsp:All> |
+ <wsp:PolicyReference … >…</wsp:PolicyReference> |
+ …
+ )*
+</wsp:All></pre></div></div>
+
+<div class="diff-add"><p class="diff-add"><span class="diff-add">The following describes the Attribute and Element Information Items defined in the schema outline above:</span></p></div>
+ <div class="diff-add"><dl>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:All</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is the </span><span class="diff-add"><code class="elt">wsp:All</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:All/wsp:Policy</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is a nested </span><span class="diff-add"><code class="elt">wsp:Policy</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:All/wsp:ExactlyOne</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is a nested </span><span class="diff-add"><code class="elt">wsp:ExactlyOne</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:All/wsp:All</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element is a nested </span><span class="diff-add"><code class="elt">wsp:All</code> </span> <span class="diff-add">operator.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:All/wsp:PolicyReference</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">This element references a policy expression to be included per Section
+ </span><a href="#Policy_Inclusion"><b>4.3.5 Policy Inclusion</b></a><span class="diff-add">.</span></p></div></dd>
+ <dt class="label"><span class="diff-add"><div class="diff-add"><code class="elt">/wsp:All/{any}</code> </div></span></dt>
+ <dd><div class="diff-add"><p><span class="diff-add">Additional elements </span><span class="rfc2119"><span class="diff-add">MAY</span></span> <span class="diff-add">be specified. Such elements
+ </span><span class="rfc2119"><span class="diff-add">MUST NOT</span></span> <span class="diff-add">use the Web Services Policy language
+ XML namespace name and </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">parent element</span></em><span class="diff-add">.</span></p></div></dd>
+ </dl></div>
+
+ <div class="diff-add"><div class="note"><p class="prefix"><b>Note:</b></p><p><span class="diff-add">The </span><span class="diff-add"><code class="elt">wsp:Policy element</code> </span> <span class="diff-add">allows attribute extensibility to
+ accommodate the use of attributes specified in Section </span><a href="#Policy_Identification"><b>4.2 Policy Identification</b></a><span class="diff-add">.
+ Otherwise, policy operators (</span><span class="diff-add"><code class="elt">wsp:Policy</code> </span> <span class="diff-add">, </span><span class="diff-add"><code class="elt">wsp:All</code> </span> <span class="diff-add">and
+ </span><span class="diff-add"><code class="elt">wsp:ExactlyOne</code> </span> <span class="diff-add">elements) do not allow attribute extensibility
+ because such attributes are not preserved through normalization.</span></p></div></div>
+
+
<p>The following rules are used to transform a compact policy expression into a normal form policy expression:</p>
<dl>
<dt class="label">Equivalence</dt>
<dd><p>Use of <code class="elt">wsp:Policy</code> as an operator within a policy expression is
equivalent to <code class="elt">wsp:All</code> .</p>
</dd>
+ <dd><div class="diff-add"><p>
+ <span class="diff-add">A collection of assertions in an </span><span class="diff-add"><code class="elt">wsp:All</code> </span> <span class="diff-add">operator is equivalent
+ to a </span><a title="policy alternative" href="#policy_alternative"><span class="diff-add">policy alternative</span></a><span class="diff-add">. For instance,
+ </span></p>
+<div class="exampleInner"><pre><wsp:All>
+ <!-- assertion 1 -->
+ <!-- assertion 2 -->
+</wsp:All></pre></div>
+ <p><span class="diff-add">is equivalent to:</span></p>
+<div class="exampleInner"><pre><wsp:ExactlyOne>
+ <wsp:All>
+ <!-- assertion 1 -->
+ <!-- assertion 2 -->
+ </wsp:All>
+</wsp:ExactlyOne></pre></div>
+ </div></dd>
<dt class="label">Empty</dt>
@@ -1186,19 +1351,25 @@
<wsp:All><em><!-- assertion 2 --><!-- assertion 4 --></em></wsp:All>
</wsp:ExactlyOne></pre></div>
<p>Distributing <code class="elt">wsp:All</code> over an empty <code class="elt">wsp:ExactlyOne</code> is equivalent to no alternatives. For example,</p>
-<div class="exampleInner"><pre><wsp:All>
+<div class="exampleInner"><pre><span class="diff-add"><wsp:All>
+ <wsp:ExactlyOne />
+</wsp:All></span></pre></div>
+<div class="diff-add"><p class="diff-add"><span class="diff-add">is equivalent to:</span></p></div>
+<div class="diff-add"><div class="exampleInner"><pre class="diff-add"><wsp:ExactlyOne /></pre></div></div>
+<div class="diff-add"><p class="diff-add"><span class="diff-add">and:</span></p></div>
+<div class="diff-add"><div class="exampleInner"><pre class="diff-add"><wsp:All>
<wsp:ExactlyOne>
<em> <!-- assertion 1 --></em>
<em> <!-- assertion 2 --></em>
</wsp:ExactlyOne>
<wsp:ExactlyOne />
-</wsp:All></pre></div>
+</wsp:All></pre></div></div>
<p>is equivalent to:</p>
<div class="exampleInner"><pre><wsp:ExactlyOne /></pre></div>
<p>For example, given the following compact policy expression:</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <sp:RequireDerivedKeys wsp:Optional="true" />
(03) <wsp:ExactlyOne>
(04) <sp:WssUsernameToken10 />
@@ -1216,7 +1387,7 @@
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All> <!-- @wsp:Optional alternative with assertion -->
(04) <sp:RequireDerivedKeys />
@@ -1236,7 +1407,7 @@
<p>Finally, noting that <code class="elt">wsp:Policy</code> is equivalent to <code class="elt">wsp:All</code> , and distributing <code class="elt">wsp:All</code> over <code class="elt">wsp:ExactlyOne</code> yields the following normal form policy expression:</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:RequireDerivedKeys />
@@ -1286,7 +1457,7 @@
<dt class="label"><code class="attr">/wsp:PolicyReference/@Digest</code> </dt>
- <dd><p>This attribute is of type <code class="attr">xs:boolean</code> and specifies the digest of the referenced policy expression. This is used to ensure the included policy is the expected policy.
+ <dd><p>This attribute is of type <code class="attr"><span class="diff-chg">xs:base64Binary</span></code> and 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></dd>
@@ -1303,7 +1474,7 @@
</thead>
<tbody>
<tr>
-<td rowspan="1" colspan="1"><code>http://www.w3.org/@@@@/@@/ws-policy/Sha1Exc</code> (implied)</td>
+<td rowspan="1" colspan="1"><code>http://www.w3.org/ns/ws-policy/Sha1Exc</code> (implied)</td>
<td rowspan="1" colspan="1">The digest is a SHA1 hash over the octet stream resulting from using the Exclusive XML canonicalization defined for XML Signature [<a href="#XML-Signature">[XML-Signature]</a>].</td>
</tr>
</tbody>
@@ -1340,7 +1511,7 @@
<p>In the example below two policies include and extend a common policy. In the first example there is a single policy document containing two policy assertions. The expression is given an identifier but not a fully qualified location. The second and third expressions reference the first expression by URI indicating the referenced expression is within the document. </p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="Protection" >
(02) <sp:EncryptSignature wsp:Optional="true" />
@@ -1349,20 +1520,60 @@
</pre></div>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:PolicyReference URI="#Protection" />
(03) <sp:OnlySignEntireHeadersAndBody />
(04) </wsp:Policy>
</pre></div>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <sp:IncludeTimestamp />
(03) <wsp:PolicyReference URI="#Protection" />
(04) <sp:OnlySignEntireHeadersAndBody />
(05) </wsp:Policy></pre></div>
<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 class="diff-add"><div class="div3">
+
+<h4><a name="normalization"></a>4.3.6 <span class="diff-add">Normalization</span></h4>
+ <p><span class="diff-add">To interpret a compact </span><a title="policy expression" href="#policy_expression"><span class="diff-add">expression</span></a> <span class="diff-add">in an interoperable form,
+ a compact expression may be converted to the corresponding normal form
+ expression by the following procedure:</span></p>
+
+ <ol>
+ <li><p><span class="diff-add">Start with the Element Information Item E (as defined in the XML Information Set [</span><a href="#XMLInfoset">[XML Information Set]</a><span class="diff-add">]) of the
+ policy expression. The </span><em><span class="diff-add">namespace
+ name</span></em> <span class="diff-add">of E is always </span><code><span class="diff-add">"http://www.w3.org/ns/ws-policy"</span></code><span class="diff-add">. In the base case,
+ the </span><em><span class="diff-add">local name</span></em> <span class="diff-add">property of E is
+ </span><code><span class="diff-add">"Policy"</span></code><span class="diff-add">; in the recursive case, the </span><em><span class="diff-add">local name</span></em> <span class="diff-add">property of E is
+ </span><code><span class="diff-add">"Policy"</span></code><span class="diff-add">, </span><code><span class="diff-add">"ExactlyOne"</span></code><span class="diff-add">, or
+ </span><code><span class="diff-add">"All"</span></code><span class="diff-add">.</span></p></li>
+ <li><p><span class="diff-add">Expand Element Information Items (as defined in the XML Information Set [</span><a href="#XMLInfoset">[XML Information Set]</a><span class="diff-add">]) in the </span><em><span class="diff-add">children</span></em> <span class="diff-add">property of E that are policy
+ references per Section </span><a href="#Policy_Inclusion"><b>4.3.5 Policy Inclusion</b></a><span class="diff-add">.</span></p></li>
+ <li><p><span class="diff-add">Convert each Element Information Item C in the </span><em><span class="diff-add">children</span></em> <span class="diff-add">property of E into normal
+ form.</span></p>
+ <ol>
+ <li><p><span class="diff-add">If the </span><em><span class="diff-add">namespace name</span></em>
+ <span class="diff-add">property of C is </span><code><span class="diff-add">"http://www.w3.org/ns/ws-policy"</span></code> <span class="diff-add">and the </span><em><span class="diff-add">local
+ name</span></em> <span class="diff-add">property of C is </span><code><span class="diff-add">"Policy"</span></code><span class="diff-add">,
+ </span><code><span class="diff-add">"ExactlyOne"</span></code><span class="diff-add">, or </span><code><span class="diff-add">"All"</span></code><span class="diff-add">, C is an expression
+ of a policy operator; normalize C by recursively applying this
+ procedure.</span></p></li>
+ <li><p><span class="diff-add">Otherwise the Element Information Item C is an assertion;
+ normalize C per Sections </span><a href="#Optional_Policy_Assertions"><b>4.3.1 Optional Policy Assertions</b></a>
+ <span class="diff-add">and </span><a href="#Policy_Assertion_Nesting"><b>4.3.2 Policy Assertion Nesting</b></a><span class="diff-add">.</span></p></li>
+ </ol>
+ </li>
+ <li><p><span class="diff-add">Apply the policy operator indicated by E to the normalized
+ Element Information Items in its </span><em><span class="diff-add">children</span></em> <span class="diff-add">property and construct a
+ normal form per Section </span><a href="#Policy_Operators"><b>4.3.3 Policy Operators</b></a> <span class="diff-add">and </span><a href="#Normal_Form_Policy_Expression"><b>4.1 Normal Form Policy Expression</b></a><span class="diff-add">.</span></p></li>
+ </ol>
+ <p><span class="diff-add">Note that an implementation may use a more efficient procedure and
+ is not required to explicitly convert a compact expression into the
+ normal form as long as the processing results are indistinguishable
+ from doing so.</span></p>
+</div></div>
</div>
<div class="div2">
@@ -1428,10 +1639,12 @@
<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>
+ <div class="diff-add"><p class="diff-add"><span class="diff-add">See Section </span><a href="#rPolicy_Alternative"><b>3.2 Policy Alternative</b></a> <span class="diff-add">for mechanisms for determining the aggregate
+ behavior indicated by multiple assertions of the same </span><a title="policy assertion type" href="#policy_assertion_type"><span class="diff-add">policy assertion type</span></a><span class="diff-add">.</span></p></div>
<p>As an example of intersection, consider two input policies in normal form:</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
<!-- Policy P1 -->
(02) <wsp:ExactlyOne>
(03) <wsp:All> <!-- Alternative A1 -->
@@ -1459,7 +1672,7 @@
<p>As this example illustrates, compatibility between two policy assertions is based on assertion type and delegates parameter processing to domain-specific processing.</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
<!-- Policy P2 -->
(02) <wsp:ExactlyOne>
(03) <wsp:All> <!-- Alternative A3 -->
@@ -1478,7 +1691,7 @@
<p>Because there is only one alternative (A2) in policy P1 with the same vocabulary — the assertions have the same type — as another alternative (A3) in policy P2, the intersection is a policy with a single alternative that contains all of the assertions in A2 and in A3.</p>
<div class="exampleInner"><pre>(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
<!-- Intersection of P1 and P2 -->
(02) <wsp:ExactlyOne>
(03) <wsp:All>
@@ -1522,11 +1735,11 @@
<h2><a name="Security_Considerations"></a>5. Security Considerations</h2>
<p>It is <span class="rfc2119">RECOMMENDED</span> that <a title="policy" href="#policy">policies</a> and
-<a title="policy assertion" href="#policy_assertion">assertions</a> be signed to prevent tampering.</p>
+<a title="policy assertion" href="#policy_assertion">assertions</a> be <span class="diff-chg">integrity </span><span class="diff-add">protected </span>to <span class="diff-chg">permit </span><span class="diff-add">the detection of </span>tampering. <span class="diff-add">This can be done using a technology such as XML DSig [</span><span class="diff-add"><a href="#XML-Signature">[XML-Signature]</a></span><span class="diff-add">], SSL/TLS [</span><span class="diff-add"><a href="#RFC2246">[IETF RFC 2246]</a></span><span class="diff-add">], or WS-Security 2004 [</span><span class="diff-add"><a href="#WS-Security">[WS-Security 2004]</a></span><span class="diff-add">].</span></p>
<p>Policies <span class="rfc2119">SHOULD NOT</span> be accepted unless they are signed and have an
associated security token to specify the signer has the right to
-"speak for" the <a title="policy scope" href="#policy_scope">scope</a>containing the policy. That is, a relying party
+"speak for" the <a title="policy scope" href="#policy_scope">scope</a> containing the policy. That is, a relying party
shouldn't rely on a policy unless the policy is signed and presented
with sufficient credentials to pass the relying parties' acceptance
criteria.</p>
@@ -1597,31 +1810,31 @@
expressions, etc.</p>
<div class="exampleOuter">
<p class="exampleHead" style="text-align: left"><a name="ex-chained-policy-reference-elements"></a><i><span>Example 5-1. </span>Chained Policy Reference Elements</i></p>
- <div class="exampleInner"><pre><Policy wsu:Id="p1">
- <PolicyReference URI="#p2"/ >
- <PolicyReference URI="#p2"/>
-</Policy>
+ <div class="exampleInner"><pre><span class="diff-chg"><wsp:Policy wsu:Id="p1">
+ <wsp:PolicyReference URI="#p2"/ >
+ <wsp:PolicyReference URI="#p2"/>
+</wsp:Policy>
-<Policy wsu:Id="p2" >
- <PolicyReference URI="#p3"/>
- <PolicyReference URI="#p3"/>
-</Policy>
+<wsp:Policy wsu:Id="p2" >
+ <wsp:PolicyReference URI="#p3"/>
+ <wsp:PolicyReference URI="#p3"/>
+</wsp:Policy>
-<Policy wsu:Id="p3" >
- <PolicyReference URI="#p4"/>
- <PolicyReference URI="#p4"/>
-</Policy>
+<wsp:Policy wsu:Id="p3" >
+ <wsp:PolicyReference URI="#p4"/>
+ <wsp:PolicyReference URI="#p4"/>
+</wsp:Policy>
<!-- Policy/@wsu:Id p4 through p99 -->
-<Policy wsu:Id="p100" >
- <PolicyReference URI="#p101"/>
- <PolicyReference URI="#p101"/>
-</Policy>
+<wsp:Policy wsu:Id="p100" >
+ <wsp:PolicyReference URI="#p101"/>
+ <wsp:PolicyReference URI="#p101"/>
+</wsp:Policy>
-<Policy wsu:Id="p101" >
+<wsp:Policy wsu:Id="p101" >
<mtom:OptimizedMimeSerialization />
-</Policy></pre></div>
+</wsp:Policy></span></pre></div>
</div>
<p>Malicious providers may provide a policy expression that includes multiple
PolicyReference elements that use a large number of different internet addresses. These
@@ -1640,7 +1853,7 @@
<div class="div1">
<h2><a name="Conformance"></a>6. Conformance</h2>
- <p>An element information item whose namespace name is "http://www.w3.org/@@@@/@@/ws-policy" and whose local part is Policy or PolicyReference conforms to this specification if it is valid according to the XML Schema [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>] for that element as defined by this specification (<a href="http://www.w3.org/@@@@/@@/ws-policy.xsd">http://www.w3.org/@@@@/@@/ws-policy.xsd</a>) and additionally adheres to all the constraints contained in this specification. Such a conformant element information item constitutes a <a title="policy expression" href="#policy_expression">policy expression</a>.
+ <p>An element information item whose namespace name is "http://www.w3.org/ns/ws-policy" and whose local part is Policy or PolicyReference conforms to this specification if it is valid according to the XML Schema [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>] for that element as defined by this specification (<a href="http://www.w3.org/ns/ws-policy.xsd">http://www.w3.org/ns/ws-policy.xsd</a>) and additionally adheres to all the constraints contained in this specification. Such a conformant element information item constitutes a <a title="policy expression" href="#policy_expression">policy expression</a>.
</p>
</div>
</div>
@@ -1851,7 +2064,10 @@
J. Kahan and K. Lanz, Editors. World Wide Web
Consortium, 17 August 2006.
Available at http://www.w3.org/2006/04/c14n-note/c14n-note.html.
- (See <a href="http://www.w3.org/2006/04/c14n-note/c14n-note.html">http://www.w3.org/2006/04/c14n-note/c14n-note.html</a>.)</dd>
+ (See <a href="http://www.w3.org/2006/04/c14n-note/c14n-note.html">http://www.w3.org/2006/04/c14n-note/c14n-note.html</a>.)</dd>
+ <dt class="label"><span class="diff-add"><a name="RFC2246"></a>IETF RFC 2246</span></dt><dd><div class="diff-add"><span class="diff-add">IETF
+ "RFC 2246: The TLS Protocol", T. Dierks, C. Allen, January
+ 1999.</span> (See http://www.ietf.org/rfc/rfc2246.txt.)</div></dd>
<dt class="label"><a name="SOAP11"></a>[SOAP 1.1] </dt><dd>
<cite>Simple Object Access Protocol (SOAP)
1.1</cite>, D. Box, et al, Editors. World Wide Web
@@ -2499,6 +2715,145 @@
<div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Reset Section <a href="#change-description"><b>D. Changes in this Version of the Document</b></a>.
</td></div>
</tr></div>
+
+ <div class="diff-add"><tr class="diff-add">
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070116</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">DBO</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/123"><span class="diff-add">123</span></a> and
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/115"><span class="diff-add">115 </span></a>
+ Resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4210"><span class="diff-add">4210</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">20070121</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">MH</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/129"><span class="diff-add">129</span></a>
+ Resolution for namespace dereferencing issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4204"><span class="diff-add">4204</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">20070121</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">MH</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/130"><span class="diff-add">130</span></a>
+ Resolution for editorial issues <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4205"><span class="diff-add">4205</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">20070121</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">MH</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/132"><span class="diff-add">132</span></a>
+ Resolution for changing format of example and removing text. <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4224"><span class="diff-add">4224</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">20070122</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">MH</td></div>
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/133"><span class="diff-add">133</span></a>
+ Resolution for editorial items. <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4225"><span class="diff-add">4225</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">20070122</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">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/117"><span class="diff-add">117</span></a>
+ Resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4141"><span class="diff-add">4141</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">20070122</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">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/120"><span class="diff-add">120</span></a>
+ Resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4142"><span class="diff-add">4142</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">20070122</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">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/122"><span class="diff-add">122</span></a>
+ Resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4236"><span class="diff-add">4236</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">20070122</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">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/125"><span class="diff-add">125</span></a>
+ Resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4177"><span class="diff-add">4177</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">20070122</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">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/128"><span class="diff-add">128</span></a>
+ Resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4203"><span class="diff-add">4203</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">20070122</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">Completed action item:
+ <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/127"><span class="diff-add">127</span></a>
+ Resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4197"><span class="diff-add">4197</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">20070122</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 resolution for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4206"><span class="diff-add">4206</span></a>.
+ Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/136"><span class="diff-add">136</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">20070122</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/2007Jan/0166.html"><span class="diff-add">resolution</span></a>
+ for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4138"><span class="diff-add">4138</span></a>.
+ Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/140"><span class="diff-add">140</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">20070122</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/2007Jan/0173.html"><span class="diff-add">resolution</span></a>
+ for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4240"><span class="diff-add">4240</span></a>.
+ Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/146"><span class="diff-add">146</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">20070122</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/2007Jan/0159.html"><span class="diff-add">resolution</span></a>
+ for issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4235"><span class="diff-add">4235</span></a>.
+ Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/147"><span class="diff-add">147</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">20070123</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/2007Jan/0186.html"><span class="diff-add">resolution</span></a>
+ for issues <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4196"><span class="diff-add">4196</span></a>
+ and <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4238"><span class="diff-add">4238</span></a>.
+ Editors' action <a href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/142"><span class="diff-add">142</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">20070123</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">Fixed a typo in <a href="#Informative-References"><b>B.2 Other References</b></a>: "[IETF RFC 3023]IETF "RFC 2246:".
+ </td></div>
+ </tr></div>
+ <div class="diff-add"><tr class="diff-add">
+ <div class="diff-add"><td rowspan="1" colspan="1" class="diff-add">20070123</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">Applied a <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4197#c2"><span class="diff-add">missed
+ item </span></a>(re
+ issue <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4197"><span class="diff-add">4197</span></a>)
+ to section <a href="#Extensibility"><b>2.2 Extensibility</b></a>: Umit's amendment - "such as in Section
+ 4.3.4 Policy References" and other changes.
+ </td></div>
+ </tr></div>
</tbody>
</table><br>
Index: ws-policy-framework-diff20061117.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework-diff20061117.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ws-policy-framework-diff20061117.xml 8 Jan 2007 22:55:34 -0000 1.1
+++ ws-policy-framework-diff20061117.xml 24 Jan 2007 05:00:33 -0000 1.2
@@ -84,32 +84,41 @@
entities in a Web services-based system.
</p>
- <p>A <termref def="policy">policy</termref> is a collection of policy alternatives,
- where a <termref def="policy_alternative">policy alternative </termref> is a collection of policy assertions.
- A <termref def="policy_assertion">policy assertion</termref> represents an individual requirement, capability, or other property of a behavior.
- A <termref def="policy_expression">policy expression</termref> is an XML Infoset representation of a policy,
- either in a normal form or in an equivalent compact form. Some policy assertions
+ <p>A <termref def="policy">policy</termref> is a collection of policy <phrase diff="add">alternatives.</phrase><phrase diff="del">alternatives,
+ where a </phrase><phrase diff="add">A
+ </phrase><termref def="policy_alternative">policy alternative </termref> is a collection of policy assertions.
+ A <termref def="policy_assertion">policy assertion</termref> represents <phrase diff="add">a</phrase><phrase diff="del">an individual </phrase>requirement, capability, or other property of a behavior.
+ A <termref def="policy_expression">policy expression</termref> is an XML Infoset representation of <phrase diff="chg">its </phrase>policy,
+ either in a normal form or in <phrase diff="chg">its </phrase>equivalent compact form. Some policy assertions
specify traditional requirements and capabilities that
- will ultimately manifest on the wire (e.g., authentication
+ will <phrase diff="del">ultimately </phrase>manifest <phrase diff="add">themselves in</phrase><phrase diff="del">on </phrase>the <phrase diff="chg">messages exchanged(e.g., </phrase>authentication
scheme, transport protocol selection). Other policy
- assertions have no wire manifestation yet are critical to
- proper service selection and usage (e.g., privacy policy,
+ assertions have no wire manifestation <phrase diff="add">in the messages exchanged, </phrase>yet are <phrase diff="chg">relevant </phrase>to
+ <phrase diff="del">proper </phrase>service selection and usage (e.g., privacy policy,
QoS characteristics). Web Services Policy 1.5 - Framework provides a single policy
language to allow both kinds of assertions to be expressed and evaluated
in a consistent manner.</p>
-<p>Web Services Policy 1.5 - Framework does not specify policy discovery or
- policy attachments. A <termref def="policy_expression">policy attachment</termref> is a mechanism for associating
- policy with one or more policy scopes, where a <termref def="policy_scope">policy scope</termref> is a collection of
- policy subjects to which a policy may apply. A <termref def="policy_subject">policy subject</termref> is an entity
+ <p>Web Services Policy 1.5 - Framework does not <phrase diff="add">cover discovery of policy,</phrase><phrase diff="del">specify </phrase>policy <phrase diff="add">scopes and</phrase><phrase diff="del">discovery </phrase><phrase diff="add">subjects,
+ </phrase>or
+ <phrase diff="del">policy </phrase><phrase diff="add">their respective attachment mechanisms.
+ </phrase><phrase diff="del">attachments. </phrase>A <termref def="policy_expression">policy attachment</termref> is a mechanism for associating
+ policy with one or more policy <phrase diff="add">scopes.</phrase><phrase diff="del">scopes, where </phrase><phrase diff="chg">A </phrase><termref def="policy_scope">policy scope</termref> is
+ a collection of policy subjects to which a policy <phrase diff="add">applies.
+ </phrase><phrase diff="del">may apply. </phrase>A <termref def="policy_subject">policy subject</termref> is an entity
(e.g., an endpoint, message, resource, interaction) with which a
- policy can be associated. Other specifications are
+ policy can be associated. <phrase diff="del">Other specifications are
free to define technology-specific mechanisms for
associating policy with various entities and
- resources. Web Services Policy 1.5 - Attachment [<bibref ref="WS-PolicyAttachment"></bibref>]
- defines such mechanisms, especially for associating policy
- with arbitrary XML elements [<bibref ref="XML10"></bibref>], WSDL artifacts [<bibref ref="WSDL11"></bibref>, <bibref ref="WSDL20"></bibref>], and UDDI
- elements [<bibref ref="UDDIAPI20"></bibref>, <bibref ref="UDDIDataStructure20"></bibref>, <bibref ref="UDDI30"></bibref>].</p>
+ resources. </phrase>Web Services Policy 1.5 - Attachment [<bibref ref="WS-PolicyAttachment"></bibref>]
+ defines such <phrase diff="add">policy attachment </phrase>mechanisms, especially for associating policy
+ with arbitrary XML elements [<bibref ref="XML10"></bibref>], WSDL artifacts [<bibref ref="WSDL11"></bibref>,
+ <bibref ref="WSDL20"></bibref>], and UDDI elements [<bibref ref="UDDIAPI20"></bibref>,
+ <bibref ref="UDDIDataStructure20"></bibref>, <bibref ref="UDDI30"></bibref>].
+ <phrase diff="add">Other specifications are free to define either extensions to the mechanisms
+ defined in Web Services Policy 1.5 - Attachment [</phrase><bibref ref="WS-PolicyAttachment" diff="add"></bibref><phrase diff="add">], or additional
+ mechanisms not covered by Web Services Policy 1.5 - Attachment [</phrase><bibref ref="WS-PolicyAttachment" diff="add"></bibref><phrase diff="add">],
+ for purposes of associating policy with policy scopes and subjects.</phrase></p>
<div2 id="Example">
@@ -123,7 +132,7 @@
(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:SignedParts/>
@@ -172,7 +181,7 @@
</ulist>
</item>
<item>
- <p>The character "|" is used to indicate a choice
+ <p>The character "|" is used to indicate <phrase diff="add">an exclusive</phrase><phrase diff="del">a </phrase>choice
between alternatives.</p>
</item>
<item>
@@ -181,7 +190,7 @@
respect to cardinality or choice.</p>
</item>
<item>
- <p>This document relies on the XML Information Set [<bibref ref="XMLInfoset"></bibref>]. Information items properties are
+ <p>This document relies on the XML Information Set [<bibref ref="XMLInfoset"></bibref>]. Information <phrase diff="chg">item </phrase>properties are
indicated by the style <emph role="infoset-property">infoset property</emph>.</p>
</item>
<item>
@@ -201,7 +210,8 @@
<ulist>
<item>
<p>An element extensibility point is referred to using {any} in place of the element name. This
-indicates that any element name can be used, from any namespace. </p>
+ indicates that any element name can be used, from any <phrase diff="add">namespace,
+ unless specified otherwise such as in Section </phrase><specref ref="Policy_Operators" diff="add"></specref><phrase diff="add">.</phrase><phrase diff="del">namespace. </phrase></p>
</item>
<item>
<p>An attribute extensibility point is referred to using @{any} in place of the attribute name. This
@@ -219,15 +229,17 @@
<div2 id="Extensibility">
<head>Extensibility</head>
- <p>Within normative outlines, ellipses (i.e., "…")
+ <p>Within normative outlines, <phrase diff="add">in this specification, </phrase>ellipses (i.e., "…")
indicate a point of extensibility that allows other Element or Attribute
Information Items. Information Items <rfc2119>MAY</rfc2119> be added at the
indicated extension points but <rfc2119>MUST NOT</rfc2119> contradict the semantics
of the element information item indicated by the <emph role="infoset-property">parent</emph>
- or <emph role="infoset-property">owner</emph> property of the extension. If an
- Attribute Information Item is not recognized, it <rfc2119>SHOULD</rfc2119>
- be ignored; if an Element Information Item is not recognized, it
- <rfc2119>MUST</rfc2119> be treated as an assertion.</p>
+ or <emph role="infoset-property">owner</emph> property of the extension. <phrase diff="chg">In </phrase><phrase diff="add">this context,</phrase><phrase diff="del">an
+ </phrase><phrase diff="add">if an </phrase>Attribute Information Item is not recognized, it <rfc2119>SHOULD</rfc2119>
+ be <phrase diff="chg">ignored. If </phrase>an Element Information Item is not recognized, it
+ <rfc2119>MUST</rfc2119> be treated as <phrase diff="chg">a </phrase><phrase diff="add">policy assertion,
+ unless specified otherwise
+ such as in Section </phrase><specref ref="Policy_References" diff="add"></specref><phrase diff="add">.</phrase><phrase diff="del">assertion.</phrase></p>
</div2>
<div2 id="XML_Namespaces">
<head>XML Namespaces</head>
@@ -253,7 +265,7 @@
</tr>
<tr>
<td rowspan="1" colspan="1"><code>wsp</code></td>
-<td rowspan="1" colspan="1"><code>http://www.w3.org/@@@@/@@/ws-policy</code></td>
+<td rowspan="1" colspan="1"><code>http://www.w3.org/ns/ws-policy</code></td>
<td rowspan="1" colspan="1">This specification</td>
</tr>
<tr>
@@ -269,8 +281,8 @@
</tbody>
</table>
<p>All information items defined by this specification
- are identified by the XML namespace URI [<bibref ref="XML-NS"></bibref>] <code>http://www.w3.org/@@@@/@@/ws-policy</code>. A <xspecref href="http://www.w3.org/@@@@/@@/ws-policy" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new">normative XML Schema</xspecref> [<bibref ref="XMLSchemaPart1"></bibref>, <bibref ref="XMLSchemaPart2"></bibref>] document can be obtained by
- dereferencing the XML namespace URI.</p>
+ are identified by the XML namespace URI [<bibref ref="XML-NS"></bibref>] <code>http://www.w3.org/ns/ws-policy</code>. A <xspecref href="http://www.w3.org/ns/ws-policy" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new">normative XML Schema</xspecref> [<bibref ref="XMLSchemaPart1"></bibref>, <bibref ref="XMLSchemaPart2"></bibref>] document can be obtained by
+ dereferencing the <phrase diff="add">namespace document at the WS-Policy</phrase><phrase diff="del">XML </phrase><phrase diff="add">1.5 </phrase>namespace URI.</p>
<p>It is the intent of the W3C Web Services Policy Working Group that
the Web Services Policy 1.5 - Framework and Web Services Policy 1.5 - Attachment XML namespace URI will not change
@@ -455,10 +467,9 @@
<div2 id="rPolicy_Assertion">
<head>Policy Assertion</head>
-
<p><termdef id="policy_assertion" term="policy assertion">A <term>policy assertion</term>
- represents an individual requirement, capability, or other property of a behavior.</termdef> A <termref def="policy_assertion">policy
- assertion</termref> identifies a behavior that is a
+ represents <phrase diff="add">a</phrase><phrase diff="del">an individual </phrase>requirement, <phrase diff="add">a </phrase>capability, or other property of a behavior.</termdef>
+ A <termref def="policy_assertion">policy assertion</termref> identifies a behavior that is a
requirement or capability of a <termref def="policy_subject">policy subject</termref>.
<termdef id="policy_subject" term="policy subject">A <term>policy subject</term> is an entity
(e.g., an endpoint, message, resource, operation) with which a
@@ -496,7 +507,9 @@
binding assertion. </p>
<p>The XML Infoset of a <termref def="policy_assertion">policy assertion</termref> <rfc2119>MAY</rfc2119> contain a non-empty <emph role="infoset-property">attributes</emph> property and/or a non-empty <emph role="infoset-property">children</emph>
- property. Such properties are <termref def="policy_assertion_parameter">policy assertion parameters</termref>
+ <phrase diff="del">property. </phrase><phrase diff="add">property.
+ </phrase>Such <phrase diff="add">properties, excluding the Attribute and Element Information Items from the WS-Policy language
+ XML</phrase><phrase diff="del">properties </phrase><phrase diff="add">namespace name </phrase>are <termref def="policy_assertion_parameter">policy assertion parameters</termref>
and <rfc2119>MAY</rfc2119> be used to
parameterize the behavior indicated by the assertion.
<termdef id="policy_assertion_parameter" term="policy assertion parameter">A <term>policy assertion parameter</term>
@@ -548,6 +561,8 @@
Post-Schema-Validation Infoset (PSVI) (See XML Schema Part 1 [<bibref ref="XMLSchemaPart1"></bibref>]) content, if any) are
specific to the assertion type and are outside the scope
of this document.</p>
+ <p diff="add"><phrase diff="add">Note: Depending on the semantics of the domain specific policy assertions a combination of the
+ policy assertions can be required to specify a particular behavior. </phrase></p>
</div2>
<div2 id="rPolicy">
@@ -627,22 +642,36 @@
<p>This section describes how to convey <termref def="policy">policy</termref> in an interoperable form,
using the XML Infoset representation of a policy. <termdef id="policy_expression" term="policy expression">A <term>policy expression</term>
is an XML Infoset representation of a <termref def="policy">policy</termref>,
- either in a normal form or in an equivalent compact form.</termdef> Other subsections below describe
- several important aspects related to policy expression, namely
- (i) Normal form of a policy expression (ii) Compact form of a policy expression
- (iii) Identification of policy expressions and (iv) Policy intersection.
+ either in a normal form or in an equivalent compact form.</termdef>
</p>
- <p> The normal form of a policy expression is the most straightforward
- Infoset representation; equivalent, alternative Infosets allow compactly
- expressing a policy through a number of constructs.</p>
+
+ <p diff="add"><phrase diff="add">The </phrase><phrase diff="del">Other subsections below describe
+ several important aspects related to policy expression, namely
+ (i) </phrase><phrase diff="chg">normal </phrase>form <phrase diff="add">(see</phrase><phrase diff="del">of a policy expression (ii) </phrase><phrase diff="chg">Section </phrase><specref ref="Normal_Form_Policy_Expression"></specref><phrase diff="add">)</phrase><phrase diff="del">form </phrase>of a policy expression
+ <phrase diff="del">(iii) Identification of policy </phrase><phrase diff="add">is</phrase><phrase diff="del">expressions and (iv) </phrase><phrase diff="chg">the </phrase><phrase diff="add">most
+ straightforward</phrase><phrase diff="del">intersection.
- <p>This specification does not define processing for arbitrary <el>wsp:Policy</el>
- Element Information Items in any context other than as an Element Information Item
- in the <emph role="infoset-property">children</emph> property of an Element
- Information Item that is in the <emph role="infoset-property">children</emph>
- property of an element Information Item defined in section 4.1 below.
- </p>
-
+ </phrase><phrase diff="chg">XML Infoset representation </phrase>of <phrase diff="chg">the </phrase>policy <phrase diff="add">data</phrase><phrase diff="del">expression is the </phrase><phrase diff="add">model.
+ Equivalent,</phrase><phrase diff="del">most </phrase><phrase diff="add">alternative</phrase><phrase diff="del">straightforward
+ Infoset </phrase><phrase diff="chg">representations allow policy authors to </phrase>compactly
+ <phrase diff="chg">express </phrase>a policy <phrase diff="add">(see</phrase><phrase diff="del">through a </phrase><phrase diff="chg">Section </phrase><specref ref="Compact_Policy_Expression"></specref><phrase diff="add">).
+ Policy</phrase><phrase diff="del">of </phrase><phrase diff="add">authors</phrase><phrase diff="del">constructs.
+
+ This </phrase><phrase diff="chg">might be </phrase><phrase diff="add">more
+ interested</phrase><phrase diff="del">not </phrase><phrase diff="chg">in the compact form </phrase><phrase diff="add">(see</phrase><phrase diff="del">wsp:Policy
+ Element </phrase><phrase diff="add">Section
+ </phrase><specref ref="Compact_Policy_Expression"></specref><phrase diff="add">),</phrase><phrase diff="del">Information </phrase><phrase diff="chg">where the outlines </phrase><phrase diff="add">and
+ definitions</phrase><phrase diff="del">context </phrase><phrase diff="chg">describe what is valid with regards </phrase><phrase diff="add">to</phrase><phrase diff="del">Item
+ in </phrase>the <phrase diff="add">policy</phrase><phrase diff="del">children </phrase><phrase diff="chg">language </phrase><phrase diff="add">XML
+ Schema.</phrase></p>
+
+ <p diff="add"><phrase diff="add">While</phrase><phrase diff="del">of </phrase><phrase diff="chg">the </phrase><phrase diff="add">policy</phrase><phrase diff="del">Element
+ Information </phrase><phrase diff="chg">language </phrase><phrase diff="add">XML Schema</phrase><phrase diff="del">that </phrase>is <phrase diff="add">a representation of</phrase><phrase diff="del">in </phrase>the <phrase diff="add">compact
+ form,</phrase><phrase diff="del">children
+ property </phrase><phrase diff="chg">the normal form is more restrictive as outlined in </phrase><phrase diff="add">Section
+ </phrase><specref ref="Normal_Form_Policy_Expression"></specref><phrase diff="add">.</phrase><phrase diff="del">below.
+ </phrase></p>
+
<div2 id="Normal_Form_Policy_Expression">
<head>Normal Form Policy Expression</head>
@@ -707,7 +736,7 @@
<p>For example, the following is the normal form of a policy expression.</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:SignedParts/>
@@ -774,13 +803,13 @@
<eg xml:space="preserve">(01) <wsp:Policy
Name="http://www.example.com/policies/P1"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <!-- Details omitted for readability -->
(03) </wsp:Policy></eg>
<p>The following example illustrates how to associate a policy expression with the IRI-reference <code>"#P1"</code>:</p>
<eg xml:space="preserve">(01) <wsp:Policy
wsu:Id="P1"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" >
(02) <!-- Details omitted for readability -->
(03) </wsp:Policy></eg>
@@ -792,46 +821,55 @@
XML Infoset, this specification defines three constructs: an attribute
to decorate an <termref def="policy_assertion">assertion</termref>,
semantics for recursively nested policy operators, and a policy
-reference/inclusion mechanism. Each is described in the subsections
-below.</p>
+ reference/inclusion mechanism. Each <phrase diff="chg">sub section </phrase><phrase diff="add">below
+ describes</phrase><phrase diff="del">in </phrase><phrase diff="chg">a </phrase><phrase diff="add">construct and its equivalent normal form.
+ </phrase><phrase diff="del">subsections
+below.
-<p>To interpret a compact <termref def="policy_expression">expression</termref> in an interoperable form,
-a compact expression may be converted to the corresponding normal form
-expression by the following procedure:</p>
+</phrase>To interpret a compact expression in an interoperable form,
+<phrase diff="del">a compact expression may be converted to the corresponding normal form
+expression by the following procedure:
-<olist>
-<item><p>Start with the <emph role="infoset-property">document
-element</emph> property D of the Document Information Item of the
-policy expression. The <emph role="infoset-property">namespace
-name</emph> of D is always <code>"http://www.w3.org/@@@@/@@/ws-policy"</code>. In the base case,
-the <emph role="infoset-property">local name</emph> property of D is
-<code>"Policy"</code>; in the recursive case, the <emph role="infoset-property">local name</emph> property of D is
-<code>"Policy"</code>, <code>"ExactlyOne"</code>, or
-<code>"All"</code>.</p></item>
-<item><p>Expand Element Information Items in the <emph role="infoset-property">children</emph> property of D that are policy
-references per Section <specref ref="Policy_Inclusion"></specref>.</p></item>
-<item><p>Convert each Element Information Item C in the <emph role="infoset-property">children</emph> property of D into normal
-form.</p>
-<olist>
-<item><p>If the <emph role="infoset-property">namespace name</emph>
-property of C is <code>"http://www.w3.org/@@@@/@@/ws-policy"</code> and the <emph role="infoset-property">local
-name</emph> property of C is <code>"Policy"</code>,
-<code>"ExactlyOne"</code>, or <code>"All"</code>, C is an expression
+
+Start with the document
+element property D of the Document Information Item of </phrase><phrase diff="chg">a
+ </phrase>policy <phrase diff="add">expression</phrase><phrase diff="del">expression. The namespace
+name of D is always "http://www.w3.org/ns/ws-policy". In the base case,
+the local name property of D is
+"Policy"; in the recursive case, the local name property of D is
+"Policy", "ExactlyOne", or
+"All".
+Expand Element Information Items </phrase>in the <phrase diff="add">compact</phrase><phrase diff="del">children property of D </phrase><phrase diff="chg">form can </phrase><phrase diff="add">be</phrase><phrase diff="del">policy
+references </phrase><phrase diff="add">converted
+ (see</phrase><phrase diff="del">per </phrase>Section <specref ref="normalization" diff="add"></specref><phrase diff="add">)</phrase><phrase diff="del">.
+Convert each Element Information Item C in the children property of D into normal
+form.
+
+If the namespace name
+property of C is "http://www.w3.org/ns/ws-policy" and the local
+name property of C is "Policy",
+"ExactlyOne", or "All", C is an expression
of a policy operator; normalize C by recursively applying this
-procedure.</p></item>
-<item><p>Otherwise the Element Information Item C is an assertion;
-normalize C per Sections <specref ref="Optional_Policy_Assertions"></specref>
-and <specref ref="Policy_Assertion_Nesting"></specref>.</p></item>
-</olist>
-</item>
-<item><p>Apply the policy operator indicated by D to the normalized
-Element Information Items in its <emph role="infoset-property">children</emph> property and construct a
-normal form per Section <specref ref="Policy_Operators"></specref>.</p></item>
-</olist>
-<p>Note that an implementation may use a more efficient procedure and
-is not required to explicitly convert a compact expression into the
-normal form as long as the processing results are indistinguishable
-from doing so.</p>
+procedure.
+Otherwise the Element Information Item C is an assertion;
+normalize C per Sections
+and .
+
+
+Apply the policy operator indicated by D </phrase>to the <phrase diff="del">normalized
+Element Information Items in its children property and construct a
+</phrase>normal form <phrase diff="chg">(see </phrase>Section <specref ref="Normal_Form_Policy_Expression" diff="chg"></specref><phrase diff="chg">).</phrase></p>
+
+<p><phrase diff="add">A</phrase><phrase diff="del">Note that an </phrase><termref def="policy_expression" diff="add"><phrase diff="add">policy</phrase><phrase diff="del">implementation </phrase><phrase diff="add">expression</phrase></termref>
+ <phrase diff="add">consists</phrase><phrase diff="del">may </phrase><phrase diff="chg">of </phrase>a <el diff="add">wsp:Policy</el><phrase diff="del">more </phrase><phrase diff="chg">wrapper element </phrase>and
+ <phrase diff="add">zero
+</phrase><phrase diff="del">is not required to explicitly convert a compact expression into the
+normal form as long as the </phrase><phrase diff="chg">or more child </phrase><phrase diff="add">and</phrase><phrase diff="del">indistinguishable
+from </phrase><phrase diff="chg">descendent elements.</phrase></p>
+
+
+
+
<div3 id="Optional_Policy_Assertions">
<head>Optional Policy Assertions</head>
<p>To indicate that a <termref def="policy_assertion">policy
@@ -864,13 +902,13 @@
<p>For example, the following compact policy expression:</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <sp:IncludeTimestamp wsp:Optional="true" />
(03) </wsp:Policy></eg>
<p>is equivalent to the following normal form policy expression:</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:IncludeTimestamp />
@@ -906,7 +944,7 @@
Item in the <emph role="infoset-property">children</emph> property,
the assertion has no nested policy expression.
</p>
-<p>Note: if the schema outline for an assertion type requires a nested
+<p><phrase diff="add">If</phrase><phrase diff="del">Note: if </phrase>the schema outline for an assertion type requires a nested
policy expression but the assertion does not further qualify one or
more aspects of the behavior indicated by the assertion type (i.e., no
assertions are needed in the nested policy expression), the assertion
@@ -914,15 +952,24 @@
<code><wsp:Policy/></code> Element Information Item in its <emph role="infoset-property">children</emph> property; as explained in
Section <specref ref="Policy_Operators"></specref>, this is equivalent to a
nested policy expression with a single alternative that has zero
-assertions. The reason for requiring at least an empty <code><wsp:Policy/></code>
+assertions. <phrase diff="del">The reason for requiring at least an empty <wsp:Policy/>
Element above is to ensure that two assertions of the same type will always be
compatible and an intersection would not fail
-(see Section <specref ref="Policy_Intersection"></specref>).</p>
+(see Section ).</phrase></p>
<p>Note: This specification does not define processing for arbitrary
<el>wsp:Policy</el> Element Information Items in the descendants
-of an assertion parameter, e.g., in the <emph role="infoset-property">children</emph> property of one of the <emph role="infoset-property">children</emph> as in
-<code><Lorem><Ipsum><wsp:Policy> …
-</wsp:Policy></Ipsum></Lorem></code>.</p>
+of an assertion parameter, e.g., in the <emph role="infoset-property">children</emph> property of one of the <emph role="infoset-property">children</emph> as <phrase diff="add">in:</phrase><phrase diff="del">in
+<Lorem><Ipsum><wsp:Policy> …
+</phrase><eg xml:space="preserve" diff="add">
+(01)<wsp:Policy>
+(02) <Lorem>
+(03) <Ipsum>
+(04) <wsp:Policy>
+(05) …
+(06) </wsp:Policy>
+(07) </Ipsum>
+(08) </Lorem>
+(09)</wsp:Policy></eg><phrase diff="del"></wsp:Policy></Ipsum></Lorem></phrase>.</p>
</def>
</gitem>
</glist>
@@ -944,7 +991,7 @@
nested policy expressions in a compact form:</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <sp:TransportBinding>
(03) <wsp:Policy>
(04) <sp:AlgorithmSuite>
@@ -976,7 +1023,7 @@
<p>The <phrase diff="del">normalized form of the </phrase>example above is equivalent to the following:</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:TransportBinding>
@@ -1025,22 +1072,140 @@
<head>Policy Operators</head>
<p><termref def="policy">Policies</termref> are used to convey a set of capabilities, requirements, and general characteristics of entities (see <specref ref="tocRange"></specref>).
These are generally expressible as a set of <termref def="policy_alternative">policy alternatives</termref>.
- Policy operators (<el>wsp:Policy</el>, <el>wsp:All</el> and <el>wsp:ExactlyOne</el>)
- are used to group <termref def="policy_assertion">policy assertions</termref>
+ Policy operators (<el>wsp:Policy</el>, <el>wsp:All</el> and <el>wsp:ExactlyOne</el> <phrase diff="add">elements)</phrase><phrase diff="del">)
+ </phrase>are used to group <termref def="policy_assertion">policy assertions</termref>
into <termref def="policy_alternative">policy alternatives</termref>.
- In some instances, complex policies expressed in normal form can get relatively large and hard to manage.
-To compactly express complex policies, policy operators
+ <phrase diff="del">In some instances, complex policies expressed in normal form can get relatively large and hard to manage.
+</phrase>To compactly express complex policies, policy operators
<rfc2119>MAY</rfc2119> be recursively nested; that is, one or more
instances of <el>wsp:Policy</el>, <el>wsp:All</el>, and/or
<el>wsp:ExactlyOne</el> <rfc2119>MAY</rfc2119> be nested within
<el>wsp:Policy</el>, <el>wsp:All</el>, and/or
<el>wsp:ExactlyOne</el>.</p>
+
+<p diff="add"><phrase diff="add">The schema outline for the </phrase><el diff="add">wsp:Policy</el> <phrase diff="add">element in the compact form is as follows:</phrase></p>
+ <eg xml:space="preserve" role="needs-numbering" diff="add"><wsp:Policy … >
+ ( <wsp:Policy …>…</wsp:Policy> |
+ <wsp:ExactlyOne>…</wsp:ExactlyOne> |
+ <wsp:All>…</wsp:All> |
+ <wsp:PolicyReference … >…</wsp:PolicyReference> |
+ …
+ )*
+</wsp:Policy></eg>
+ <p diff="add"><phrase diff="add">The following describes the Attribute and Element Information Items defined in the schema outline above:</phrase></p>
+ <glist diff="add">
+ <gitem><label><el diff="add">/wsp:Policy</el></label>
+ <def><p><phrase diff="add">This element is the </phrase><el diff="add">wsp:Policy</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:Policy/wsp:Policy</el></label>
+ <def><p><phrase diff="add">This element is a nested </phrase><el diff="add">wsp:Policy</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:Policy/wsp:ExactlyOne</el></label>
+ <def><p><phrase diff="add">This element is a nested </phrase><el diff="add">wsp:ExactlyOne</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:Policy/wsp:All</el></label>
+ <def><p><phrase diff="add">This element is a nested </phrase><el diff="add">wsp:All</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:Policy/wsp:PolicyReference</el></label>
+ <def><p><phrase diff="add">This element references a policy expression to be included per Section
+ </phrase><specref ref="Policy_Inclusion"></specref><phrase diff="add">.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:Policy/@{any}</el></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>
+ <gitem><label><el diff="add">/wsp:Policy/{any}</el></label>
+ <def><p><phrase diff="add">Additional elements </phrase><rfc2119><phrase diff="add">MAY</phrase></rfc2119> <phrase diff="add">be specified. Such elements
+ </phrase><rfc2119><phrase diff="add">MUST NOT</phrase></rfc2119> <phrase diff="add">use the Web Services Policy language
+ XML namespace name and </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">parent element</phrase></emph><phrase diff="add">.</phrase></p></def></gitem>
+ </glist>
+
+ <p diff="add"><phrase diff="add">The schema outline for the </phrase><el diff="add">wsp:ExactlyOne</el> <phrase diff="add">element in the compact form is as follows:</phrase></p>
+ <eg xml:space="preserve" role="needs-numbering" diff="add"><wsp:ExactlyOne>
+ ( <wsp:Policy … >…</wsp:Policy> |
+ <wsp:ExactlyOne>…</wsp:ExactlyOne> |
+ <wsp:All>…</wsp:All> |
+ <wsp:PolicyReference … >…</wsp:PolicyReference> |
+ …
+ )*
+</wsp:ExactlyOne></eg>
+ <p diff="add"><phrase diff="add">The following describes the Attribute and Element Information Items defined in the schema outline above:</phrase></p>
+
+ <glist diff="add">
+ <gitem><label><el diff="add">/wsp:ExactlyOne</el></label>
+ <def><p><phrase diff="add">This element is the </phrase><el diff="add">wsp:ExactlyOne</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:ExactlyOne/wsp:Policy</el></label>
+ <def><p><phrase diff="add">This element is a nested </phrase><el diff="add">wsp:Policy</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:ExactlyOne/wsp:ExactlyOne</el></label>
+ <def><p><phrase diff="add">This element is a nested </phrase><el diff="add">wsp:ExactlyOne</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:ExactlyOne/wsp:All</el></label>
+ <def><p><phrase diff="add">This element is a nested </phrase><el diff="add">wsp:All operator</el><phrase diff="add">.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:ExactlyOne/wsp:PolicyReference</el></label>
+ <def><p><phrase diff="add">This element references a policy expression to be included per Section
+ </phrase><specref ref="Policy_Inclusion"></specref><phrase diff="add">.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:ExactlyOne/{any}</el></label>
+ <def><p><phrase diff="add">Additional elements </phrase><rfc2119><phrase diff="add">MAY</phrase></rfc2119> <phrase diff="add">be specified. Such elements
+ </phrase><rfc2119><phrase diff="add">MUST NOT</phrase></rfc2119> <phrase diff="add">use the Web Services Policy language
+ XML namespace name and </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">parent element</phrase></emph><phrase diff="add">.</phrase></p></def></gitem>
+ </glist>
+ <p diff="add"><phrase diff="add">The schema outline for the </phrase><el diff="add">wsp:All</el> <phrase diff="add">element in the compact form is as follows:</phrase></p>
+
+ <eg xml:space="preserve" role="needs-numbering" diff="add"><wsp:All>
+ ( <wsp:Policy … >…</wsp:Policy> |
+ <wsp:ExactlyOne>…</wsp:ExactlyOne> |
+ <wsp:All>…</wsp:All> |
+ <wsp:PolicyReference … >…</wsp:PolicyReference> |
+ …
+ )*
+</wsp:All></eg>
+
+<p diff="add"><phrase diff="add">The following describes the Attribute and Element Information Items defined in the schema outline above:</phrase></p>
+ <glist diff="add">
+ <gitem><label><el diff="add">/wsp:All</el></label>
+ <def><p><phrase diff="add">This element is the </phrase><el diff="add">wsp:All</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:All/wsp:Policy</el></label>
+ <def><p><phrase diff="add">This element is a nested </phrase><el diff="add">wsp:Policy</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:All/wsp:ExactlyOne</el></label>
+ <def><p><phrase diff="add">This element is a nested </phrase><el diff="add">wsp:ExactlyOne</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:All/wsp:All</el></label>
+ <def><p><phrase diff="add">This element is a nested </phrase><el diff="add">wsp:All</el> <phrase diff="add">operator.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:All/wsp:PolicyReference</el></label>
+ <def><p><phrase diff="add">This element references a policy expression to be included per Section
+ </phrase><specref ref="Policy_Inclusion"></specref><phrase diff="add">.</phrase></p></def></gitem>
+ <gitem><label><el diff="add">/wsp:All/{any}</el></label>
+ <def><p><phrase diff="add">Additional elements </phrase><rfc2119><phrase diff="add">MAY</phrase></rfc2119> <phrase diff="add">be specified. Such elements
+ </phrase><rfc2119><phrase diff="add">MUST NOT</phrase></rfc2119> <phrase diff="add">use the Web Services Policy language
+ XML namespace name and </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">parent element</phrase></emph><phrase diff="add">.</phrase></p></def></gitem>
+ </glist>
+
+ <note diff="add"><p><phrase diff="add">The </phrase><el diff="add">wsp:Policy element</el> <phrase diff="add">allows attribute extensibility to
+ accommodate the use of attributes specified in Section </phrase><specref ref="Policy_Identification"></specref><phrase diff="add">.
+ Otherwise, policy operators (</phrase><el diff="add">wsp:Policy</el> <phrase diff="add">, </phrase><el diff="add">wsp:All</el> <phrase diff="add">and
+ </phrase><el diff="add">wsp:ExactlyOne</el> <phrase diff="add">elements) do not allow attribute extensibility
+ because such attributes are not preserved through normalization.</phrase></p></note>
+
+
<p>The following rules are used to transform a compact policy expression into a normal form policy expression:</p>
<glist><gitem>
<label>Equivalence</label>
<def><p>Use of <el>wsp:Policy</el> as an operator within a policy expression is
equivalent to <el>wsp:All</el>.</p>
</def>
+ <def diff="add"><p>
+ <phrase diff="add">A collection of assertions in an </phrase><el diff="add">wsp:All</el> <phrase diff="add">operator is equivalent
+ to a </phrase><termref def="policy_alternative"><phrase diff="add">policy alternative</phrase></termref><phrase diff="add">. For instance,
+ </phrase></p>
+<eg xml:space="preserve" role="needs-numbering"><wsp:All>
+ <!-- assertion 1 -->
+ <!-- assertion 2 -->
+</wsp:All></eg>
+ <p><phrase diff="add">is equivalent to:</phrase></p>
+<eg xml:space="preserve" role="needs-numbering"><wsp:ExactlyOne>
+ <wsp:All>
+ <!-- assertion 1 -->
+ <!-- assertion 2 -->
+ </wsp:All>
+</wsp:ExactlyOne></eg>
+ </def>
</gitem>
<gitem>
<label>Empty</label>
@@ -1146,7 +1311,13 @@
<wsp:All><emph><!-- assertion 2 --><!-- assertion 4 --></emph></wsp:All>
</wsp:ExactlyOne></eg>
<p>Distributing <el>wsp:All</el> over an empty <el>wsp:ExactlyOne</el> is equivalent to no alternatives. For example,</p>
-<eg xml:space="preserve" role="needs-numbering"><wsp:All>
+<eg xml:space="preserve" role="needs-numbering"><phrase diff="add"><wsp:All>
+ <wsp:ExactlyOne />
+</wsp:All></phrase></eg>
+<p diff="add"><phrase diff="add">is equivalent to:</phrase></p>
+<eg xml:space="preserve" role="needs-numbering" diff="add"><wsp:ExactlyOne /></eg>
+<p diff="add"><phrase diff="add">and:</phrase></p>
+<eg xml:space="preserve" role="needs-numbering" diff="add"><wsp:All>
<wsp:ExactlyOne>
<emph> <!-- assertion 1 --></emph>
<emph> <!-- assertion 2 --></emph>
@@ -1158,7 +1329,7 @@
<p>For example, given the following compact policy expression:</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <sp:RequireDerivedKeys wsp:Optional="true" />
(03) <wsp:ExactlyOne>
(04) <sp:WssUsernameToken10 />
@@ -1176,7 +1347,7 @@
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All> <!-- @wsp:Optional alternative with assertion -->
(04) <sp:RequireDerivedKeys />
@@ -1196,7 +1367,7 @@
<p>Finally, noting that <el>wsp:Policy</el> is equivalent to <el>wsp:All</el>, and distributing <el>wsp:All</el> over <el>wsp:ExactlyOne</el> yields the following normal form policy expression:</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:ExactlyOne>
(03) <wsp:All>
(04) <sp:RequireDerivedKeys />
@@ -1245,7 +1416,7 @@
</gitem>
<gitem>
<label><att>/wsp:PolicyReference/@Digest</att></label>
- <def><p>This attribute is of type <att>xs:boolean</att> and specifies the digest of the referenced policy expression. This is used to ensure the included policy is the expected policy.
+ <def><p>This attribute is of type <att><phrase diff="chg">xs:base64Binary</phrase></att> and 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>
</gitem>
<gitem>
@@ -1262,7 +1433,7 @@
</thead>
<tbody>
<tr>
-<td rowspan="1" colspan="1"><code>http://www.w3.org/@@@@/@@/ws-policy/Sha1Exc</code> (implied)</td>
+<td rowspan="1" colspan="1"><code>http://www.w3.org/ns/ws-policy/Sha1Exc</code> (implied)</td>
<td rowspan="1" colspan="1">The digest is a SHA1 hash over the octet stream resulting from using the Exclusive XML canonicalization defined for XML Signature [<bibref ref="XML-Signature"></bibref>].</td>
</tr>
</tbody>
@@ -1298,7 +1469,7 @@
<p>In the example below two policies include and extend a common policy. In the first example there is a single policy document containing two policy assertions. The expression is given an identifier but not a fully qualified location. The second and third expressions reference the first expression by URI indicating the referenced expression is within the document. </p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="Protection" >
(02) <sp:EncryptSignature wsp:Optional="true" />
@@ -1307,20 +1478,59 @@
</eg>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <wsp:PolicyReference URI="#Protection" />
(03) <sp:OnlySignEntireHeadersAndBody />
(04) </wsp:Policy>
</eg>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
(02) <sp:IncludeTimestamp />
(03) <wsp:PolicyReference URI="#Protection" />
(04) <sp:OnlySignEntireHeadersAndBody />
(05) </wsp:Policy></eg>
<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>
+<div3 id="normalization" diff="add">
+ <head><phrase diff="add">Normalization</phrase></head>
+ <p><phrase diff="add">To interpret a compact </phrase><termref def="policy_expression"><phrase diff="add">expression</phrase></termref> <phrase diff="add">in an interoperable form,
+ a compact expression may be converted to the corresponding normal form
+ expression by the following procedure:</phrase></p>
+
+ <olist>
+ <item><p><phrase diff="add">Start with the Element Information Item E (as defined in the XML Information Set [</phrase><bibref ref="XMLInfoset"></bibref><phrase diff="add">]) of the
+ policy expression. The </phrase><emph role="infoset-property"><phrase diff="add">namespace
+ name</phrase></emph> <phrase diff="add">of E is always </phrase><code><phrase diff="add">"http://www.w3.org/ns/ws-policy"</phrase></code><phrase diff="add">. In the base case,
+ the </phrase><emph role="infoset-property"><phrase diff="add">local name</phrase></emph> <phrase diff="add">property of E is
+ </phrase><code><phrase diff="add">"Policy"</phrase></code><phrase diff="add">; in the recursive case, the </phrase><emph role="infoset-property"><phrase diff="add">local name</phrase></emph> <phrase diff="add">property of E is
+ </phrase><code><phrase diff="add">"Policy"</phrase></code><phrase diff="add">, </phrase><code><phrase diff="add">"ExactlyOne"</phrase></code><phrase diff="add">, or
+ </phrase><code><phrase diff="add">"All"</phrase></code><phrase diff="add">.</phrase></p></item>
+ <item><p><phrase diff="add">Expand Element Information Items (as defined in the XML Information Set [</phrase><bibref ref="XMLInfoset"></bibref><phrase diff="add">]) in the </phrase><emph role="infoset-property"><phrase diff="add">children</phrase></emph> <phrase diff="add">property of E that are policy
+ references per Section </phrase><specref ref="Policy_Inclusion"></specref><phrase diff="add">.</phrase></p></item>
+ <item><p><phrase diff="add">Convert each Element Information Item C in the </phrase><emph role="infoset-property"><phrase diff="add">children</phrase></emph> <phrase diff="add">property of E into normal
+ form.</phrase></p>
+ <olist>
+ <item><p><phrase diff="add">If the </phrase><emph role="infoset-property"><phrase diff="add">namespace name</phrase></emph>
+ <phrase diff="add">property of C is </phrase><code><phrase diff="add">"http://www.w3.org/ns/ws-policy"</phrase></code> <phrase diff="add">and the </phrase><emph role="infoset-property"><phrase diff="add">local
+ name</phrase></emph> <phrase diff="add">property of C is </phrase><code><phrase diff="add">"Policy"</phrase></code><phrase diff="add">,
+ </phrase><code><phrase diff="add">"ExactlyOne"</phrase></code><phrase diff="add">, or </phrase><code><phrase diff="add">"All"</phrase></code><phrase diff="add">, C is an expression
+ of a policy operator; normalize C by recursively applying this
+ procedure.</phrase></p></item>
+ <item><p><phrase diff="add">Otherwise the Element Information Item C is an assertion;
+ normalize C per Sections </phrase><specref ref="Optional_Policy_Assertions"></specref>
+ <phrase diff="add">and </phrase><specref ref="Policy_Assertion_Nesting"></specref><phrase diff="add">.</phrase></p></item>
+ </olist>
+ </item>
+ <item><p><phrase diff="add">Apply the policy operator indicated by E to the normalized
+ Element Information Items in its </phrase><emph role="infoset-property"><phrase diff="add">children</phrase></emph> <phrase diff="add">property and construct a
+ normal form per Section </phrase><specref ref="Policy_Operators"></specref> <phrase diff="add">and </phrase><specref ref="Normal_Form_Policy_Expression"></specref><phrase diff="add">.</phrase></p></item>
+ </olist>
+ <p><phrase diff="add">Note that an implementation may use a more efficient procedure and
+ is not required to explicitly convert a compact expression into the
+ normal form as long as the processing results are indistinguishable
+ from doing so.</phrase></p>
+</div3>
</div2>
<div2 id="ignorable-policy-assertions">
<head>Ignorable Policy Assertions</head>
@@ -1384,10 +1594,12 @@
<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 diff="add"><phrase diff="add">See Section </phrase><specref ref="rPolicy_Alternative"></specref> <phrase diff="add">for mechanisms for determining the aggregate
+ behavior indicated by multiple assertions of the same </phrase><termref def="policy_assertion_type"><phrase diff="add">policy assertion type</phrase></termref><phrase diff="add">.</phrase></p>
<p>As an example of intersection, consider two input policies in normal form:</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
<!-- Policy P1 -->
(02) <wsp:ExactlyOne>
(03) <wsp:All> <!-- Alternative A1 -->
@@ -1415,7 +1627,7 @@
<p>As this example illustrates, compatibility between two policy assertions is based on assertion type and delegates parameter processing to domain-specific processing.</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
<!-- Policy P2 -->
(02) <wsp:ExactlyOne>
(03) <wsp:All> <!-- Alternative A3 -->
@@ -1434,7 +1646,7 @@
<p>Because there is only one alternative (A2) in policy P1 with the same vocabulary — the assertions have the same type — as another alternative (A3) in policy P2, the intersection is a policy with a single alternative that contains all of the assertions in A2 and in A3.</p>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
<!-- Intersection of P1 and P2 -->
(02) <wsp:ExactlyOne>
(03) <wsp:All>
@@ -1476,11 +1688,11 @@
<head>Security Considerations</head>
<p>It is <rfc2119>RECOMMENDED</rfc2119> that <termref def="policy">policies</termref> and
-<termref def="policy_assertion">assertions</termref> be signed to prevent tampering.</p>
+<termref def="policy_assertion">assertions</termref> be <phrase diff="chg">integrity </phrase><phrase diff="add">protected </phrase>to <phrase diff="chg">permit </phrase><phrase diff="add">the detection of </phrase>tampering. <phrase diff="add">This can be done using a technology such as XML DSig [</phrase><bibref ref="XML-Signature" diff="add"></bibref><phrase diff="add">], SSL/TLS [</phrase><bibref ref="RFC2246" diff="add"></bibref><phrase diff="add">], or WS-Security 2004 [</phrase><bibref ref="WS-Security" diff="add"></bibref><phrase diff="add">].</phrase></p>
<p>Policies <rfc2119>SHOULD NOT</rfc2119> be accepted unless they are signed and have an
associated security token to specify the signer has the right to
-"speak for" the <termref def="policy_scope">scope</termref>containing the policy. That is, a relying party
+"speak for" the <termref def="policy_scope">scope</termref> containing the policy. That is, a relying party
shouldn't rely on a policy unless the policy is signed and presented
with sufficient credentials to pass the relying parties' acceptance
criteria.</p>
@@ -1546,31 +1758,31 @@
expressions, etc.</p>
<example id="ex-chained-policy-reference-elements">
<head>Chained Policy Reference Elements</head>
- <eg xml:space="preserve" role="needs-numbering"><Policy wsu:Id="p1">
- <PolicyReference URI="#p2"/ >
- <PolicyReference URI="#p2"/>
-</Policy>
+ <eg xml:space="preserve" role="needs-numbering"><phrase diff="chg"><wsp:Policy wsu:Id="p1">
+ <wsp:PolicyReference URI="#p2"/ >
+ <wsp:PolicyReference URI="#p2"/>
+</wsp:Policy>
-<Policy wsu:Id="p2" >
- <PolicyReference URI="#p3"/>
- <PolicyReference URI="#p3"/>
-</Policy>
+<wsp:Policy wsu:Id="p2" >
+ <wsp:PolicyReference URI="#p3"/>
+ <wsp:PolicyReference URI="#p3"/>
+</wsp:Policy>
-<Policy wsu:Id="p3" >
- <PolicyReference URI="#p4"/>
- <PolicyReference URI="#p4"/>
-</Policy>
+<wsp:Policy wsu:Id="p3" >
+ <wsp:PolicyReference URI="#p4"/>
+ <wsp:PolicyReference URI="#p4"/>
+</wsp:Policy>
<!-- Policy/@wsu:Id p4 through p99 -->
-<Policy wsu:Id="p100" >
- <PolicyReference URI="#p101"/>
- <PolicyReference URI="#p101"/>
-</Policy>
+<wsp:Policy wsu:Id="p100" >
+ <wsp:PolicyReference URI="#p101"/>
+ <wsp:PolicyReference URI="#p101"/>
+</wsp:Policy>
-<Policy wsu:Id="p101" >
+<wsp:Policy wsu:Id="p101" >
<mtom:OptimizedMimeSerialization />
-</Policy></eg>
+</wsp:Policy></phrase></eg>
</example>
<p>Malicious providers may provide a policy expression that includes multiple
PolicyReference elements that use a large number of different internet addresses. These
@@ -1587,7 +1799,7 @@
</div1>
<div1 id="Conformance">
<head>Conformance</head>
- <p>An element information item whose namespace name is "http://www.w3.org/@@@@/@@/ws-policy" and whose local part is Policy or PolicyReference conforms to this specification if it is valid according to the XML Schema [<bibref ref="XMLSchemaPart1"></bibref>] for that element as defined by this specification (<loc href="http://www.w3.org/@@@@/@@/ws-policy.xsd" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">http://www.w3.org/@@@@/@@/ws-policy.xsd</loc>) and additionally adheres to all the constraints contained in this specification. Such a conformant element information item constitutes a <termref def="policy_expression">policy expression</termref>.
+ <p>An element information item whose namespace name is "http://www.w3.org/ns/ws-policy" and whose local part is Policy or PolicyReference conforms to this specification if it is valid according to the XML Schema [<bibref ref="XMLSchemaPart1"></bibref>] for that element as defined by this specification (<loc href="http://www.w3.org/ns/ws-policy.xsd" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">http://www.w3.org/ns/ws-policy.xsd</loc>) and additionally adheres to all the constraints contained in this specification. Such a conformant element information item constitutes a <termref def="policy_expression">policy expression</termref>.
</p>
</div1>
</body>
@@ -1793,7 +2005,10 @@
J. Kahan and K. Lanz, Editors. World Wide Web
Consortium, 17 August 2006.
Available at http://www.w3.org/2006/04/c14n-note/c14n-note.html.
- </bibl>
+ </bibl>
+ <bibl key="IETF RFC 2246" href="http://www.ietf.org/rfc/rfc2246.txt" id="RFC2246" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple" diff="add"><phrase diff="add">IETF
+ "RFC 2246: The TLS Protocol", T. Dierks, C. Allen, January
+ 1999.</phrase></bibl>
<bibl id="SOAP11" key="SOAP 1.1" href="http://www.w3.org/TR/2000/NOTE-SOAP-20000508/" 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">Simple Object Access Protocol (SOAP)
1.1</titleref>, D. Box, et al, Editors. World Wide Web
@@ -2444,6 +2659,145 @@
<td rowspan="1" colspan="1" diff="add">Reset Section <specref ref="change-description"></specref>.
</td>
</tr>
+
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070116</td>
+ <td rowspan="1" colspan="1" diff="add">DBO</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/123" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">123</phrase></loc> and
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/115" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">115 </phrase></loc>
+ Resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4210" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4210</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070121</td>
+ <td rowspan="1" colspan="1" diff="add">MH</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/129" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">129</phrase></loc>
+ Resolution for namespace dereferencing issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4204" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4204</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070121</td>
+ <td rowspan="1" colspan="1" diff="add">MH</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/130" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">130</phrase></loc>
+ Resolution for editorial issues <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4205" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4205</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070121</td>
+ <td rowspan="1" colspan="1" diff="add">MH</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/132" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">132</phrase></loc>
+ Resolution for changing format of example and removing text. <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4224" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4224</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">MH</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/133" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">133</phrase></loc>
+ Resolution for editorial items. <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4225" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4225</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">PY</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/117" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">117</phrase></loc>
+ Resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4141" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4141</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">PY</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/120" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">120</phrase></loc>
+ Resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4142" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4142</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">PY</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/122" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">122</phrase></loc>
+ Resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4236" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4236</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">PY</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/125" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">125</phrase></loc>
+ Resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4177" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4177</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">PY</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/128" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">128</phrase></loc>
+ Resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4203" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4203</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">PY</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/127" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">127</phrase></loc>
+ Resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4197" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4197</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">ASV</td>
+ <td rowspan="1" colspan="1" diff="add">Implemented the resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4206" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4206</phrase></loc>.
+ Editors' action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/136" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">136</phrase></loc>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</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/2007Jan/0166.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 issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4138" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4138</phrase></loc>.
+ Editors' action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/140" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">140</phrase></loc>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</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/2007Jan/0173.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 issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4240" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4240</phrase></loc>.
+ Editors' action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/146" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">146</phrase></loc>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</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/2007Jan/0159.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 issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4235" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4235</phrase></loc>.
+ Editors' action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/147" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">147</phrase></loc>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070123</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/2007Jan/0186.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=4196" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4196</phrase></loc>
+ and <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4238" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4238</phrase></loc>.
+ Editors' action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/142" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">142</phrase></loc>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070123</td>
+ <td rowspan="1" colspan="1" diff="add">ASV</td>
+ <td rowspan="1" colspan="1" diff="add">Fixed a typo in <specref ref="Informative-References"></specref>: "[IETF RFC 3023]IETF "RFC 2246:".
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070123</td>
+ <td rowspan="1" colspan="1" diff="add">ASV</td>
+ <td rowspan="1" colspan="1" diff="add">Applied a <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4197#c2" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">missed
+ item </phrase></loc>(re
+ issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4197" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4197</phrase></loc>)
+ to section <specref ref="Extensibility"></specref>: Umit's amendment - "such as in Section
+ 4.3.4 Policy References" and other changes.
+ </td>
+ </tr>
</tbody>
</table>
Index: ws-policy-attachment-diff20061117.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment-diff20061117.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ws-policy-attachment-diff20061117.xml 8 Jan 2007 22:55:34 -0000 1.1
+++ ws-policy-attachment-diff20061117.xml 24 Jan 2007 05:00:33 -0000 1.2
@@ -150,7 +150,7 @@
<ulist>
<item>
<p>An element extensibility point is referred to using {any} in place of the element name. This
-indicates that any element name can be used, from any namespace other than the http://www.w3.org/@@@@/@@/ws-policy
+indicates that any element name can be used, from any namespace other than the http://www.w3.org/ns/ws-policy
namespace. </p>
</item>
<item>
@@ -255,7 +255,7 @@
<code>(none), wsp</code>
</td>
<td rowspan="1" colspan="1">
-<code>http://www.w3.org/@@@@/@@/ws-policy</code>
+<code>http://www.w3.org/ns/ws-policy</code>
</td>
<td rowspan="1" colspan="1">This specification</td>
</tr>
@@ -290,9 +290,9 @@
</table>
<p>
All information items defined by this specification
- are identified by the XML namespace URI [<bibref ref="XML-NS"></bibref>] http://www.w3.org/@@@@/@@/ws-policy. A <xspecref href="http://www.w3.org/@@@@/@@/ws-policy" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new">normative XML
+ are identified by the XML namespace URI [<bibref ref="XML-NS"></bibref>] http://www.w3.org/ns/ws-policy. A <xspecref href="http://www.w3.org/ns/ws-policy" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="new">normative XML
Schema</xspecref> [<bibref ref="XMLSchemaPart1"></bibref>, <bibref ref="XMLSchemaPart2"></bibref>] document can be obtained by
- dereferencing the XML namespace URI.</p>
+ dereferencing the <phrase diff="add">namespace document at the WS-Policy 1.5</phrase><phrase diff="del">XML </phrase>namespace URI.</p>
<p>
In this document reference is made to the <att>wsu:Id</att>
attribute in a utility schema (<loc href="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd</loc>). The
@@ -503,7 +503,7 @@
<head>Example RM Policy Expression.</head>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:rmp="http://docs.oasis-open.org/ws-rx/wsrmp/200602"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="RmPolicy" >
(02) <rmp:RMAssertion>
@@ -518,7 +518,7 @@
<head>Example X509 Security Policy Expression.</head>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="X509EndpointPolicy" >
(02) <sp:AsymmetricBinding>
@@ -590,13 +590,13 @@
at different points in a WSDL description that apply to one policy
subject, and other attachments may be made by UDDI and other
mechanisms.</p>
-<p>When multiple attachments are made, <termdef id="effective_policy" term="effective policy">the
-<term>effective policy</term>, for a given <termref def="policy_subject">policy subject</termref>, is the
+<p>When multiple attachments are made, <phrase diff="add">their relevent policies can be combined. </phrase><termdef id="effective_policy" term="effective policy"><phrase diff="chg">The
+</phrase><term>effective policy</term>, for a given <termref def="policy_subject">policy subject</termref>, is the
combination of relevant policies. The relevant policies are those
attached to <termref def="policy_scope">policy scopes</termref> that
contain the <termref def="policy_subject">policy subject</termref>.</termdef>
</p>
-<p>This combination can be achieved by: <termdef id="merge" term="merge">a <term>merge</term>
+<p>This combination can be achieved <phrase diff="add">through a</phrase><phrase diff="del">by: </phrase><phrase diff="add">merge. </phrase><termdef id="merge" term="merge"><phrase diff="chg">A </phrase><term>merge</term>
consists of serializing each policy as a
<termref def="policy_expression">policy expression</termref>, replacing their
<el>wsp:Policy</el> element with a
@@ -617,6 +617,10 @@
as part of their intrinsic definition. The second allows
policies to be associated with arbitrary policy subjects
independently from their definition.</p>
+ <p diff="add"><phrase diff="add">The </phrase><termref def="policy_scope"><phrase diff="add">policy scope</phrase></termref> <phrase diff="add">of an attachment is specific to the </phrase><termref def="policy_attachment"><phrase diff="add">policy attachment</phrase></termref>
+ <phrase diff="add">Mechanism using it. Accordingly, any </phrase><termref def="policy_attachment"><phrase diff="add">policy attachment</phrase></termref> <phrase diff="add">mechanism </phrase><rfc2119><phrase diff="add">MUST</phrase></rfc2119> <phrase diff="add">define
+ the </phrase><termref def="policy_scope"><phrase diff="add">policy scope</phrase></termref> <phrase diff="add">of the attachment.</phrase></p>
+
</div2>
<div2 id="XMLElementAttachement">
<head>XML Element Attachment</head>
@@ -638,7 +642,7 @@
</xs:simpleType>
</xs:attribute>
</xs:schema></eg>
-<p>The namespace URI [<bibref ref="XML-NS"></bibref>] for this attribute is <code>http://www.w3.org/@@@@/@@/ws-policy</code>.</p>
+<p>The namespace URI [<bibref ref="XML-NS"></bibref>] for this attribute is <code>http://www.w3.org/ns/ws-policy</code>.</p>
<p>The <att>wsp:PolicyURIs</att> attribute contains a white
space-separated list of one or more IRIs [<bibref ref="RFC3987"></bibref>]. When this attribute is used,
each of the values identifies a <termref def="policy_expression">policy expression</termref> as defined by
@@ -651,11 +655,11 @@
<term>element policy</term> is the <termref def="policy">policy</termref> attached to the <termref def="policy_subject">policy subjects</termref> associated with
the element information item that contains it.</termdef>
</p>
-<p>Note that the <termref def="policy_scope">policy scope</termref> of the attachment is specific to the
-<termref def="policy_attachment">policy attachment</termref> Mechanism using it; accordingly, any <termref def="policy_attachment">policy
-attachment</termref> mechanism using this attribute <rfc2119>MUST</rfc2119>
-define the <termref def="policy_scope">policy scope</termref> of the attachment.</p>
-<p>An example of <termref def="element_policy">element policy</termref> through the use of this global
+<p><phrase diff="del">Note that the policy scope of the attachment is specific to the
+policy attachment Mechanism using it; accordingly, any policy
+attachment mechanism using this attribute MUST
+define the policy scope of the attachment.
+</phrase>An example of <termref def="element_policy">element policy</termref> through the use of this global
attribute is given below using the sample policies stated in Section
<specref ref="Example"></specref>.</p>
<p>If the <termref def="policy">policies</termref> referenced by the following XML element</p>
@@ -667,24 +671,28 @@
whose XML 1.0 representation is listed in <specref ref="Table4"></specref>:</p>
<example id="Table4">
<head>Example Merged Policy Expression.</head>
-<eg xml:space="preserve">(01) <wsp:Policy
- xmlns:rmp="http://docs.oasis-open.org/ws-rx/wsrmp/200602"
- xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy" >
-(02) <rmp:RMAssertion>
-(03) <rmp:InactivityTimeout Milliseconds="600000" />
-(04) <rmp:BaseRetransmissionInterval Milliseconds="3000" />
-(05) <rmp:ExponentialBackoff />
-(06) <rmp:AcknowledgementInterval Milliseconds="200" />
-(07) </rmp:RMAssertion>
-(08) <sp:AsymmetricBinding>
-(09) <wsp:Policy>
-(10) <!-- Details omitted for readability -->
-(11) <sp:IncludeTimestamp />
-(12) <sp:OnlySignEntireHeadersAndBody />
-(13) </wsp:Policy>
-(14) </sp:AsymmetricBinding>
-(15) </wsp:Policy></eg>
+<eg xml:space="preserve"><phrase diff="chg">(01) <wsp:Policy
+ xmlns:rmp="http://docs.oasis-open.org/ws-rx/wsrmp/200602"
+ xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy" >
+(02) <wsp:All>
+(03) <rmp:RMAssertion>
+(04) <rmp:InactivityTimeout Milliseconds="600000" />
+(05) <rmp:BaseRetransmissionInterval Milliseconds="3000" />
+(06) <rmp:ExponentialBackoff />
+(07) <rmp:AcknowledgementInterval Milliseconds="200" />
+(08) </rmp:RMAssertion>
+(09) </wsp:All>
+(10) <wsp:All>
+(11) <sp:AsymmetricBinding>
+(12) <wsp:Policy>
+(13) <!-- Details omitted for readability -->
+(14) <sp:IncludeTimestamp />
+(15) <sp:OnlySignEntireHeadersAndBody />
+(16) </wsp:Policy>
+(17) </sp:AsymmetricBinding>
+(18) </wsp:All>
+(19) </wsp:Policy></phrase></eg>
</example>
<p>Note that this <termref def="element_policy">element policy</termref> has no meaningful IRI.</p>
<p>The presence of the <att>wsp:PolicyURIs</att> attribute does not
@@ -796,7 +804,7 @@
<el>/wsp:PolicyAttachment/wsse:Security</el>
</label>
<def>
- <p>This element is of type <att>xs:boolean</att> and allows security information such as
+ <p>This element is of type <att><phrase diff="chg">wsse:Security</phrase></att> and 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>
@@ -874,6 +882,12 @@
IRI or IRI References (such as endpoint, message or operation definitions) with which
<termref def="policy">policies</termref> can be associated. For example, URI domain expressions can be used
to identify WSDL 1.1 definitions, WSDL 2.0 components, etc.
+ <phrase diff="add">When a URI
+ domain expression identifies multiple resources, i.e. WSDL 1.1 supports multiple
+ operations with the same name (sometimes called operation name overloading),
+ the Policy applies to all the resources that are identified.
+ </phrase></p>
+ <p diff="add">
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 [<bibref ref="WSDL20"></bibref>]. The following
@@ -888,8 +902,17 @@
<p>In this example, the <termref def="policy_expression">policy expression</termref> at
<code>http://www.example.com/policies#RmPolicy</code> applies to all interactions with
the endpoint at <code>http://example.org/TicketAgent.wsdl20#wsdl.endpoint(TicketAgentService/Endpoint)</code>.
- Similarly, an XPointer [<bibref ref="XPointer"></bibref>] can be used as an
- IRI Reference to identify a description in a WSDL 1.1 [<bibref ref="WSDL11"></bibref>] document.</p>
+ </p>
+ <p diff="add">
+ <phrase diff="add">IRI</phrase><phrase diff="del">Similarly, </phrase><phrase diff="chg">References for </phrase><phrase diff="add">WSDL</phrase><phrase diff="del">[] </phrase><phrase diff="chg">1.1 elements are defined </phrase><phrase diff="add">in</phrase><phrase diff="del">an
+ IRI </phrase><phrase diff="chg">WSDL 1.1 Element </phrase><phrase diff="add">Identifiers
+ [</phrase><bibref ref="WSDL11EI"></bibref><phrase diff="add">].
+ </phrase></p>
+ <p diff="add">
+ <phrase diff="add">The</phrase><phrase diff="del">a </phrase><phrase diff="chg">scope of </phrase><phrase diff="add">URI domain</phrase><phrase diff="del">a </phrase><phrase diff="add">expressions for WSDL 2.0 components or </phrase>WSDL 1.1
+ <phrase diff="add">elements is</phrase><phrase diff="del">[] </phrase><phrase diff="add">limited to the subjects defined in
+ Section </phrase><specref ref="ws-policy-attachment-for-wsdl20"></specref> <phrase diff="add">and
+ </phrase><specref ref="AttachingPolicyUsingWSDL1.1"></specref><phrase diff="add">.</phrase><phrase diff="del">document.</phrase></p>
</div3>
</div2>
@@ -905,41 +928,80 @@
</div1>
<div1 id="AttachingPolicyUsingWSDL1.1">
<head>Attaching Policies Using WSDL 1.1</head>
-<p>The <rfc2119>RECOMMENDED</rfc2119> means of associating a <termref def="policy">policy</termref>
-with a <termref def="policy_subject">policy subject</termref> that has a WSDL 1.1 [<bibref ref="WSDL11"></bibref>]
-description is to attach a reference to the <termref def="policy">policy</termref> within the WSDL
-component corresponding to the target <termref def="policy_subject">policy subject</termref>. </p>
-<p>WSDL 1.1 disallows the use of extensibility elements on certain
-elements and the use of extensibility attributes on others. However,
-the WS-I Basic Profile 1.1 [<bibref ref="BP11"></bibref>] overrules this
-restriction and allows element extensibility everywhere. Therefore,
-the <termref def="policy">policy</termref> reference <rfc2119>SHOULD</rfc2119> be attached using
-<el>wsp:PolicyReference</el> as child element unless it is
-absolutely necessary to maintain the original WSDL 1.1 restriction, in
-which case the <att>@wsp:PolicyURIs</att> attribute MAY be used
-for the following WSDL elements:</p>
+ <p diff="add">
+ <phrase diff="add">This section describes a mechanism for associating policy expressions with Web service constructs in WSDL 1.1 [</phrase><bibref ref="WSDL11"></bibref><phrase diff="add">].
+ The mechanism consists of:
+ </phrase></p>
+ <ulist diff="add">
+ <item>
+
+<p><phrase diff="add">A model for attaching policies to WSDL 1.1 constructs. </phrase>The <phrase diff="add">model defines:
+ </phrase><ulist>
+ <item>
+ <p><phrase diff="add">A</phrase><phrase diff="del">RECOMMENDED </phrase><phrase diff="chg">partitioning </phrase>of <phrase diff="add">WSDL constructs into service, endpoint, operation
+ and</phrase><phrase diff="del">associating </phrase><phrase diff="add">message policy subjects.
+ </phrase></p>
+ </item>
+ <item><p>
+ <phrase diff="add">The semantics of attaching </phrase>a <termref def="policy">policy</termref>
+ <phrase diff="chg">to each </phrase><termref def="policy_subject">policy subject</termref>
+</p></item>
+ <item><p>
+ <phrase diff="add">How </phrase><phrase diff="chg">to combine policies attached to </phrase><phrase diff="add">more</phrase><phrase diff="del">[]
+description </phrase><phrase diff="chg">than one </phrase><phrase diff="add">WSDL construct
+ within</phrase><phrase diff="del">attach </phrase>a <phrase diff="chg">single policy </phrase><phrase diff="add">subject.
+ </phrase></p></item>
+ </ulist></p>
+ </item>
+ <item><p>
+ <phrase diff="add">An</phrase><phrase diff="del">the </phrase><phrase diff="add">XML representation of </phrase>policy <phrase diff="chg">expressions </phrase><phrase diff="add">attached to</phrase><phrase diff="del">the </phrase>WSDL
+<phrase diff="del">component </phrase><phrase diff="chg">1.1 </phrase><phrase diff="add">constructs.
+ </phrase></p></item>
+ <item><p>
+ <phrase diff="add">The</phrase><phrase diff="del">to </phrase><phrase diff="chg">annotation of </phrase><phrase diff="add">such </phrase>policy <phrase diff="add">expressions as required extensions using the
+ WSDL-defined extensibility flag</phrase><phrase diff="del">subject. </phrase><att><phrase diff="add">@wsdl:required</phrase></att><phrase diff="add">.
+ </phrase></p></item>
+ </ulist>
+
+<p>
+ WSDL 1.1 disallows the use of extensibility elements on certain elements and
+ the use of extensibility attributes on others. However, the WS-I Basic Profile 1.1
+ [<bibref ref="BP11"></bibref>] overrules this restriction and allows element extensibility everywhere.
+
+ Therefore, <phrase diff="add">when attaching a reference directly to
+</phrase>the <phrase diff="add">WSDL element</phrase><phrase diff="del">policy </phrase><phrase diff="add">the policy
+
+ </phrase>reference SHOULD be attached using <el>wsp:PolicyReference</el> as child element unless
+ it
+
+ is absolutely necessary to maintain the original WSDL 1.1 restriction, in
+<phrase diff="del">which </phrase><phrase diff="add">which
+
+ </phrase>case the <att>@wsp:PolicyURIs</att> attribute MAY be used for the following WSDL elements:
+
<ulist>
-<item>
+ <item>
<p>
-<el>wsdl11:portType</el>
-</p>
+ <el>wsdl11:portType</el>
+ </p>
</item>
-<item>
-<p>
-<el>wsdl11:portType/wsdl11:operation/wsdl11:input</el>
-</p>
+ <item>
+ <p>
+ <el>wsdl11:portType/wsdl11:operation/wsdl11:input</el>
+ </p>
</item>
-<item>
-<p>
-<el>wsdl11:portType/wsdl11:operation/wsdl11:output</el>
-</p>
+ <item>
+ <p>
+ <el>wsdl11:portType/wsdl11:operation/wsdl11:output</el>
+ </p>
</item>
-<item>
-<p>
-<el>wsdl11:portType/wsdl11:operation/wsdl11:fault</el>
-</p>
+ <item>
+ <p>
+ <el>wsdl11:portType/wsdl11:operation/wsdl11:fault</el>
+ </p>
</item>
-</ulist>
+ </ulist>
+</p>
<p>If it is necessary to include the actual <termref def="policy_expression">policy expressions</termref> within
the WSDL description itself, it is <rfc2119>RECOMMENDED</rfc2119> that
their <el>wsp:Policy</el> elements be included as children of
@@ -1194,7 +1256,7 @@
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:wsoap12="http://schemas.xmlsoap.org/wsdl/soap12/"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" >
(02) <wsp:Policy wsu:Id="RmPolicy" >
(03) <rmp:RMAssertion>
@@ -1253,7 +1315,7 @@
<head>Example Message Security Policy Expression.</head>
<eg xml:space="preserve">(01) <wsp:Policy
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wsp="http://www.w3.org/@@@@/@@/ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
wsu:Id="SecureMessagePolicy" >
(02) <sp:SignedParts>
@@ -1289,8 +1351,11 @@
</p>
</item>
<item>
-<p>An XML representation of policy expressions attached to WSDL 2.0 constructs
- and annotating those policy expressions as required extensions using the
+<p>An XML representation of policy expressions attached to WSDL 2.0 <phrase diff="add">constructs.</phrase></p>
+ </item>
+ <item diff="add"><p>
+ <phrase diff="add">The</phrase><phrase diff="del">constructs
+ and </phrase><phrase diff="chg">annotation </phrase><phrase diff="add">of such</phrase><phrase diff="del">those </phrase>policy expressions as required extensions using the
WSDL-defined extensibility flag <code>@wsdl20:required</code>.</p>
</item>
</ulist>
@@ -1302,23 +1367,23 @@
<p>The example below illustrates the use of WS-Policy Attachment for WSDL 2.0:</p>
<example id="table-wsdl20-example">
<head>Example Policy Attached to WSDL 2.0</head>
-<eg xml:space="preserve">(01) <wsdl20:description>
+<eg xml:space="preserve"><phrase diff="chg">(01) <wsdl20:description>
(02) …
-(03) <Policy wsu:Id="common">
+(03) <wsp:Policy wsu:Id="common">
(04) <mtom:OptimizedMimeSerialization wsp:Optional="true"/>
(05) <wsap:UsingAddressing />
-(06) </Policy>
+(06) </wsp:Policy>
-(07) <Policy wsu:Id="secure">
-(08) <ExactlyOne>
+(07) <wsp:Policy wsu:Id="secure">
+(08) <wsp:ExactlyOne>
(09) <sp:TransportBinding>…</sp:TransportBinding>
(10) <sp:AsymmetricBinding>…</sp:AsymmetricBinding >
-(11) </ExactlyOne>
-(12) </Policy>
+(11) </wsp:ExactlyOne>
+(12) </wsp:Policy>
(13) <wsdl20:binding name="SecureBinding"
(14) interface="tns:RealTimeDataInterface" >
-(15) <PolicyReference URI="#secure" />
+(15) <wsp:PolicyReference URI="#secure" />
(16) <wsdl20:operation name="GetRealQuote" >…</wsdl20:operation>
(17) …
(18) </wsdl20:binding>
@@ -1327,12 +1392,12 @@
(20) interface="tns:RealTimeDataInterface" >
(21) <wsdl20:endpoint name="RealTimeDataPort"
(22) binding="tns:SecureBinding">
-(23) <PolicyReference URI="#common" />
+(23) <wsp:PolicyReference URI="#common" />
(24) …
(25) </wsdl20:endpoint>
(26) </wsdl20:service>
(27) …
-(28) </wsdl20:description></eg>
+(28) </wsdl20:description></phrase></eg>
</example>
<p>The <code>SecureBinding</code> WSDL binding description describes a binding for
an interface that provides real-time quotes and book information on securities.
@@ -1359,20 +1424,20 @@
<termref def="effective_policy">effective policy</termref> for the <code>RealTimeDataPort</code> endpoint.</p>
<example id="table-wsdl20-effective-policy-example">
<head>Effective Policy for the RealTimeDataPort endpoint</head>
-<eg xml:space="preserve">(01) <Policy>
-(02) <All>
-(03) <Policy>
+<eg xml:space="preserve"><phrase diff="chg">(01) <wsp:Policy>
+(02) <wsp:All>
+(03) <wsp:Policy>
(04) <mtom:OptimizedMimeSerialization wsp:Optional="true"/>
(05) <wsap:UsingAddressing />
-(06) </Policy>
-(07) <Policy>
-(08) <ExactlyOne>
+(06) </wsp:Policy>
+(07) <wsp:Policy>
+(08) <wsp:ExactlyOne>
(09) <sp:TransportBinding>…</sp:TransportBinding>
(10) <sp:AsymmetricBinding>…</sp:AsymmetricBinding >
-(11) </ExactlyOne>
-(12) </Policy>
-(13) </All>
-(14) </Policy></eg>
+(11) </wsp:ExactlyOne>
+(12) </wsp:Policy>
+(13) </wsp:All>
+(14) </wsp:Policy></phrase></eg>
</example>
</div2>
<div2 id="attaching-policy-expressions">
@@ -1459,8 +1524,8 @@
</p>
</item>
</ulist>
-<p>Any of these elements <rfc2119>MAY</rfc2119> have one or more <code>Policy</code> or
- <code>PolicyReference</code> child elements.</p>
+<p>Any of these elements <rfc2119>MAY</rfc2119> have one or more <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> child elements.</p>
<p>Policy attachment points in a WSDL document are associated with specific <termref def="policy_subject">policy subjects</termref>
as described in the table below. There are four <termref def="policy_subject">policy subjects</termref> in
WSDL: the service policy subject, the endpoint policy subject, the operation
@@ -1639,20 +1704,20 @@
<p>The common mechanism of associating a <termref def="policy_expression">policy expression</termref> with a <termref def="policy_subject">policy subject</termref> is
to attach a reference to the <termref def="policy_expression">policy expression</termref> to the <termref def="policy_subject">policy subject</termref>. As
described in the WS-Policy specification [<bibref ref="WS-Policy"></bibref>], a reference to a <termref def="policy_expression">policy expression</termref> is
- represented using the <code>PolicyReference</code> element. A policy attachment
- to a WSDL element is represented by attaching a <code>PolicyReference</code>
+ represented using the <code><phrase diff="chg">wsp:PolicyReference</phrase></code> element. A policy attachment
+ to a WSDL element is represented by attaching a <code><phrase diff="chg">wsp:PolicyReference</phrase></code>
element as a child element of the WSDL element.</p>
<p>
<termref def="policy_expression">Policy expressions</termref> can be included within a WSDL document or may reside external
to a WSDL document. If including <termref def="policy_expression">policy expressions</termref> with a WSDL document is the
- chosen approach, it is <rfc2119>RECOMMENDED</rfc2119> that the <code>Policy</code> elements are
+ chosen approach, it is <rfc2119>RECOMMENDED</rfc2119> that the <code><phrase diff="chg">wsp:Policy</phrase></code> elements are
included as children of the <code>wsdl20:description</code> element after the
<code>wsdl20:types</code> element and referenced using the
- <code>PolicyReference</code> elements.</p>
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements.</p>
<p>To mandate the processing of a <termref def="policy_expression">policy expression</termref> attached to a policy attachment
point in a WSDL document, the expression <rfc2119>MUST</rfc2119> be marked as required using the
<code>@wsdl20:required</code> flag.</p>
-<p>If the <code>Policy</code> elements are included as children of the
+<p>If the <code><phrase diff="chg">wsp:Policy</phrase></code> elements are included as children of the
<code>wsdl20:description</code> element, these Policy elements <rfc2119>MUST NOT</rfc2119> be
marked as required using the <code>@wsdl20:required</code>. (Note: these
<termref def="policy_expression">policy expressions</termref> may be included as children of the <code>wsdl20:description</code>
@@ -1716,43 +1781,43 @@
<tbody>
<tr>
<td rowspan="1" colspan="1">Service</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the <code>wsdl20:service</code>
element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Endpoint</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the <code>wsdl20:endpoint</code>
element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Binding</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the <code>wsdl20:binding</code>
element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Binding Operation</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:binding/wsdl20:operation</code> element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Binding Fault</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:binding/wsdl20:fault</code> element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Binding Message Reference</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:binding/wsdl20:operation/wsdl20:input</code> or
<code>wsdl20:binding/wsdl20:operation/wsdl20:output</code>
@@ -1760,8 +1825,8 @@
</tr>
<tr>
<td rowspan="1" colspan="1">Binding Fault Reference</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:binding/wsdl20:operation/wsdl20:infault</code>
or <code>wsdl20:binding/wsdl20:operation/wsdl20:outfault</code>
@@ -1769,30 +1834,30 @@
</tr>
<tr>
<td rowspan="1" colspan="1">Interface</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the <code>wsdl20:interface</code>
element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Interface Operation</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:interface/wsdl20:operation</code> element, if
any.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Interface Fault</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:interface/wsdl20:fault</code> element.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">Interface Message Reference</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:interface/wsdl20:operation/wsdl20:input</code>
or <code>wsdl20:interface/wsdl20:operation/wsdl20:output</code>
@@ -1800,8 +1865,8 @@
</tr>
<tr>
<td rowspan="1" colspan="1">Interface Fault Reference</td>
-<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code>Policy</code> or
- <code>PolicyReference</code> elements, if any, in the
+<td rowspan="1" colspan="1">A <termref def="policy">policy</termref> corresponding to the <termref def="merge">merge</termref> of <code><phrase diff="chg">wsp:Policy</phrase></code> or
+ <code><phrase diff="chg">wsp:PolicyReference</phrase></code> elements, if any, in the
<code>[children]</code> of the
<code>wsdl20:interface/wsdl20:operation/wsdl20:infault</code>
or
@@ -2379,8 +2444,7 @@
</div1>
<div1 id="SecurityConsiderations">
<head>Security Considerations</head>
-<p>It is <rfc2119>RECOMMENDED</rfc2119> that <termref def="policy_attachment">policy attachments</termref> be
-signed to prevent tampering. This also provides a mechanism for
+<p>It is <rfc2119>RECOMMENDED</rfc2119> that <termref def="policy_attachment">policy attachments</termref> be <phrase diff="chg">integrity </phrase><phrase diff="add">protected </phrase>to <phrase diff="add">permit the detection of</phrase><phrase diff="del">prevent </phrase>tampering. <phrase diff="add">This can be done using a technology such as XML DSig [</phrase><bibref ref="XML-Signature" diff="add"></bibref><phrase diff="add">], SSL/TLS [</phrase><bibref ref="RFC2246" diff="add"></bibref><phrase diff="add">], or WS-Security 2004 [</phrase><bibref ref="WS-Security" diff="add"></bibref><phrase diff="add">]. </phrase>This also provides a mechanism for
authenticating <termref def="policy_attachment">policy attachments</termref> by determining if the signer has the
right to "speak for" the scope of the <termref def="policy_attachment">policy attachment</termref>.</p>
<p>Policies <rfc2119>SHOULD NOT</rfc2119> be accepted unless they are
@@ -2395,7 +2459,7 @@
<head>Conformance</head>
<div2>
<head>External Policy Attachment Conformance</head>
-<p>An element information item whose namespace name is "http://www.w3.org/@@@@/@@/ws-policy" and whose local part is PolicyAttachment conforms to this specification if it is valid according to the XML Schema [<bibref ref="XMLSchemaPart1"></bibref>] for that element as defined by this specification (<loc href="http://www.w3.org/@@@@/@@/ws-policy.xsd" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">http://www.w3.org/@@@@/@@/ws-policy.xsd</loc>) and additionally adheres to all the constraints contained in Section <specref ref="ExternalPolicyAttachment"></specref> of this specification. Such a conformant element information item constitutes an external policy attachment. </p>
+<p>An element information item whose namespace name is "http://www.w3.org/ns/ws-policy" and whose local part is PolicyAttachment conforms to this specification if it is valid according to the XML Schema [<bibref ref="XMLSchemaPart1"></bibref>] for that element as defined by this specification (<loc href="http://www.w3.org/ns/ws-policy.xsd" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace">http://www.w3.org/ns/ws-policy.xsd</loc>) and additionally adheres to all the constraints contained in Section <specref ref="ExternalPolicyAttachment"></specref> of this specification. Such a conformant element information item constitutes an external policy attachment. </p>
</div2>
<div2>
<head>WSDL 1.1 Attachment Conformance</head>
@@ -2588,6 +2652,15 @@
<div2 id="Informative-References">
<head>Other References</head>
<blist>
+
+ <bibl key="IETF RFC 2246" href="http://www.ietf.org/rfc/rfc2246.txt" id="RFC2246" xlink:actuate="onRequest" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:show="replace" xlink:type="simple" diff="add"><phrase diff="add">IETF
+ "RFC 2246: The TLS Protocol", T. Dierks, C. Allen, January
+ 1999.</phrase></bibl>
+ <bibl id="WSDL11EI" key="WSDL11 ElementIds" href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/wsdl11elementidentifiers.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">WSDL 1.1 Element Identifiers</phrase></titleref>
+ <phrase diff="add">D. Orchard, Editor. World Wide Web Consortium, 15 November 2006.
+ TBD: URI
+ </phrase></bibl>
<bibl key="MTOM" id="MTOM" href="http://www.w3.org/TR/2005/REC-soap12-mtom-20050125/" 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">SOAP Message Transmission Optimization Mechanism</titleref>, M. Gudgin, N.
Mendelsohn, M. Nottingham and H. Ruellan, Editors. World Wide Web Consortium, 25 January
@@ -3237,7 +3310,7 @@
</tr>
<tr diff="add">
<td rowspan="1" colspan="1" diff="add">20061218</td>
- <td rowspan="1" colspan="1" diff="add">FH</td>
+ <td rowspan="1" colspan="1" diff="add">FJH</td>
<td rowspan="1" colspan="1" diff="add">Implemented the
<loc href="http://www.w3.org/2006/12/13-ws-policy-irc#T17-45-16" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution</phrase></loc> for issue
<loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4039" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4039</phrase></loc> to close editors' action
@@ -3258,8 +3331,78 @@
<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">20070116</td>
+ <td rowspan="1" colspan="1" diff="add">DBO</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/116" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">116</phrase></loc> and
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/124" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">124</phrase></loc>
+ Resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4211" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4211</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070117</td>
+ <td rowspan="1" colspan="1" diff="add">FJH</td>
+ <td rowspan="1" colspan="1" diff="add">Applied the resolution for issues 4045 and 4127 using <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4045#c2" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">first</phrase></loc>
+ and <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4045#c3" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">second</phrase></loc> parts as outlined in working group
+ <loc href="http://www.w3.org/2007/01/17-ws-policy-irc#T22-50-02" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">resolution</phrase></loc>. This closes editors actions
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/139" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">139</phrase></loc> and
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/111" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">111</phrase></loc>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070121</td>
+ <td rowspan="1" colspan="1" diff="add">MH</td>
+ <td rowspan="1" colspan="1" diff="add">Completed action item:
+ <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/129" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">129</phrase></loc>
+ Resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4207" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4207</phrase></loc></td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">ASV</td>
+ <td rowspan="1" colspan="1" diff="add">Implemented the resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4230" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4230</phrase></loc>.
+ Editors' action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/135" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">135</phrase></loc>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">UY</td>
+ <td rowspan="1" colspan="1" diff="add">Implemented the resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4209" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4209</phrase></loc>.
+ Editors' action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/131" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">131</phrase></loc>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070122</td>
+ <td rowspan="1" colspan="1" diff="add">UY</td>
+ <td rowspan="1" colspan="1" diff="add">Implemented the resolution for issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4226" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4226</phrase></loc>.
+ Editors' action <loc href="http://www.w3.org/2005/06/tracker/wspolicyeds/actions/134" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">134</phrase></loc>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070123</td>
+ <td rowspan="1" colspan="1" diff="add">ASV</td>
+ <td rowspan="1" colspan="1" diff="add">Applied <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4045#c3" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">missed
+ items </phrase></loc>(re
+ issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4045" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4045</phrase></loc>)
+ to section <specref ref="uri-domain-expression"></specref> and <specref ref="ws-policy-attachment-for-wsdl20"></specref>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070123</td>
+ <td rowspan="1" colspan="1" diff="add">ASV</td>
+ <td rowspan="1" colspan="1" diff="add">Applied a <loc href="http://lists.w3.org/Archives/Public/public-ws-policy/2007Jan/0124.html" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">missed
+ item </phrase></loc>(re
+ issue <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=4226" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:actuate="onRequest" xlink:show="replace"><phrase diff="add">4226</phrase></loc>)
+ to section <specref ref="ws-policy-attachment-for-wsdl20"></specref>: added wsp prefix to <specref ref="table-wsdl20-effective-policy-example"></specref>
+ and all occurrences of <el diff="add">Policy</el> and <el diff="add">PolicyReference</el>.
+ </td>
+ </tr>
+ <tr diff="add">
+ <td rowspan="1" colspan="1" diff="add">20070123</td>
+ <td rowspan="1" colspan="1" diff="add">ASV</td>
+ <td rowspan="1" colspan="1" diff="add">Fixed a typo in <specref ref="Informative-References"></specref>: "[IETF RFC 3023]IETF "RFC 2246:".
+ </td>
+ </tr>
</tbody>
</table>
</inform-div1>
Received on Wednesday, 24 January 2007 05:01:08 UTC