2006/ws/policy build.xml,1.4,1.5 changelog.xml,1.2,1.3 entities.dtd,1.3,1.4 entitiesedcopy.dtd,1.3,1.4 entitieswd.dtd,1.2,1.3 ws-policy-attachment.html,1.29,1.30 ws-policy-framework.html,1.19,1.20

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

Modified Files:
	build.xml changelog.xml entities.dtd entitiesedcopy.dtd 
	entitieswd.dtd ws-policy-attachment.html 
	ws-policy-framework.html 
Log Message:
Added support for the primer

Index: entitieswd.dtd
===================================================================
RCS file: /sources/public/2006/ws/policy/entitieswd.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- entitieswd.dtd	12 Jul 2006 20:35:13 -0000	1.2
+++ entitieswd.dtd	16 Aug 2006 18:21:13 -0000	1.3
@@ -13,12 +13,14 @@
 
 <!ENTITY framework.prefix "ws-policy-framework">
 <!ENTITY attachment.prefix "ws-policy-attachment">
+<!ENTITY primer.prefix "ws-policy-primer">
 
 <!ENTITY w3c.tr.latest  "http://www.w3.org/TR">	
 
 <!-- Latest version links. don't touch -->
 <!ENTITY framework.latest "&w3c.tr.latest;/&framework.prefix;">
 <!ENTITY attachment.latest "&w3c.tr.latest;/&attachment.prefix;">
+<!ENTITY primer.latest "&w3c.tr.latest;/&primer.prefix;">
 
 
 <!ENTITY w3c.tr  "&w3c.tr.latest;/&draft.year;">	
@@ -32,6 +34,8 @@
   "&w3c.tr.latest;/&draft.year;/&w3c.status;-&framework.prefix;-&draft.date;">
 <!ENTITY w3c-designation-attachment
   "&w3c.tr.latest;/&draft.year;/&w3c.status;-&attachment.prefix;-&draft.date;">
+<!ENTITY w3c-designation-primer
+  "&w3c.tr.latest;/&draft.year;/&w3c.status;-&primer.prefix;-&draft.date;">
 
 
 <!ENTITY altlocs

Index: build.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build.xml	14 Jul 2006 14:07:41 -0000	1.4
+++ build.xml	16 Aug 2006 18:21:13 -0000	1.5
@@ -8,6 +8,7 @@
 	<target name="clean">
 		<delete quiet="true" file="ws-policy-framework.html"/>
 		<delete quiet="true" file="ws-policy-attachment.html"/>
+		<delete quiet="true" file="ws-policy-primer.html"/>
 	</target>
 
 	<target name="validate-xsl" description="Validates all XML files.">
@@ -39,6 +40,10 @@
 			force="yes">
 			<param name="status" expression="ed-copy"/>
 		</xslt>
+		<xslt style="${stylesheet}" in="ws-policy-primer.xml" out="ws-policy-primer.html"
+			force="yes">
+			<param name="status" expression="ed-copy"/>
+		</xslt>
 	</target>
 
 	<target name="changelog" description="Generate XML out of the CVS change log">

Index: ws-policy-attachment.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ws-policy-attachment.html	14 Aug 2006 00:10:44 -0000	1.29
+++ ws-policy-attachment.html	16 Aug 2006 18:21:13 -0000	1.30
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en-US"><head><META http-equiv="Content-Type" content="text/html; charset=utf-8"><title>Web Services Policy 1.5 - Attachment</title><style type="text/css">
 code           { font-family: monospace; }
 
@@ -47,7 +47,7 @@
 div.exampleWrapper { margin: 4px }
 div.exampleHeader { font-weight: bold;
                     margin: 4px}
-</style><link type="text/css" rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/base.css"><link href="#contents" rel="contents"></head><body>
+</style><link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/base.css"><link rel="contents" href="#contents"></head><body>
   <div class="head">
 <h1>Web Services Policy 1.5 - Attachment</h1>
 <h2>Editors' copy $Date$ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
@@ -75,7 +75,7 @@
         no official standing.</strong></p><p></p></div>
   <hr><div class="toc">
 <h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#tocRange">Introduction</a><br>2. <a href="#NotationsTerminology">Notations and Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.1 <a href="#NotationalConventions">Notational Conventions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.2 <a href="#XMLNamespaces">XML Namespaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.3 <a href="#Glossary">Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.4 <a href="#Example">Example</a><br>3. <a href="#rPolicyAttachment">Policy Attachment</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.1 <a href="#rEffectivePolicy">Effective Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.2 <a href="#PolicyAttachmentMechanisms">Policy Attachment Mechanisms</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.3 <a href="#XMLElementAttachement">XML Element Attachment</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.4 <a href="#ExternalPolicyAttachment">External Policy Attachment</a><br>4. <a href="#AttachingPolicyUsingWSDL1.1">Attaching Policies Using WSDL 1.1</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.1 <a href="#CaculatingEffectivyPolicywithWSDL1.1">Calculating Effective Policy in WSDL 1.1</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.1 <a href="#ServicePolicySubject">Service Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.2 <a href="#EndpointPolicySubject">Endpoint Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.3 <a href="#OperationPolicySubject">Operation Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.4 <a href="#MessagePolicySubject">Message Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.5 <a href="#Example2">Example</a><br>5. <a href="#AttachingPoliciesUsingUDDI">Attaching Policies Using UDDI</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.1 <a href="#CalculatingEffectivePolicyElementPolicyUDDI">Calculating Effective Policy and Element Policy in UDDI</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.1.1 <a href="#ServiceProviderPolicySubjectUDDI">Service Provider Policy Subject</a><br>&nbsp;&nbsp;&nbsp;nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.1.2 <a href="#ServicePolicySubjectUDDI">Service Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.1.3 <a href="#EndpointPolicySubjectUDDI">Endpoint Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.2 <a href="#ReferencingRemotePolicyExpressions">Referencing Remote Policy Expressions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.3 <a href="#RegisteringReusablePolicyExpressions">Registering Reusable Policy Expressions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;5.4 <a href="#RegisteringPoliciesUDDIVersion3">Registering Policies in UDDI Version 3</a><br>6. <a href="#SecurityConsiderations">Security Considerations</a><br></p>
-<h3><a id="appendix" name="appendix">Appendices</a></h3><p class="toc">A. <a href="#References">References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.1 <a href="#Normative-References">Normative References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.2 <a href="#Informative-References">Other References</a><br>B. <a href="#AppendixA">UDDI tModel Definitions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.1 <a href="#RemotePolicyReferenceCategorySystem">Remote Policy Reference Category System</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.1.1 <a href="#DesigGoals1">Design Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.1.2 <a href="#tModelDefinition1">tModel Definition</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.1.3 <a href="#ModelStructure1">tModel Structure</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.2 <a href="#WS-PolicyTypesCategorySystem">Web Services Policy Types Category System</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.2.1 <a href="#DesignGoals2">Design Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&bsp;&nbsp;&nbsp;B.2.2 <a href="#tModelDefinition2">tModel Definition</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.2.3 <a href="#ModelStructure2">tModel Structure</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.3 <a href="#LocalPolicyReferenceCategorySystem">Local Policy Reference Category System</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.3.1 <a href="#DesignGoals3">Design Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.3.2 <a href="#tModelDefinition3">tModel Definition</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.3.3 <a href="#ModelStructure3">tModel Structure</a><br>C. <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br>D. <a href="#change-description">Changes in this Version of the Document</a> (Non-Normative)<br>E. <a href="#change-log">Web Services Policy 1.5 - Attachment Change Log</a> (Non-Normative)<br></p></div><hr><div class="body">
+<h3><a name="appendix" id="appendix">Appendices</a></h3><p class="toc">A. <a href="#References">References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.1 <a href="#Normative-References">Normative References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.2 <a href="#Informative-References">Other References</a><br>B. <a href="#AppendixA">UDDI tModel Definitions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.1 <a href="#RemotePolicyReferenceCategorySystem">Remote Policy Reference Category System</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.1.1 <a href="#DesigGoals1">Design Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.1.2 <a href="#tModelDefinition1">tModel Definition</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.1.3 <a href="#ModelStructure1">tModel Structure</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.2 <a href="#WS-PolicyTypesCategorySystem">Web Services Policy Types Category System</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.2.1 <a href="#DesignGoals2">Design Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&bsp;&nbsp;&nbsp;B.2.2 <a href="#tModelDefinition2">tModel Definition</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.2.3 <a href="#ModelStructure2">tModel Structure</a><br>&nbsp;&nbsp;&nbsp;&nbsp;B.3 <a href="#LocalPolicyReferenceCategorySystem">Local Policy Reference Category System</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.3.1 <a href="#DesignGoals3">Design Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.3.2 <a href="#tModelDefinition3">tModel Definition</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B.3.3 <a href="#ModelStructure3">tModel Structure</a><br>C. <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br>D. <a href="#change-description">Changes in this Version of the Document</a> (Non-Normative)<br>E. <a href="#change-log">Web Services Policy 1.5 - Attachment Change Log</a> (Non-Normative)<br></p></div><hr><div class="body">
     <div class="div1">
       
 <h2><a name="tocRange"></a>1. Introduction</h2>
@@ -272,32 +272,32 @@
 	    
 <p>We introduce the following terms that are used throughout this document:</p>
 <p>EdNote: script will insert termdefs here</p>
-<p>[<a title="policy" name="policy">Definition</a>: A <b>policy</b> is a
+<p>[<a name="policy" title="policy">Definition</a>: A <b>policy</b> is a
 collection of <a title="policy alternative" href="#policy_alternative">policy
 alternatives</a>. ]</p>
 
-<p>[<a title="policy alternative" name="policy_alternative">Definition</a>: A
+<p>[<a name="policy_alternative" title="policy alternative">Definition</a>: A
 <b>policy alternative</b> is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.]</p>
 
-<p>[<a title="policy assertion" name="policy_assertion">Definition</a>: A
+<p>[<a name="policy_assertion" title="policy assertion">Definition</a>: A
 <b>policy assertion</b> represents an individual requirement,
 capability, or other property of a behavior.]</p>
 
-<p>[<a title="policy expression" name="policy_expression">Definition</a>: A
+<p>[<a name="policy_expression" title="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. ]</p>
 
-<p>[<a title="policy subject" name="policy_subject">Definition</a>: A <b>policy
+<p>[<a name="policy_subject" title="policy subject">Definition</a>: A <b>policy
 subject</b> is an entity (e.g., an endpoint, message, resource,
 interaction) with which a <a title="policy" href="#policy">policy</a> can
 be associated. ]</p>
 
-<p>[<a title="policy scope" name="policy_scope">Definition</a>: A <b>policy
+<p>[<a name="policy_scope" title="policy scope">Definition</a>: A <b>policy
 scope</b> is a collection of <a title="policy subject" href="#policy_subject">policy
 subjects</a> to which a policy may apply.]</p>
 
-<p>[<a title="policy attachment" name="policy_attachment">Definition</a>: A
+<p>[<a name="policy_attachment" title="policy attachment">Definition</a>: A
 <b>policy attachment</b> is a mechanism for associating <a title="policy" href="#policy">policy</a> with one or more <a title="policy scope" href="#policy_scope">policy scopes</a>.]</p>
 
 </div>
@@ -315,7 +315,7 @@
 	[<cite><a href="#WS-SecurityPolicy">WS-SecurityPolicy</a></cite>].</p>
 
 	<div class="exampleOuter">
-	  <p class="exampleHead" style="text-align: left"><a name="Table2"></a><i><span>Example 2-1. </span>Example RM Policy Expression.</i></p>
+	  <p style="text-align: left" class="exampleHead"><a name="Table2"></a><i><span>Example 2-1. </span>Example RM Policy Expression.</i></p>
 	  <div class="exampleInner"><pre>(01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:rmp="http://docs.oasis-open.org/ws-rx/wsrmp/200602"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/@@@@/@@/policy"
@@ -330,7 +330,7 @@
 (08) &lt;/wsp:Policy&gt;</pre></div>
 	</div>
 	<div class="exampleOuter">
-	  <p class="exampleHead" style="text-align: left"><a name="Table3"></a><i><span>Example 2-2. </span>Example X509 Security Policy Expression.</i></p>
+	  <p style="text-align: left" class="exampleHead"><a name="Table3"></a><i><span>Example 2-2. </span>Example X509 Security Policy Expression.</i></p>
 	  <div class="exampleInner"><pre>(01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/@@@@/@@/policy"
@@ -410,13 +410,13 @@
 	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
+	<p>When multiple attachments are made, [<a name="effective_policy" title="effective policy">Definition</a>: the
 <b>effective policy</b>, for a given <a title="policy subject" href="#policy_subject">policy subject</a>, is the 
 combination of relevant policies. The relevant policies are those
 attached to <a title="policy scope" href="#policy_scope">policy scopes</a> that
 contain the <a title="policy subject" 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 by: [<a name="merge" title="merge">Definition</a>: a <b>merge</b>
 	consists of serializing each policy as a
 	<a title="policy expression" href="#policy_expression">policy expression</a>, replacing their
 	<code class="elt">wsp:Policy</code>  element with a
@@ -472,7 +472,7 @@
 to form a single element <a title="policy expression" href="#policy_expression">policy expression</a>. 
 The resultant <a title="policy" href="#policy">policy</a> is
 then associated with the element information item's <a title="element policy" href="#element_policy">element policy</a>
-property. [<a title="element policy" name="element_policy">Definition</a>: The
+property. [<a name="element_policy" title="element policy">Definition</a>: The
 	<b>element policy</b> is the <a title="policy" href="#policy">policy</a> attached to the <a title="policy subject" href="#policy_subject">policy subjects</a> associated with
 	the element information item that contains it.]</p>
 
@@ -492,7 +492,7 @@
 	it would result in an <a title="element policy" href="#element_policy">element policy</a> 
 	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>
+	  <p style="text-align: left" class="exampleHead"><a name="Table4"></a><i><span>Example 3-1. </span>Example Merged Policy Expression.</i></p>
 	  <div class="exampleInner"><pre>(01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:rmp="http://docs.oasis-open.org/ws-rx/wsrmp/200602"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
@@ -712,7 +712,7 @@
 or ports) are only considered in the <a title="effective policy" href="#effective_policy">effective policy</a> of that deployed
 resource itself.</p>
 
-<div style="text-align: center" class="figure"><a name="Figure1"></a><br><img src="effective-policy-scope.png" alt="Effective Policy and Policy Scopes in WSDL"><p style="text-align:left"><i><span>Figure 4-1. </span>Effective Policy and Policy Scopes in WSDL</i></p><br></div>
+<div class="figure" style="text-align: center"><a name="Figure1"></a><br><img src="effective-policy-scope.png" alt="Effective Policy and Policy Scopes in WSDL"><p style="text-align:left"><i><span>Figure 4-1. </span>Effective Policy and Policy Scopes in WSDL</i></p><br></div>
   <p>(This graphic is also available in SVG format <a href="effective-policy-scope.svg">here</a>.)</p>
 
 <p>When attaching policies at different levels of the WSDL hierarchy, care must be taken. 
@@ -881,7 +881,7 @@
 <a href="#Table5">Example 4-1</a> that references policies. </p>
 
 <div class="exampleOuter">
-<p class="exampleHead" style="text-align: left"><a name="Table5"></a><i><span>Example 4-1. </span>Example Policy Attached to WSDL.</i></p>
+<p style="text-align: left" class="exampleHead"><a name="Table5"></a><i><span>Example 4-1. </span>Example Policy Attached to WSDL.</i></p>
 <div class="exampleInner"><pre>(01) &lt;wsdl11:definitions name="StockQuote"
 &nbsp; &nbsp; &nbsp; &nbsp; targetNamespace="http://www.example.com/stock/binding"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:tns="http://www.example.com/stock/binding"
@@ -948,7 +948,7 @@
 whose XML 1.0 representation is listed in <a href="#Table6">Example 4-2</a>.</p>
 
 <div class="exampleOuter">
-<p class="exampleHead" style="text-align: left"><a name="Table6"></a><i><span>Example 4-2. </span>Example Message Security Policy Expression.</i></p>
+<p style="text-align: left" class="exampleHead"><a name="Table6"></a><i><span>Example 4-2. </span>Example Message Security Policy Expression.</i></p>
 <div class="exampleInner"><pre>(01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/@@@@/@@/policy"

Index: changelog.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/changelog.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- changelog.xml	14 Jul 2006 14:28:30 -0000	1.2
+++ changelog.xml	16 Aug 2006 18:21:13 -0000	1.3
@@ -1,617 +1,1214 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <changelog>
 	<entry>
-		<date>2006-05-31		</date>
-		<time>17:35		</time>
-		<author><![CDATA[plehegar]]>		</author>
+		<date>2006-08-09</date>
+		<time>20:55</time>
+		<author><![CDATA[dorchard]]></author>
 		<file>
-			<name><![CDATA[generate-acknowledgements.sh]]>			</name>
[...1551 lines suppressed...]
+		</file>
+		<msg><![CDATA[cvs test commit]]></msg>
+	</entry>
+	<entry>
+		<date>2006-08-10</date>
+		<time>00:27</time>
+		<author><![CDATA[avedamut]]></author>
+		<file>
+			<name><![CDATA[ws-policy-attachment.html]]></name>
+			<revision>1.27</revision>
+			<prevrevision>1.26</prevrevision>
+		</file>
+		<file>
+			<name><![CDATA[ws-policy-attachment.xml]]></name>
+			<revision>1.23</revision>
+			<prevrevision>1.22</prevrevision>
+		</file>
+		<msg><![CDATA[Changes related to issue 3558]]></msg>
 	</entry>
 </changelog>

Index: entities.dtd
===================================================================
RCS file: /sources/public/2006/ws/policy/entities.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entities.dtd	12 Jul 2006 20:35:14 -0000	1.3
+++ entities.dtd	16 Aug 2006 18:21:13 -0000	1.4
@@ -14,6 +14,7 @@
 <!-- Titles -->
 <!ENTITY framework.title "Web Services Policy 1.5 - Framework">
 <!ENTITY attachment.title "Web Services Policy 1.5 - Attachment">
+<!ENTITY primer.title "Web Services Policy 1.5 - Primer">
 
 <!-- XML Namespaces used in the drafts -->
 <!ENTITY nsuri "http://www.w3.org/&draft.year;/&draft.mm;/policy" >

Index: ws-policy-framework.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ws-policy-framework.html	14 Aug 2006 00:10:44 -0000	1.19
+++ ws-policy-framework.html	16 Aug 2006 18:21:13 -0000	1.20
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en-US"><head><META http-equiv="Content-Type" content="text/html; charset=utf-8"><title>Web Services Policy 1.5 - Framework</title><style type="text/css">
 code           { font-family: monospace; }
 
@@ -47,7 +47,7 @@
 div.exampleWrapper { margin: 4px }
 div.exampleHeader { font-weight: bold;
                     margin: 4px}
-</style><link type="text/css" rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/base.css"><link href="#contents" rel="contents"></head><body>
+</style><link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/base.css"><link rel="contents" href="#contents"></head><body>
     <div class="head">
 <h1>Web Services Policy 1.5 - Framework</h1>
 <h2>Editors' copy $Date$ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
@@ -73,7 +73,7 @@
         no official standing.</strong></p><p></p></div>
     <hr><div class="toc">
 <h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#tocRange">Introduction</a><br>&nbsp;&nbsp;&nbsp;&nbsp;1.1 <a href="#Goals">Goals</a><br>&nbsp;&nbsp;&nbsp;&nbsp;1.2 <a href="#Example">Example</a><br>2. <a href="#Notation_Terminilogy">Notations and Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.1 <a href="#Notational_Conventions">Notational Conventions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.2 <a href="#Extensibility">Extensibility</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.3 <a href="#XML_Namespaces">XML Namespaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.4 <a href="#Terminology">Terminology</a><br>3. <a href="#Policy_Model">Policy Model</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.1 <a href="#rPolicy_Assertion">Policy Assertion</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.2 <a href="#rPolicy_Alternative">Policy Alternative</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.3 <a href="#rPolicy">Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.4 <a href="#Web_services">Web services</a><br>4. <a href="#rPolicy_Expression">Policy Expression</a><br>&nbsp;&nbs;&nbsp;&nbsp;4.1 <a href="#Normal_Form_Policy_Expression">Normal Form Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.2 <a href="#Policy_Identification">Policy Identification</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.3 <a href="#Compact_Policy_Expression">Compact Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.1 <a href="#Optional_Policy_Assertions">Optional Policy Assertions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.2 <a href="#Policy_Assertion_Nesting">Policy Assertion Nesting</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.3 <a href="#Policy_Operators">Policy Operators</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.4 <a href="#Policy_Inclusion">Policy Inclusion</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.4 <a href="#Policy_Intersection">Policy Intersection</a><br>5. <a href="#Security_Considerations">Security Considerations</a><br></p>
-<h3><a id="appendix" name="appendix">Appendices</a></h3><p class="toc">A. <a href="#References">References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.1 <a href="#Normative-References">Normative References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.2 <a href="#Informative-References">Other References</a><br>B. <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br>C. <a href="#change-description">Changes in this Version of the Document</a> (Non-Normative)<br>D. <a href="#change-log">Web Services Policy 1.5 - Framework Change Log</a> (Non-Normative)<br></p></div><hr><div class="body">
+<h3><a name="appendix" id="appendix">Appendices</a></h3><p class="toc">A. <a href="#References">References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.1 <a href="#Normative-References">Normative References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.2 <a href="#Informative-References">Other References</a><br>B. <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br>C. <a href="#change-description">Changes in this Version of the Document</a> (Non-Normative)<br>D. <a href="#change-log">Web Services Policy 1.5 - Framework Change Log</a> (Non-Normative)<br></p></div><hr><div class="body">
         <div class="div1">
             
 <h2><a name="tocRange"></a>1. Introduction</h2>
@@ -85,11 +85,11 @@
 	    model for the expression of these properties as
 	    policies.</p>
 
-	    <p>[<a title="policy" name="policy">Definition</a>: A <b>policy</b> is a collection of 
+	    <p>[<a name="policy" title="policy">Definition</a>: A <b>policy</b> is a collection of 
 	    <a title="policy alternative" href="#policy_alternative">policy alternatives</a>, ]
-	    where [<a title="policy alternative" name="policy_alternative">Definition</a>: a <b>policy alternative</b> 
+	    where [<a name="policy_alternative" title="policy alternative">Definition</a>: a <b>policy alternative</b> 
 	    is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.]
-		[<a title="policy assertion" name="policy_assertion">Definition</a>: A <b>policy assertion</b> 
+		[<a name="policy_assertion" title="policy assertion">Definition</a>: A <b>policy assertion</b> 
 		represents an individual requirement, capability, or other property of a behavior.]
 	    Some policy assertions
 	    specify traditional requirements and capabilities that
@@ -103,12 +103,12 @@
 
 <p>Web Services Policy 1.5 - Framework does not specify policy discovery or 
 	    <a title="policy attachment" href="#policy_attachment">policy attachment</a>.
-	    [<a title="policy attachment" name="policy_attachment">Definition</a>: A 
+	    [<a name="policy_attachment" title="policy attachment">Definition</a>: A 
 	    <b>policy attachment</b> is a mechanism for associating 
 	    <a title="policy" href="#policy">policy</a> with one or more <a title="policy scope" href="#policy_scope">policy scopes</a>.]
-				[<a title="policy scope" name="policy_scope">Definition</a>: A <b>policy scope</b> is a collection of 
+				[<a name="policy_scope" title="policy scope">Definition</a>: A <b>policy scope</b> is a collection of 
 	    <a title="policy subject" href="#policy_subject">policy subjects</a> to which a policy may apply.]
-				[<a title="policy subject" name="policy_subject">Definition</a>: A <b>policy subject</b> is an entity 
+				[<a name="policy_subject" title="policy subject">Definition</a>: A <b>policy subject</b> is an entity 
 	    (e.g., an endpoint, message, resource, interaction) with which a 
 	    <a title="policy" href="#policy">policy</a> can be associated. ]
 
@@ -134,7 +134,7 @@
 		<p>
 		An XML Infoset called a <a title="policy expression" href="#policy_expression">policy
 		expression</a> that contains domain-specific, Web
-		Service policy information. [<a title="policy expression" name="policy_expression">Definition</a>: A <b>policy expression</b> 
+		Service policy information. [<a name="policy_expression" title="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. ]</p></li>
 		
@@ -155,7 +155,7 @@
                 assertions defined in WS-SecurityPolicy [<cite><a href="#WS-SecurityPolicy">WS-SecurityPolicy</a></cite>]:</p>
             
             <div class="exampleOuter">
-                <p class="exampleHead" style="text-align: left"><i><span>Example 1-1. </span>Use of Web Services Policy with security policy assertions.</i></p>
+                <p style="text-align: left" class="exampleHead"><i><span>Example 1-1. </span>Use of Web Services Policy with security policy assertions.</i></p>
                 <div class="exampleInner"><pre>
 (01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
@@ -365,7 +365,7 @@
 	    type</a> is identified only by the XML Infoset <strong>[namespace name]</strong> and <strong>[local name]</strong> properties (that
 	    is, the qualified name or QName) of the root Element
 	    Information Item representing the assertion.  
-	    [<a title="policy assertion type" name="policy_assertion_type">Definition</a>: A <b>policy assertion type</b> 
+	    [<a name="policy_assertion_type" title="policy assertion type">Definition</a>: A <b>policy assertion type</b> 
 	    represents a class of <a title="policy assertion" href="#policy_assertion">policy assertions</a> and implies a 
 	    schema for the assertion and assertion-specific semantics.]
 	    Assertions of
@@ -385,7 +385,7 @@
 	    <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 <strong>[attributes]</strong> property and/or a non-empty <strong>[children]</strong>
 	    property. Such content <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> 
+	    [<a name="policy_assertion_parameter" title="policy assertion parameter">Definition</a>: A <b>policy assertion parameter</b> 
 	    qualifies the behavior indicated by a <a title="policy assertion" href="#policy_assertion">policy assertion</a>.]
 	    For example, an
 	    assertion identifying support for a specific reliable
@@ -417,7 +417,7 @@
 	    <p>The vocabulary of a policy alternative is the set of
 	    all <a title="policy assertion type" href="#policy_assertion_type">policy assertion
 	    types</a> within the alternative. 
-	    [<a title="policy vocabulary" name="policy_vocabulary">Definition</a>: A <b>policy vocabulary</b> is the set of all 
+	    [<a name="policy_vocabulary" title="policy vocabulary">Definition</a>: A <b>policy vocabulary</b> is the set of all 
 	    <a title="policy assertion type" href="#policy_assertion_type">policy assertion types</a> used in a policy.]
 	    An assertion whose type
 	    is part of the policy's vocabulary but is not included in

Index: entitiesedcopy.dtd
===================================================================
RCS file: /sources/public/2006/ws/policy/entitiesedcopy.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entitiesedcopy.dtd	12 Jul 2006 20:37:37 -0000	1.3
+++ entitiesedcopy.dtd	16 Aug 2006 18:21:13 -0000	1.4
@@ -17,17 +17,21 @@
 
 <!ENTITY framework.prefix "ws-policy-framework">
 <!ENTITY attachment.prefix "ws-policy-attachment">
+<!ENTITY primer.prefix "ws-policy-primer">
 
 <!ENTITY w3c-designation-framework
   "&framework.prefix;.html">
 <!ENTITY w3c-designation-attachment
   "&attachment.prefix;.html">
+<!ENTITY w3c-designation-primer
+  "&primer.prefix;.html">
 
 <!ENTITY w3c.tr.latest  "http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy">
 
 <!-- Latest version links. don't touch -->
 <!ENTITY framework.latest "&w3c.tr.latest;/&w3c-designation-framework;?content-type=text/html;charset=utf-8">
 <!ENTITY attachment.latest "&w3c.tr.latest;/&w3c-designation-attachment;?content-type=text/html;charset=utf-8">
+<!ENTITY primer.latest "&w3c.tr.latest;/&w3c-designation-primer;?content-type=text/html;charset=utf-8">
 
 <!ENTITY w3c.tr  "">	
 

Received on Wednesday, 16 August 2006 18:21:27 UTC