2006/ws/policy .project,1.1,1.2 entities.dtd,1.17,1.18 entitiesedcopy.dtd,1.7,1.8 entitieswd.dtd,1.8,1.9 glossary-attachment.xml,1.7,1.8 glossary-framework.xml,1.7,1.8 status-wsdl11ei.xml,1.1,1.2 ws-policy-attachment.xml,1.93,1.94 ws-policy-framework.xml,1.125,1.126 ws-policy-guidelines.xml,1.45,1.46 ws-policy-primer.xml,1.42,1.43 wsdl11elementidentifiers.xml,1.15,1.16

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

Modified Files:
	.project entities.dtd entitiesedcopy.dtd entitieswd.dtd 
	glossary-attachment.xml glossary-framework.xml 
	status-wsdl11ei.xml ws-policy-attachment.xml 
	ws-policy-framework.xml ws-policy-guidelines.xml 
	ws-policy-primer.xml wsdl11elementidentifiers.xml 
Log Message:
Pub preparation related changes of entities.

Index: glossary-attachment.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/glossary-attachment.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- glossary-attachment.xml	10 Nov 2006 02:21:23 -0000	1.7
+++ glossary-attachment.xml	22 Mar 2007 03:33:41 -0000	1.8
@@ -5,7 +5,7 @@
          <loc href="#effective_policy">effective policy</loc>
       </label>
       <def>
-         <p>the
+         <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
@@ -33,8 +33,8 @@
 	        <xspecref xmlns:xlink="http://www.w3.org/1999/xlink"
                       href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection"
                       xlink:type="simple"
-                      xlink:actuate="onRequest"
-                      xlink:show="new">4.5 Policy Intersection</xspecref>).</p>
+                      xlink:show="new"
+                      xlink:actuate="onRequest">4.5 Policy Intersection</xspecref>).</p>
       </def>
    </gitem>
    <gitem>
@@ -42,7 +42,7 @@
          <loc href="#merge">merge</loc>
       </label>
       <def>
-         <p>a <term>merge</term>
+         <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
@@ -75,7 +75,7 @@
       </label>
       <def>
          <p id="policy_assertion">A <term>policy assertion</term> 
-		represents an individual requirement, capability, or other property of a behavior.</p>
+		represents a requirement, a capability, or other property of a behavior.</p>
       </def>
    </gitem>
    <gitem>

Index: entitieswd.dtd
===================================================================
RCS file: /sources/public/2006/ws/policy/entitieswd.dtd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- entitieswd.dtd	20 Feb 2007 22:00:44 -0000	1.8
+++ entitieswd.dtd	22 Mar 2007 03:33:41 -0000	1.9
@@ -4,10 +4,10 @@
   Date parameters
   -->
 <!ENTITY draft.year "2007">
-<!ENTITY draft.month "February">
-<!ENTITY draft.mm "02">
-<!ENTITY draft.day "28">
-<!ENTITY draft.dd "28">
+<!ENTITY draft.month "March">
+<!ENTITY draft.mm "03">
+<!ENTITY draft.day "30">
+<!ENTITY draft.dd "30">
 
 <!ENTITY draft.date "&draft.year;&draft.mm;&draft.dd;">
 
@@ -31,25 +31,62 @@
 
 <!ENTITY document.role "public">
 
-<!ENTITY document.status "W3C Candidate Recommendation">
-<!ENTITY w3c.status "CR">
+<!-- The following is used for framework and attachment document .-->
+<!ENTITY document.status "W3C Working Draft">
+<!ENTITY w3c.status "WD">
+
+<!-- The following is used for primer, guidelines and elementID documents.-->
+<!ENTITY document.status.primer "W3C Working Draft">
+<!ENTITY w3c.status.primer "WD">
+<!ENTITY document.status.guidelines "W3C Working Draft">
+<!ENTITY w3c.status.guidelines "WD">
+<!ENTITY document.status.wsdl11ei "W3C Working Draft">
+<!ENTITY w3c.status.wsdl11ei "WD">
 
 <!ENTITY w3c-designation-framework
   "&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;">
+  "&w3c.tr.latest;/&draft.year;/&w3c.status.primer;-&primer.prefix;-&draft.date;">
 <!ENTITY w3c-designation-guidelines
-  "&w3c.tr.latest;/&draft.year;/&w3c.status;-&guidelines.prefix;-&draft.date;">
+  "&w3c.tr.latest;/&draft.year;/&w3c.status.guidelines;-&guidelines.prefix;-&draft.date;">
 <!ENTITY w3c-designation-wsdl11ei
-  "&w3c.tr.latest;/&draft.year;/&w3c.status;-&wsdl11ei.prefix;-&draft.date;">
+  "&w3c.tr.latest;/&draft.year;/&w3c.status.wsdl11ei;-&wsdl11ei.prefix;-&draft.date;">
 
 
-<!ENTITY altlocs
+<!ENTITY altlocs.framework
     "<altlocs>
-	<loc role='pdf' href='&prefix;.pdf'>PDF</loc>
-	<loc role='postscript' href='&prefix;.ps'>PostScript</loc>
-	<loc role='xml' href='&prefix;.xml'>XML</loc>
-	<loc role='plain' href='&prefix;.txt'>plain text</loc>
+	<loc role='pdf' href='ws-policy-framework.pdf'>PDF</loc>
+	<loc role='postscript' href='ws-policy-framework.ps'>PostScript</loc>
+	<loc role='xml' href='ws-policy-framework.xml'>XML</loc>
+	<loc role='plain' href='ws-policy-framework.txt'>plain text</loc>
+    </altlocs>">
+<!ENTITY altlocs.attachment
+    "<altlocs>
+	<loc role='pdf' href='&attachment.prefix;.pdf'>PDF</loc>
+	<loc role='postscript' href='&attachment.prefix;.ps'>PostScript</loc>
+	<loc role='xml' href='&attachment.prefix;.xml'>XML</loc>
+	<loc role='plain' href='&attachment.prefix;.txt'>plain text</loc>
+    </altlocs>">
+<!ENTITY altlocs.primer
+    "<altlocs>
+	<loc role='pdf' href='&primer.prefix;.pdf'>PDF</loc>
+	<loc role='postscript' href='&primer.prefix;.ps'>PostScript</loc>
+	<loc role='xml' href='&primer.prefix;.xml'>XML</loc>
+	<loc role='plain' href='&primer.prefix;.txt'>plain text</loc>
+    </altlocs>">
+<!ENTITY altlocs.guidelines
+    "<altlocs>
+	<loc role='pdf' href='&guidelines.prefix;.pdf'>PDF</loc>
+	<loc role='postscript' href='&guidelines.prefix;.ps'>PostScript</loc>
+	<loc role='xml' href='&guidelines.prefix;.xml'>XML</loc>
+	<loc role='plain' href='&guidelines.prefix;.txt'>plain text</loc>
+    </altlocs>">
+<!ENTITY altlocs.wsdl11ei
+    "<altlocs>
+	<loc role='pdf' href='&wsdl11ei.prefix;.pdf'>PDF</loc>
+	<loc role='postscript' href='&wsdl11ei.prefix;.ps'>PostScript</loc>
+	<loc role='xml' href='&wsdl11ei.prefix;.xml'>XML</loc>
+	<loc role='plain' href='&wsdl11ei.prefix;.txt'>plain text</loc>
     </altlocs>">

Index: ws-policy-primer.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-primer.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ws-policy-primer.xml	19 Mar 2007 17:41:51 -0000	1.42
+++ ws-policy-primer.xml	22 Mar 2007 03:33:42 -0000	1.43
@@ -5,9 +5,9 @@
 <!ENTITY % entities SYSTEM "entities.dtd" >
 %entities;
 <!ENTITY status SYSTEM "status-primer.xml">
-<!ENTITY document.status "Editors' copy $Date$">
+<!ENTITY document.status.primer "Editors' copy $Date$">
 <!ENTITY primer-title "&primer.title;">
-<!ENTITY prevloc "">
+<!ENTITY prevloc "http://www.w3.org/TR/2006/WD-ws-policy-guidelines-20061221">
 <!ENTITY hellip "&#8230;">
 ]>
 <?xml-stylesheet type='text/xsl' href='xmlspec-policy.xsl'?>
@@ -15,7 +15,7 @@
   <header>
     <title>&primer.title;</title>
     <w3c-designation>&w3c-designation-primer;</w3c-designation>
-    <w3c-doctype>&document.status;</w3c-doctype>
+    <w3c-doctype>&document.status.primer;</w3c-doctype>
     <pubdate>
       <day>&draft.day;</day>
       <month>&draft.month;</month>
@@ -23,12 +23,10 @@
     </pubdate>
     <publoc>
       <loc href="&w3c-designation-primer;">&w3c-designation-primer;</loc>
-    </publoc> &altlocs;
-    <!--
+    </publoc> &altlocs.primer;
 	<prevlocs>
             <loc href="&prevloc;">&prevloc;</loc>
         </prevlocs>
--->
     <latestloc>
       <loc href="&primer.latest;">&primer.latest;</loc>
     </latestloc>

Index: glossary-framework.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/glossary-framework.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- glossary-framework.xml	10 Nov 2006 02:21:23 -0000	1.7
+++ glossary-framework.xml	22 Mar 2007 03:33:41 -0000	1.8
@@ -11,8 +11,8 @@
 	        <xspecref xmlns:xlink="http://www.w3.org/1999/xlink"
                       href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection"
                       xlink:type="simple"
-                      xlink:actuate="onRequest"
-                      xlink:show="new">4.5 Policy Intersection</xspecref>).</p>
+                      xlink:show="new"
+                      xlink:actuate="onRequest">4.5 Policy Intersection</xspecref>).</p>
       </def>
    </gitem>
    <gitem>
@@ -58,7 +58,7 @@
       </label>
       <def>
          <p>A <term>policy assertion</term> 
-		represents an individual requirement, capability, or other property of a behavior.</p>
+		represents a requirement, a capability, or other property of a behavior.</p>
       </def>
    </gitem>
    <gitem>

Index: .project
===================================================================
RCS file: /sources/public/2006/ws/policy/.project,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .project	8 Mar 2007 07:33:51 -0000	1.1
+++ .project	22 Mar 2007 03:33:41 -0000	1.2
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>policyw3cdev</name>
+	<name>policydev</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>com.oxygenxml.editor.xmlbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.oxygenxml.editor.xmlnature</nature>
 	</natures>
 </projectDescription>

Index: ws-policy-framework.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework.xml,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- ws-policy-framework.xml	13 Mar 2007 22:22:58 -0000	1.125
+++ ws-policy-framework.xml	22 Mar 2007 03:33:41 -0000	1.126
@@ -7,11 +7,11 @@
 <!ENTITY status SYSTEM "status.xml">
 <!ENTITY document.status "Editors' copy $Date$">
 <!ENTITY framework-title "&framework.title;">
-<!ENTITY prevloc "http://www.w3.org/TR/2006/WD-ws-policy-20061117">
+<!ENTITY prevloc "http://www.w3.org/TR/2007/CR-ws-policy-20070228">
 <!ENTITY hellip "&#8230;">
 ]>
 <?xml-stylesheet type='text/xsl' href='xmlspec-policy.xsl'?>
-<spec w3c-doctype="cr" role="&document.role;">
+<spec w3c-doctype="wd" role="&document.role;">
     <header>
         <title>&framework.title;</title>
         <w3c-designation>&w3c-designation-framework;</w3c-designation>
@@ -23,7 +23,7 @@
         </pubdate>
         <publoc>
             <loc href="&w3c-designation-framework;">&w3c-designation-framework;</loc>
-        </publoc> &altlocs; <prevlocs>
+        </publoc> &altlocs.framework; <prevlocs>
             <loc href="&prevloc;">&prevloc;</loc>
         </prevlocs>
         <latestloc>

Index: status-wsdl11ei.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/status-wsdl11ei.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- status-wsdl11ei.xml	26 Jan 2007 22:30:35 -0000	1.1
+++ status-wsdl11ei.xml	22 Mar 2007 03:33:41 -0000	1.2
@@ -4,12 +4,10 @@
 document. A list of current W3C publications and the latest
 revision of this technical report can be found in the <loc href="http://www.w3.org/TR/">W3C technical reports index</loc> at http://www.w3.org/TR/.</emph></p>
 <p>This is the <loc
-href="http://www.w3.org/Consortium/Process/tr.html#first-wd">First Public
-Working Draft</loc> of the &wsdl11ei.title; specification. This Working Draft was produced by the members of the <loc href="http://www.w3.org/2002/ws/policy/">Web Services Policy Working Group</loc>, which is part of the <loc
-  href="http://www.w3.org/2002/ws/Activity">W3C Web Services Activity</loc>.
-The Working Group expects to advance this Working Draft to Working Group Note.</p>
+href="http://www.w3.org/2005/10/Process-20051014/tr.html#q75">W3C Working Group Note</loc> of the &wsdl11ei.title; specification. This Working Group Note was produced by the members of the <loc href="http://www.w3.org/2002/ws/policy/">Web Services Policy Working Group</loc>, which is part of the <loc
+  href="http://www.w3.org/2002/ws/Activity">W3C Web Services Activity</loc>.</p>
 
- <p>Note that this Working Draft does not necessarily represent a consensus of the Working Group. Discussion of this document takes place on the public <loc
+ <p>Discussion of this document takes place on the public <loc
   href="mailto:public-ws-policy@w3.org">public-ws-policy@w3.org</loc>
   mailing list (<loc
   href="http://lists.w3.org/Archives/Public/public-ws-policy/">public

Index: entities.dtd
===================================================================
RCS file: /sources/public/2006/ws/policy/entities.dtd,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- entities.dtd	22 Feb 2007 21:47:09 -0000	1.17
+++ entities.dtd	22 Mar 2007 03:33:41 -0000	1.18
@@ -1,6 +1,6 @@
 <!--
- comment this entity for publication
- -->
+ comment this entity for publication -->
+
 
 <!ENTITY % sub.entities SYSTEM "entitiesedcopy.dtd" >
 
@@ -8,8 +8,8 @@
  uncomment the following entity for publication, and change the date
  in entitieswd.dtd
 
-<!ENTITY % sub.entities SYSTEM "entitieswd.dtd" >
--->
+<!ENTITY % sub.entities SYSTEM "entitieswd.dtd" >-->
+
 
 %sub.entities;
 

Index: wsdl11elementidentifiers.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/wsdl11elementidentifiers.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- wsdl11elementidentifiers.xml	8 Mar 2007 23:42:34 -0000	1.15
+++ wsdl11elementidentifiers.xml	22 Mar 2007 03:33:42 -0000	1.16
@@ -4,14 +4,15 @@
 	<!ENTITY % entities SYSTEM "entities.dtd">
 	%entities;
 	<!ENTITY status SYSTEM "status-wsdl11ei.xml">
-	<!ENTITY document.status "Editors' copy $Date$">
+	<!ENTITY document.status.wsdl11ei "Editors' copy $Date$">
+	<!ENTITY prevloc "http://www.w3.org/TR/2007/WD-wsdl11elementidentifiers-20070131">
 	<!ENTITY wsdl-ns "http://schemas.xmlsoap.org/wsdl/">
 ]>
 <spec w3c-doctype="wd" role="&document.role;">
 	<header>
 		<title>&wsdl11ei.title;</title>
 		<w3c-designation>&w3c-designation-wsdl11ei;</w3c-designation>
-		<w3c-doctype>&document.status;</w3c-doctype>
+		<w3c-doctype>&document.status.wsdl11ei;</w3c-doctype>
 		<pubdate>
 			<day>&draft.day;</day>
 			<month>&draft.month;</month>
@@ -20,13 +21,13 @@
 		<publoc>
 			<loc href="&w3c-designation-wsdl11ei;">&w3c-designation-wsdl11ei;</loc>
 		</publoc>
-	    &altlocs;
+	    <prevlocs>
+            <loc href="&prevloc;">&prevloc;</loc>
+        </prevlocs>
+	    &altlocs.wsdl11ei;
 		<latestloc>
 			<loc href="&wsdl11ei.latest;">&wsdl11ei.latest;</loc>
 		</latestloc>
-<!-- <prevlocs>
-
-		</prevlocs> -->
 		<authlist>
 			<author>
 				<name>David Orchard</name>

Index: ws-policy-attachment.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment.xml,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- ws-policy-attachment.xml	16 Mar 2007 20:13:19 -0000	1.93
+++ ws-policy-attachment.xml	22 Mar 2007 03:33:41 -0000	1.94
@@ -7,11 +7,11 @@
 <!ENTITY status SYSTEM "status-attachment.xml">
 <!ENTITY document.status "Editors' copy $Date$">
 <!ENTITY attachment-title "&attachment.title;">
-<!ENTITY prevloc "http://www.w3.org/TR/2006/WD-ws-policy-attach-20061117">
+<!ENTITY prevloc "http://www.w3.org/TR/2007/CR-ws-policy-attach-20070228/">
 <!ENTITY hellip "&#8230;">
 ]>
 <?xml-stylesheet type='text/xsl' href='xmlspec-policy.xsl'?>
-<spec w3c-doctype="cr" role="&document.role;">
+<spec w3c-doctype="wd" role="&document.role;">
 <header>
 <title>&attachment.title;</title>
 <w3c-designation>&w3c-designation-attachment;</w3c-designation>
@@ -24,7 +24,7 @@
 <publoc>
 <loc href="&w3c-designation-attachment;">&w3c-designation-attachment;</loc>
 </publoc>
-    &altlocs;
+    &altlocs.attachment;
 	<prevlocs>
             <loc href="&prevloc;">&prevloc;</loc>
         </prevlocs>

Index: entitiesedcopy.dtd
===================================================================
RCS file: /sources/public/2006/ws/policy/entitiesedcopy.dtd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- entitiesedcopy.dtd	26 Jan 2007 22:30:35 -0000	1.7
+++ entitiesedcopy.dtd	22 Mar 2007 03:33:41 -0000	1.8
@@ -47,4 +47,13 @@
 
 <!ENTITY status "<status><p></p></status>">
 
-<!ENTITY altlocs "">
+<!ENTITY altlocs.framework "">
+
+<!ENTITY altlocs.attachment "">
+
+<!ENTITY altlocs.primer "">
+
+<!ENTITY altlocs.guidelines "">
+
+
+<!ENTITY altlocs.wsdl11ei "">

Index: ws-policy-guidelines.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-guidelines.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- ws-policy-guidelines.xml	19 Mar 2007 14:43:52 -0000	1.45
+++ ws-policy-guidelines.xml	22 Mar 2007 03:33:41 -0000	1.46
@@ -5,8 +5,8 @@
 %entities;
 <!ENTITY status SYSTEM "status-guidelines.xml">
 <!ENTITY prefix "ws-policy-guidelines" >
-<!ENTITY document.status "Editors' copy $Date$">
-<!ENTITY prevloc "">
+<!ENTITY document.status.guidelines "Editors' copy $Date$">
+<!ENTITY prevloc "http://www.w3.org/TR/2006/WD-ws-policy-primer-20061221">
 <!ENTITY hellip "&#8230;">
 ]>
 <?xml-stylesheet type='text/xsl' href='xmlspec-policy.xsl'?>
@@ -14,7 +14,7 @@
   <header>
     <title>&guidelines.title;</title>
     <w3c-designation>&w3c-designation-guidelines;</w3c-designation>
-    <w3c-doctype>&document.status;</w3c-doctype>
+    <w3c-doctype>&document.status.guidelines;</w3c-doctype>
     <pubdate>
       <day>&draft.day;</day>
       <month>&draft.month;</month>
@@ -22,12 +22,10 @@
     </pubdate>
     <publoc>
       <loc href="&w3c-designation-guidelines;">&w3c-designation-guidelines;</loc>
-    </publoc> &altlocs;
-    <!--
+    </publoc> &altlocs.guidelines;
 	<prevlocs>
             <loc href="&prevloc;">&prevloc;</loc>
         </prevlocs>
--->
     <latestloc>
       <loc href="&guidelines.latest;">&guidelines.latest;</loc>
     </latestloc>

Received on Thursday, 22 March 2007 17:38:25 UTC