2006/ws/policy build.xml,1.7,1.8 extract-glist.xsl,1.1,1.2 glossary-attachment.xml,1.1,1.2 glossary-framework.xml,1.1,1.2 ws-policy-attachment.html,1.36,1.37 ws-policy-attachment.xml,1.31,1.32 ws-policy-framework.html,1.27,1.28 ws-policy-framework.xml,1.31,1.32

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

Modified Files:
	build.xml extract-glist.xsl glossary-attachment.xml 
	glossary-framework.xml ws-policy-attachment.html 
	ws-policy-attachment.xml ws-policy-framework.html 
	ws-policy-framework.xml 
Log Message:
In reply to mail from dOrchard "RE: Action item on diffmk tool and build update": Build works again.
In reply to mail from dOrchard "RE: Glossary for editor's copy ready": Glossary is now in the terminology sections, which looks a kind of strange in the attachment document, since many definitions are here already.

Index: glossary-attachment.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/glossary-attachment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glossary-attachment.xml	3 Sep 2006 04:02:34 -0000	1.1
+++ glossary-attachment.xml	4 Sep 2006 23:17:42 -0000	1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><inform-div1 id="glossary"><head>Glossary</head><glist><gitem><label>effective policy</label><def><p>the
+<?xml version="1.0" encoding="UTF-8"?><glist><gitem><label>effective policy</label><def><p>the
 <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
@@ -24,4 +24,4 @@
 subjects</termref> to which a policy may apply.</p></def></gitem><gitem><label>policy subject</label><def><p>A <term>policy
 subject</term> is an entity (e.g., an endpoint, message, resource,
 interaction) with which a <termref def="policy">policy</termref> can
-be associated. </p></def></gitem></glist></inform-div1>
\ No newline at end of file
+be associated. </p></def></gitem></glist>
\ No newline at end of file

Index: glossary-framework.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/glossary-framework.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glossary-framework.xml	3 Sep 2006 04:02:34 -0000	1.1
+++ glossary-framework.xml	4 Sep 2006 23:17:42 -0000	1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><inform-div1 id="glossary"><head>Glossary</head><glist><gitem><label>policy</label><def><p>A <term>policy</term> is a collection of 
+<?xml version="1.0" encoding="UTF-8"?><glist><gitem><label>policy</label><def><p>A <term>policy</term> is a collection of 
 	    <termref def="policy_alternative">policy alternatives</termref>, </p></def></gitem><gitem><label>policy alternative</label><def><p>a <term>policy alternative</term> 
 	    is a collection of <termref def="policy_assertion">policy assertions</termref>.</p></def></gitem><gitem><label>policy assertion</label><def><p>A <term>policy assertion</term> 
 		represents an individual requirement, capability, or other property of a behavior.</p></def></gitem><gitem><label>policy assertion parameter</label><def><p>A <term>policy assertion parameter</term> 
@@ -12,4 +12,4 @@
 	    <termref def="policy_subject">policy subjects</termref> to which a policy may apply.</p></def></gitem><gitem><label>policy subject</label><def><p>A <term>policy subject</term> is an entity 
 	    (e.g., an endpoint, message, resource, interaction) with which a 
 	    <termref def="policy">policy</termref> can be associated. </p></def></gitem><gitem><label>policy vocabulary</label><def><p>A <term>policy vocabulary</term> is the set of all 
-	    <termref def="policy_assertion_type">policy assertion types</termref> used in a policy.</p></def></gitem></glist></inform-div1>
\ No newline at end of file
+	    <termref def="policy_assertion_type">policy assertion types</termref> used in a policy.</p></def></gitem></glist>
\ No newline at end of file

Index: extract-glist.xsl
===================================================================
RCS file: /sources/public/2006/ws/policy/extract-glist.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extract-glist.xsl	3 Sep 2006 04:02:34 -0000	1.1
+++ extract-glist.xsl	4 Sep 2006 23:17:42 -0000	1.2
@@ -3,15 +3,11 @@
                 version="1.0">
 
 <xsl:template match="/">
-  <inform-div1 id="glossary">
-    <head>Glossary</head>
-
-    <glist>
+      <glist>
       <xsl:apply-templates select="//termdef">
 	<xsl:sort select="@term"/>
       </xsl:apply-templates>
     </glist>
-  </inform-div1>
 </xsl:template>
 
 <xsl:template match="termdef">

Index: ws-policy-framework.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ws-policy-framework.xml	3 Sep 2006 04:02:34 -0000	1.31
+++ ws-policy-framework.xml	4 Sep 2006 23:17:42 -0000	1.32
@@ -332,7 +332,7 @@
 	    </p>
 	    
 <p>We introduce the following terms that are used throughout this document:</p>
-<p>EdNote: script will insert termdefs here</p>
+  &glossary-framework;
 	    </div2>
 	</div1>
 	<div1 id="Policy_Model">
@@ -1508,7 +1508,6 @@
       <item><p>Replaced URI with IRI.</p></item>
   </ulist>
 </inform-div1>
-  &glossary-framework;
         <inform-div1 id="change-log">
             <head>&framework.title; Change Log</head>
             <table id="ws-policy-framework-changelog-table" border="1">

Index: ws-policy-attachment.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ws-policy-attachment.html	3 Sep 2006 04:02:33 -0000	1.36
+++ ws-policy-attachment.html	4 Sep 2006 23:17:42 -0000	1.37
@@ -64,7 +64,7 @@
 <h2><a name="status">Status of this Document</a></h2><p><strong>This document is an editors' copy that has
         no official standing.</strong></p><p></p></div><hr><div class="toc">
 <h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#tocRange">Introduction</a><br>2. <a href="#NotationsTerminology">Notations and Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.1 <a href="#NotationalConventions">Notational Conventions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.2 <a href="#XMLNamespaces">XML Namespaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.3 <a href="#Glossary">Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.4 <a href="#Example">Example</a><br>3. <a href="#rPolicyAttachment">Policy Attachment</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.1 <a href="#rEffectivePolicy">Effective Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.2 <a href="#PolicyAttachmentMechanisms">Policy Attachment Mechanisms</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.3 <a href="#XMLElementAttachement">XML Element Attachment</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.4 <a href="#ExternalPolicyAttachment">External Policy Attachment</a><br>4. <a href="#AttachingPolicyUsingWSDL1.1">Attaching Policies Using WSDL 1.1</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.1 <a href="#CaculatingEffectivyPolicywithWSDL1.1">Calculating Effective Policy in WSDL 1.1</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.1 <a href="#ServicePolicySubject">Service Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.2 <a href="#EndpointPolicySubject">Endpoint Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.3 <a href="#OperationPolicySubject">Operation Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.4 <a href="#MessagePolicySubject">Message Policy Subject</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.1.5 <a href="#Example2">Example</a><br>5. <a href="#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>7. <a href="#Conformance">Conformance</a><br></p>
-<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="#glossary">Glossary</a> (Non-Normative)<br>F. <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">
+<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><p>
 	The Web Services Policy 1.5 - Framework [<cite><a href="#WS-Policy">Web Services Policy Framework</a></cite>]
 	specification defines an abstract model and an XML-based
@@ -136,7 +136,33 @@
 	      "<span class="rfc2119">MAY</span>", and
 	      "<span class="rfc2119">OPTIONAL</span>" in this document are to be
 	      interpreted as described in RFC 2119 [<cite><a href="#RFC2119">IETF RFC 2119</a></cite>].
-	    </p><p>We introduce the following terms that are used throughout this document:</p><p>EdNote: script will insert termdefs here</p><p>[<a name="policy" title="policy">Definition</a>: A <b>policy</b> is a
+	    </p><p>We introduce the following terms that are used throughout this document:</p><dl><dt class="label">effective policy</dt><dd><p>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></dd><dt class="label">element policy</dt><dd><p>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></dd><dt class="label">merge</dt><dd><p>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
+	<code class="elt">wsp:All</code>  element, and placing each as
+	children of a wrapper <code class="elt">wsp:Policy</code> 
+	element.</p></dd><dt class="label">policy</dt><dd><p>A <b>policy</b> is a
+collection of <a title="policy alternative" href="#policy_alternative">policy
+alternatives</a>. </p></dd><dt class="label">policy alternative</dt><dd><p>A
+<b>policy alternative</b> is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.</p></dd><dt class="label">policy assertion</dt><dd><p>A
+<b>policy assertion</b> represents an individual requirement,
+capability, or other property of a behavior.</p></dd><dt class="label">policy attachment</dt><dd><p>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></dd><dt class="label">policy expression</dt><dd><p>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></dd><dt class="label">policy scope</dt><dd><p>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></dd><dt class="label">policy subject</dt><dd><p>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></dd></dl><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 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 name="policy_assertion" title="policy assertion">Definition</a>: A
@@ -1058,34 +1084,7 @@
   </p></div><div class="div1">
 <h2><a name="change-description"></a>D. Changes in this Version of the Document (Non-Normative)</h2><p>A list of substantive changes since the Working Draft dated 31 July 2006
       is below:</p><ul><li><p>Added an empty conformance section.</p></li><li><p>Replaced URI with IRI.</p></li></ul></div><div class="div1">
-<h2><a name="glossary"></a>E. Glossary (Non-Normative)</h2><dl><dt class="label">effective policy</dt><dd><p>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></dd><dt class="label">element policy</dt><dd><p>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></dd><dt class="label">merge</dt><dd><p>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
-	<code class="elt">wsp:All</code>  element, and placing each as
-	children of a wrapper <code class="elt">wsp:Policy</code> 
-	element.</p></dd><dt class="label">policy</dt><dd><p>A <b>policy</b> is a
-collection of <a title="policy alternative" href="#policy_alternative">policy
-alternatives</a>. </p></dd><dt class="label">policy alternative</dt><dd><p>A
-<b>policy alternative</b> is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.</p></dd><dt class="label">policy assertion</dt><dd><p>A
-<b>policy assertion</b> represents an individual requirement,
-capability, or other property of a behavior.</p></dd><dt class="label">policy attachment</dt><dd><p>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></dd><dt class="label">policy expression</dt><dd><p>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></dd><dt class="label">policy scope</dt><dd><p>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></dd><dt class="label">policy subject</dt><dd><p>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></dd></dl></div><div class="div1">
-<h2><a name="change-log"></a>F. Web Services Policy 1.5 - Attachment Change Log (Non-Normative)</h2><a name="ws-policy-attachment-changelog-table"></a><table border="1"><tbody><tr><th rowspan="1" colspan="1">Date</th><th rowspan="1" colspan="1">Author</th><th rowspan="1" colspan="1">Description</th></tr><tr><td rowspan="1" colspan="1">20060712</td><td rowspan="1" colspan="1">ASV</td><td rowspan="1" colspan="1">Updated the list of editors. Completed action items 
+<h2><a name="change-log"></a>E. Web Services Policy 1.5 - Attachment Change Log (Non-Normative)</h2><a name="ws-policy-attachment-changelog-table"></a><table border="1"><tbody><tr><th rowspan="1" colspan="1">Date</th><th rowspan="1" colspan="1">Author</th><th rowspan="1" colspan="1">Description</th></tr><tr><td rowspan="1" colspan="1">20060712</td><td rowspan="1" colspan="1">ASV</td><td rowspan="1" colspan="1">Updated the list of editors. Completed action items 
             <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action20">20</a> 
             from the Austin F2F.</td></tr><tr><td rowspan="1" colspan="1">20060712</td><td rowspan="1" colspan="1">DBO</td><td rowspan="1" colspan="1">Completed action item <a href=" http://www.w3.org/2006/07/12-ws-policy-minutes.html#action12">12</a>
       	  </td></tr><tr><td rowspan="1" colspan="1">20060718</td><td rowspan="1" colspan="1">DBO</td><td rowspan="1" colspan="1">Completed action items

Index: build.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- build.xml	4 Sep 2006 05:39:53 -0000	1.7
+++ build.xml	4 Sep 2006 23:17:42 -0000	1.8
@@ -27,7 +27,11 @@
 
 	<target name="validate-policy-specs" description="Validates all WS Policy spec files." depends="glossaries">
 		<xmlvalidate lenient="false" warn="yes">
-			<fileset dir="." includes="ws-policy*.xml"/>
+		    <fileset dir=".">
+		        <filename name="ws-policy-framework.xml"/>
+		        <filename name="ws-policy-attachment.xml"/>
+		        <filename name="ws-policy-primer.xml"/>
+		    </fileset>
 		</xmlvalidate>
 	</target>
 	

Index: ws-policy-framework.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ws-policy-framework.html	3 Sep 2006 04:02:33 -0000	1.27
+++ ws-policy-framework.html	4 Sep 2006 23:17:42 -0000	1.28
@@ -61,7 +61,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>&nbsp;&nbsp;&nbsp;&nbsp;1.1 <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;&nbsp;&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>6. <a href="#Conformance">Conformance</a><br></p>
-<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="#glossary">Glossary</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">
+<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><p>Web Services Policy 1.5 - Framework defines a framework and a model for expressing policies that
             refer to domain-specific capabilities, requirements, and general characteristics of
             entities in a Web services-based system.
@@ -179,7 +179,21 @@
 	      "<span class="rfc2119">MAY</span>", and
 	      "<span class="rfc2119">OPTIONAL</span>" in this document are to be
 	      interpreted as described in RFC 2119 [<cite><a href="#RFC2119">IETF RFC 2119</a></cite>].
-	    </p><p>We introduce the following terms that are used throughout this document:</p><p>EdNote: script will insert termdefs here</p></div></div><div class="div1">
+	    </p><p>We introduce the following terms that are used throughout this document:</p><dl><dt class="label">policy</dt><dd><p>A <b>policy</b> is a collection of 
+	    <a title="policy alternative" href="#policy_alternative">policy alternatives</a>, </p></dd><dt class="label">policy alternative</dt><dd><p>a <b>policy alternative</b> 
+	    is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.</p></dd><dt class="label">policy assertion</dt><dd><p>A <b>policy assertion</b> 
+		represents an individual requirement, capability, or other property of a behavior.</p></dd><dt class="label">policy assertion parameter</dt><dd><p>A <b>policy assertion parameter</b> 
+	    qualifies the behavior indicated by a <a title="policy assertion" href="#policy_assertion">policy assertion</a>.</p></dd><dt class="label">policy assertion type</dt><dd><p>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.</p></dd><dt class="label">policy attachment</dt><dd><p>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></dd><dt class="label">policy expression</dt><dd><p>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></dd><dt class="label">policy scope</dt><dd><p>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></dd><dt class="label">policy subject</dt><dd><p>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></dd><dt class="label">policy vocabulary</dt><dd><p>A <b>policy vocabulary</b> is the set of all 
+	    <a title="policy assertion type" href="#policy_assertion_type">policy assertion types</a> used in a policy.</p></dd></dl></div></div><div class="div1">
 <h2><a name="Policy_Model"></a>3. Policy Model</h2><p>This section defines an abstract model for policies and for operations upon policies.</p><p>The descriptions below use XML Infoset terminology for convenience of description. However, this abstract model itself is independent of how it is represented as an XML Infoset. </p><div class="div2">
 <h3><a name="rPolicy_Assertion"></a>3.1 Policy Assertion</h3><p>A <a title="policy assertion" href="#policy_assertion">policy
 	    assertion</a> identifies a behavior that is a
@@ -931,22 +945,7 @@
   </p></div><div class="div1">
 <h2><a name="change-description"></a>C. Changes in this Version of the Document (Non-Normative)</h2><p>A list of substantive changes since the Working Draft dated 31 July 2006
 is below:</p><ul><li><p>Added support for the <code>xml:id</code> attribute.</p></li><li><p>Added an empty conformance section.</p></li><li><p>Replaced URI with IRI.</p></li></ul></div><div class="div1">
-<h2><a name="glossary"></a>D. Glossary (Non-Normative)</h2><dl><dt class="label">policy</dt><dd><p>A <b>policy</b> is a collection of 
-	    <a title="policy alternative" href="#policy_alternative">policy alternatives</a>, </p></dd><dt class="label">policy alternative</dt><dd><p>a <b>policy alternative</b> 
-	    is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.</p></dd><dt class="label">policy assertion</dt><dd><p>A <b>policy assertion</b> 
-		represents an individual requirement, capability, or other property of a behavior.</p></dd><dt class="label">policy assertion parameter</dt><dd><p>A <b>policy assertion parameter</b> 
-	    qualifies the behavior indicated by a <a title="policy assertion" href="#policy_assertion">policy assertion</a>.</p></dd><dt class="label">policy assertion type</dt><dd><p>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.</p></dd><dt class="label">policy attachment</dt><dd><p>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></dd><dt class="label">policy expression</dt><dd><p>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></dd><dt class="label">policy scope</dt><dd><p>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></dd><dt class="label">policy subject</dt><dd><p>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></dd><dt class="label">policy vocabulary</dt><dd><p>A <b>policy vocabulary</b> is the set of all 
-	    <a title="policy assertion type" href="#policy_assertion_type">policy assertion types</a> used in a policy.</p></dd></dl></div><div class="div1">
-<h2><a name="change-log"></a>E. Web Services Policy 1.5 - Framework Change Log (Non-Normative)</h2><a name="ws-policy-framework-changelog-table"></a><table border="1"><tbody><tr><th rowspan="1" colspan="1">Date</th><th rowspan="1" colspan="1">Author</th><th rowspan="1" colspan="1">Description</th></tr><tr><td rowspan="1" colspan="1">20060712</td><td rowspan="1" colspan="1">ASV</td><td rowspan="1" colspan="1">Updated the list of editors. Completed action items
+<h2><a name="change-log"></a>D. Web Services Policy 1.5 - Framework Change Log (Non-Normative)</h2><a name="ws-policy-framework-changelog-table"></a><table border="1"><tbody><tr><th rowspan="1" colspan="1">Date</th><th rowspan="1" colspan="1">Author</th><th rowspan="1" colspan="1">Description</th></tr><tr><td rowspan="1" colspan="1">20060712</td><td rowspan="1" colspan="1">ASV</td><td rowspan="1" colspan="1">Updated the list of editors. Completed action items
                             <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action12">12</a>,
                             <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action16">16</a> and 
                             <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action20">20</a> 

Index: ws-policy-attachment.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ws-policy-attachment.xml	3 Sep 2006 04:02:33 -0000	1.31
+++ ws-policy-attachment.xml	4 Sep 2006 23:17:42 -0000	1.32
@@ -275,7 +275,7 @@
 	    </p>
 	    
 <p>We introduce the following terms that are used throughout this document:</p>
-<p>EdNote: script will insert termdefs here</p>
+  &glossary-attachment;
 <p><termdef id='policy' term='policy'>A <term>policy</term> is a
 collection of <termref def='policy_alternative'>policy
 alternatives</termref>. </termdef></p>
@@ -1788,7 +1788,6 @@
       <item><p>Replaced URI with IRI.</p></item>
     </ulist>
   </inform-div1>
-  &glossary-attachment;
   <inform-div1 id="change-log">
     <head>&attachment.title; Change Log</head>
     <table id="ws-policy-attachment-changelog-table" border="1">

Received on Monday, 4 September 2006 23:17:51 UTC