- From: Felix Sasaki via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 10 Sep 2006 19:17:23 +0000
- To: public-ws-policy-eds@w3.org
Update of /sources/public/2006/ws/policy
In directory hutz:/tmp/cvs-serv26379/ws/policy
Modified Files:
build.xml entities.dtd 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
xmlspec-policy.xsl
Log Message:
Term generation works, see http://lists.w3.org/Archives/Public/public-ws-policy-eds/2006Sep/0033.html for explanation.
Index: glossary-attachment.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/glossary-attachment.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- glossary-attachment.xml 4 Sep 2006 23:17:42 -0000 1.2
+++ glossary-attachment.xml 10 Sep 2006 19:17:20 -0000 1.3
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?><glist><gitem><label>effective policy</label><def><p>the
+<?xml version="1.0" encoding="UTF-8"?><glist><gitem><label><loc href="#effective_policy">effective policy</loc></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
-contain the <termref def="policy_subject">policy subject</termref>.</p></def></gitem><gitem><label>element policy</label><def><p>The
+contain the <termref def="policy_subject">policy subject</termref>.</p></def></gitem><gitem><label><loc href="#element_policy">element policy</loc></label><def><p>The
<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.</p></def></gitem><gitem><label>merge</label><def><p>a <term>merge</term>
+ the element information item that contains it.</p></def></gitem><gitem><label><loc href="#merge">merge</loc></label><def><p>a <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
<el>wsp:All</el> element, and placing each as
children of a wrapper <el>wsp:Policy</el>
- element.</p></def></gitem><gitem><label>policy</label><def><p>A <term>policy</term> is a
+ element.</p></def></gitem><gitem><label><loc href="ws-policy-framework.html#policy">policy</loc></label><def><p id="policy">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
+alternatives</termref>. </p></def></gitem><gitem><label><loc href="ws-policy-framework.html#policy_alternative">policy alternative</loc></label><def><p id="policy_alternative">A
+<term>policy alternative</term> is a collection of <termref def="policy_assertion">policy assertions</termref>.</p></def></gitem><gitem><label><loc href="ws-policy-framework.html#policy_assertion">policy assertion</loc></label><def><p id="policy_assertion">A
<term>policy assertion</term> represents an individual requirement,
-capability, or other property of a behavior.</p></def></gitem><gitem><label>policy attachment</label><def><p>A
-<term>policy attachment</term> is a mechanism for associating <termref def="policy">policy</termref> with one or more <termref def="policy_scope">policy scopes</termref>.</p></def></gitem><gitem><label>policy expression</label><def><p>A
+capability, or other property of a behavior.</p></def></gitem><gitem><label><loc href="ws-policy-framework.html#policy_attachment">policy attachment</loc></label><def><p id="policy_attachment">A
+<term>policy attachment</term> is a mechanism for associating <termref def="policy">policy</termref> with one or more <termref def="policy_scope">policy scopes</termref>.</p></def></gitem><gitem><label><loc href="ws-policy-framework.html#policy_expression">policy expression</loc></label><def><p id="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. </p></def></gitem><gitem><label>policy scope</label><def><p>A <term>policy
+an equivalent compact form. </p></def></gitem><gitem><label><loc href="ws-policy-framework.html#policy_scope">policy scope</loc></label><def><p id="policy_scope">A <term>policy
scope</term> is a collection of <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
+subjects</termref> to which a policy may apply.</p></def></gitem><gitem><label><loc href="ws-policy-framework.html#policy_subject">policy subject</loc></label><def><p id="policy_subject">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>
\ No newline at end of file
Index: glossary-framework.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/glossary-framework.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- glossary-framework.xml 4 Sep 2006 23:17:42 -0000 1.2
+++ glossary-framework.xml 10 Sep 2006 19:17:20 -0000 1.3
@@ -1,15 +1,15 @@
-<?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>
- qualifies the behavior indicated by a <termref def="policy_assertion">policy assertion</termref>.</p></def></gitem><gitem><label>policy assertion type</label><def><p>A <term>policy assertion type</term>
+<?xml version="1.0" encoding="UTF-8"?><glist><gitem><label><loc href="#policy">policy</loc></label><def><p>A <term>policy</term> is a collection of
+ <termref def="policy_alternative">policy alternatives</termref>, </p></def></gitem><gitem><label><loc href="#policy_alternative">policy alternative</loc></label><def><p>a <term>policy alternative</term>
+ is a collection of <termref def="policy_assertion">policy assertions</termref>.</p></def></gitem><gitem><label><loc href="#policy_assertion">policy assertion</loc></label><def><p>A <term>policy assertion</term>
+ represents an individual requirement, capability, or other property of a behavior.</p></def></gitem><gitem><label><loc href="#policy_assertion_parameter">policy assertion parameter</loc></label><def><p>A <term>policy assertion parameter</term>
+ qualifies the behavior indicated by a <termref def="policy_assertion">policy assertion</termref>.</p></def></gitem><gitem><label><loc href="#policy_assertion_type">policy assertion type</loc></label><def><p>A <term>policy assertion type</term>
represents a class of <termref def="policy_assertion">policy assertions</termref> and implies a
- schema for the assertion and assertion-specific semantics.</p></def></gitem><gitem><label>policy attachment</label><def><p>A
+ schema for the assertion and assertion-specific semantics.</p></def></gitem><gitem><label><loc href="#policy_attachment">policy attachment</loc></label><def><p>A
<term>policy attachment</term> is a mechanism for associating
- <termref def="policy">policy</termref> with one or more <termref def="policy_scope">policy scopes</termref>.</p></def></gitem><gitem><label>policy expression</label><def><p>A <term>policy expression</term>
+ <termref def="policy">policy</termref> with one or more <termref def="policy_scope">policy scopes</termref>.</p></def></gitem><gitem><label><loc href="#policy_expression">policy expression</loc></label><def><p>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.</p></def></gitem><gitem><label>policy scope</label><def><p>A <term>policy scope</term> is a collection of
- <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
+ either in a normal form or in an equivalent compact form.</p></def></gitem><gitem><label><loc href="#policy_scope">policy scope</loc></label><def><p>A <term>policy scope</term> is a collection of
+ <termref def="policy_subject">policy subjects</termref> to which a policy may apply.</p></def></gitem><gitem><label><loc href="#policy_subject">policy subject</loc></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">policy</termref> can be associated. </p></def></gitem><gitem><label><loc href="#policy_vocabulary">policy vocabulary</loc></label><def><p>A <term>policy vocabulary</term> is the set of all
<termref def="policy_assertion_type">policy assertion types</termref> used in a policy.</p></def></gitem></glist>
\ No newline at end of file
Index: extract-glist.xsl
===================================================================
RCS file: /sources/public/2006/ws/policy/extract-glist.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extract-glist.xsl 4 Sep 2006 23:17:42 -0000 1.2
+++ extract-glist.xsl 10 Sep 2006 19:17:20 -0000 1.3
@@ -1,25 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
-<xsl:template match="/">
- <glist>
- <xsl:apply-templates select="//termdef">
- <xsl:sort select="@term"/>
- </xsl:apply-templates>
- </glist>
-</xsl:template>
+<!DOCTYPE xsl:stylesheet
+[
+<!ENTITY % entities SYSTEM "entities.dtd" >
+%entities;
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-<xsl:template match="termdef">
- <gitem>
- <label><xsl:value-of select="@term"/>
- </label>
- <def>
- <p>
- <xsl:copy-of select="node()"/>
- </p>
- </def>
- </gitem>
-</xsl:template>
+ <xsl:template match="/">
+ <glist>
+ <xsl:apply-templates select="//termdef">
+ <xsl:sort select="@term"/>
+ </xsl:apply-templates>
+ </glist>
+ </xsl:template>
+ <xsl:template match="termdef">
+ <gitem>
+ <xsl:choose>
+ <xsl:when test="ancestor::*[@id='Glossary']">
+ <!-- For terms which are defined in the framework document. These are only cited in the attachment document (the "terminology" section) and need special handling.-->
+ <label>
+ <loc>
+ <xsl:attribute name="href">
+ <xsl:text>&frameworkdoc;#</xsl:text>
+ <xsl:value-of select="@id"/>
+ </xsl:attribute>
+ <xsl:value-of select="@term"/>
+ </loc>
+ </label>
+ <def>
+ <p>
+ <xsl:attribute name="id">
+ <xsl:value-of select="@id"/>
+ </xsl:attribute>
+ <xsl:copy-of select="node()"/>
+ </p>
+ </def>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- For all terms, both in the framework and the attachment document. -->
+ <label>
+ <loc>
+ <xsl:attribute name="href">
+ <xsl:text>#</xsl:text>
+ <xsl:value-of select="@id"/>
+ </xsl:attribute>
+ <xsl:value-of select="@term"/>
+ </loc>
+ </label>
+ <def>
+ <p>
+ <xsl:copy-of select="node()"/>
+ </p>
+ </def>
+ </xsl:otherwise>
+ </xsl:choose>
+ </gitem>
+ </xsl:template>
</xsl:stylesheet>
Index: ws-policy-framework.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ws-policy-framework.xml 7 Sep 2006 20:02:30 -0000 1.35
+++ ws-policy-framework.xml 10 Sep 2006 19:17:20 -0000 1.36
@@ -331,7 +331,7 @@
</p>
<p>We introduce the following terms that are used throughout this document:</p>
- &glossary-framework;
+ &glossary-framework;
</div2>
</div1>
<div1 id="Policy_Model">
Index: ws-policy-attachment.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ws-policy-attachment.html 7 Sep 2006 05:31:55 -0000 1.40
+++ ws-policy-attachment.html 10 Sep 2006 19:17:20 -0000 1.41
@@ -1,5 +1,6 @@
-<!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">
+<!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; }
div.constraint,
@@ -47,40 +48,24 @@
div.exampleWrapper { margin: 4px }
div.exampleHeader { font-weight: bold;
[...2159 lines suppressed...]
- </tr>
-
- </tbody>
- <tr>
- <td rowspan="1" colspan="1">20060906</td>
- <td rowspan="1" colspan="1">ASV</td>
- <td rowspan="1" colspan="1">Implemented the
+ </td></tr></tbody><tr><td rowspan="1" colspan="1">20060906</td><td rowspan="1" colspan="1">ASV</td><td rowspan="1" colspan="1">Implemented the
<a href="http://www.w3.org/2006/09/06-ws-policy-minutes.html#action07">resolution</a>
for issue
<a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3557">3557</a>: clarify the use of domain expressions.
- </td>
- </tr>
- </table><br>
- </div>
-</div>
-</body></html>
\ No newline at end of file
+ </td></tr></table><br></div></div></body></html>
\ No newline at end of file
Index: entities.dtd
===================================================================
RCS file: /sources/public/2006/ws/policy/entities.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- entities.dtd 3 Sep 2006 04:02:33 -0000 1.5
+++ entities.dtd 10 Sep 2006 19:17:20 -0000 1.6
@@ -21,6 +21,8 @@
<!-- Misc entities. Feel free to add more -->
+
+<!ENTITY frameworkdoc "ws-policy-framework.html">
<!ENTITY EII "<emph>element information item</emph>">
<!ENTITY AII "<emph>attribute information item</emph>">
<!ENTITY glossary-framework SYSTEM "glossary-framework.xml">
Index: xmlspec-policy.xsl
===================================================================
RCS file: /sources/public/2006/ws/policy/xmlspec-policy.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xmlspec-policy.xsl 31 May 2006 17:20:37 -0000 1.1
+++ xmlspec-policy.xsl 10 Sep 2006 19:17:20 -0000 1.2
@@ -125,4 +125,7 @@
<xsl:template match="emph[@role='infoset-property']">
<strong><xsl:text>[</xsl:text><xsl:apply-templates/><xsl:text>]</xsl:text></strong>
</xsl:template>
+
+ <!-- Filtering term definitions in the terminology section. These are taken from the WS-Policy-Framework document and are handled separately in extract-glist.xsl .-->
+<xsl:template match="p[termdef and parent::*[@id='Glossary' or @id='Terminology']]"/>
</xsl:stylesheet>
Index: build.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- build.xml 5 Sep 2006 17:46:18 -0000 1.10
+++ build.xml 10 Sep 2006 19:17:20 -0000 1.11
@@ -54,8 +54,8 @@
<target name="glossaries" description="Generates glossary entries out of temdef elements">
<xslt style="${glossary}" in="ws-policy-framework.xml" out="glossary-framework.xml"/>
- <!-- <xslt style="${glossary}" in="ws-policy-attachment.xml" out="glossary-attachment.xml"/>
- --></target>
+ <xslt style="${glossary}" in="ws-policy-attachment.xml" out="glossary-attachment.xml"/>
+ </target>
<path id="diffmk.classpath">
<pathelement location="${basedir}/diffmk.jar"/>
<pathelement location="${basedir}/DiffMk.properties"/>
Index: ws-policy-framework.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ws-policy-framework.html 6 Sep 2006 21:09:46 -0000 1.30
+++ ws-policy-framework.html 10 Sep 2006 19:17:20 -0000 1.31
@@ -1,5 +1,6 @@
-<!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">
+<!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; }
div.constraint,
@@ -47,43 +48,24 @@
div.exampleWrapper { margin: 4px }
div.exampleHeader { font-weight: bold;
[...1717 lines suppressed...]
- <tr>
- <td rowspan="1" colspan="1">20060906</td>
- <td rowspan="1" colspan="1">TIB</td>
- <td rowspan="1" colspan="1">Completed action item:
+ </td></tr><tr><td rowspan="1" colspan="1">20060906</td><td rowspan="1" colspan="1">TIB</td><td rowspan="1" colspan="1">Completed action item:
<a href="http://www.w3.org/2005/06/tracker/wspolicy/actions/89">resolution</a>
for issue
<a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=3607">3607</a>.
Better describe policy language capabilities in the Introduction.
- </td>
- </tr>
-
- </tbody>
- </table><br>
- </div>
- </div>
-</body></html>
\ No newline at end of file
+ </td></tr></tbody></table><br></div></div></body></html>
\ No newline at end of file
Index: ws-policy-attachment.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ws-policy-attachment.xml 7 Sep 2006 20:06:09 -0000 1.36
+++ ws-policy-attachment.xml 10 Sep 2006 19:17:20 -0000 1.37
@@ -276,10 +276,10 @@
<p>We introduce the following terms that are used throughout this document:</p>
&glossary-attachment;
-<!--<p><termdef id='policy' term='policy'>A <term>policy</term> is a
+ <!-- The following definitions are taken from the WS-Policy-Framework document. They need to be here for the automatic glossary generation. -->
+ <p><termdef id='policy' term='policy'>A <term>policy</term> is a
collection of <termref def='policy_alternative'>policy
alternatives</termref>. </termdef></p>
-
<p><termdef id='policy_alternative' term='policy alternative'>A
<term>policy alternative</term> is a collection of <termref
def='policy_assertion'>policy assertions</termref>.</termdef></p>
@@ -305,7 +305,7 @@
<p><termdef id='policy_attachment' term='policy attachment'>A
<term>policy attachment</term> is a mechanism for associating <termref
def='policy'>policy</termref> with one or more <termref
-def='policy_scope'>policy scopes</termref>.</termdef></p>-->
+def='policy_scope'>policy scopes</termref>.</termdef></p>
</div2>
<div2 id='Example'>
Received on Sunday, 10 September 2006 19:17:32 UTC