RE: 2006/ws/policy ws-policy-framework.xml,1.15,1.16

I'm soo baffled.  I did a bunch of changes, then I did an update from cvs when I saw you checked yours in, and it looks like all my changes got incorporated magically by eclipse.  That would explain why I was stunned when it looked like you did the changes EXACTLY as I did them.  

I'm still baffled by why eclipse did what it did.  And further, I can't see the "actual" v1.16 of the xml, just the merged version.

I'll muddle on this for a bit longer.

Cheers,
Dave

> -----Original Message-----
> From: Prasad Yendluri [mailto:prasad.yendluri@webmethods.com]
> Sent: Tuesday, August 08, 2006 3:36 PM
> To: David Orchard; Prasad Yendluri via cvs-syncmail; public-ws-policy-
> eds@w3.org
> Subject: RE: 2006/ws/policy ws-policy-framework.xml,1.15,1.16
> 
> Hi Dave,
> 
> All my changes are related to application of resolution for issue 3551.
> I think one of the changes required adding text to a line, that contained
> a
> termdef. I did not change the termdef or modify it in any fashion.
> 
> Regards,
> Prasad
> 
> -----Original Message-----
> From: public-ws-policy-eds-request@w3.org
> [mailto:public-ws-policy-eds-request@w3.org] On Behalf Of David Orchard
> Sent: Tuesday, August 08, 2006 3:21 PM
> To: Prasad Yendluri via cvs-syncmail; public-ws-policy-eds@w3.org
> Subject: RE: 2006/ws/policy ws-policy-framework.xml,1.15,1.16
> 
> 
> Prasad,
> 
> This looks like it has done a number of the termdef items that are part of
> action item 15 that I had been assigned and working on.  Did you decide to
> do all of the action item 15 or just part of it?  I suggest that you be
> assigned the owner since it seems like you've at least started the work,
> if
> not done it all.
> 
> http://www.w3.org/2006/07/12-ws-policy-minutes.html#action15
> 
> Thanks,
> Dave
> 
> > -----Original Message-----
> > From: public-ws-policy-eds-request@w3.org [mailto:public-ws-policy-eds-
> > request@w3.org] On Behalf Of Prasad Yendluri via cvs-syncmail
> > Sent: Thursday, August 03, 2006 2:45 PM
> > To: public-ws-policy-eds@w3.org
> > Subject: 2006/ws/policy ws-policy-framework.xml,1.15,1.16
> >
> >
> > Update of /sources/public/2006/ws/policy
> > In directory hutz:/tmp/cvs-serv8977
> >
> > Modified Files:
> > 	ws-policy-framework.xml
> > Log Message:
> > Issue 3551 resolution (Misc. (editorial) corrections throughout)
> > incorporated.
> >
> > Index: ws-policy-framework.xml
> > ===================================================================
> > RCS file: /sources/public/2006/ws/policy/ws-policy-framework.xml,v
> > retrieving revision 1.15
> > retrieving revision 1.16
> > diff -u -d -r1.15 -r1.16
> > --- ws-policy-framework.xml	28 Jul 2006 06:34:26 -0000	1.15
> > +++ ws-policy-framework.xml	3 Aug 2006 21:44:32 -0000	1.16
> > @@ -331,7 +331,7 @@
> >  <p><termdef id='policy_assertion' term='policy assertion'>A
> <term>policy
> > assertion</term> represents an individual requirement, capability, or
> > other property of a behavior.</termdef></p>
> >  <p><termdef id='policy_assertion_type' term='policy assertion type'>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.</termdef></p>
> >  <p><termdef id='policy_assertion_parameter' term='policy assertion
> > parameter'>A <term>policy assertion parameter</term> qualifies the
> > behavior indicated by a <termref def='policy_assertion'>policy
> > assertion</termref>.</termdef></p>
> > -<p><termdef id='policy_vocabulary' term='policy vocabulary'>A
> > <term>policy vocabulary</term> of a policy is the set of all <termref
> > def='policy_assertion_type'>policy assertion types</termref> used in a
> > policy.</termdef></p>
> > +<p><termdef id='policy_vocabulary' term='policy vocabulary'>A
> > <term>policy vocabulary</term> is the set of all <termref
> > def='policy_assertion_type'>policy assertion types</termref> used in a
> > policy.</termdef></p>
> >  <p><termdef id='policy_expression' term='policy expression'>A
> > <term>policy expression</term> is an XML Infoset representation of a
> > <termref def='policy'>policy</termref>, either in a normal form or in an
> > equivalent compact form. </termdef></p>
> >  <p><termdef id='policy_subject' term='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. </termdef></p>
> >  <p><termdef id='policy_scope' term='policy scope'>A <term>policy
> > scope</term> is a collection of <termref def='policy_subject'>policy
> > subjects</termref> to which a policy may apply.</termdef></p>
> > @@ -342,7 +342,7 @@
> >  	  <head>Policy Model</head>
> >
> >  	  <p>This section defines an abstract model for policies and for
> > operations upon policies.</p>
> > -	  <p>This abstract model is independent of how it is represented as
> > an XML Infoset. </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>
> >  	  <div2 id="rPolicy_Assertion">
> >  	    <head>Policy Assertion</head>
> >
> > @@ -392,7 +392,7 @@
> >  	    expressions. Specifically, domain authors are encouraged
> >  	    to consider when the identity of the root Element
> >  	    Information Item alone is enough to convey the requirement
> > -	    (capability).</p>
> > +	    or capability.</p>
> >
> >  	  </div2>
> >  	  <div2 id="rPolicy_Alternative">
> > @@ -492,8 +492,7 @@
> >  	    the <termref def='policy_vocabulary'>vocabulary of the
> >  	    policy</termref>; the requester only has to understand the
> >  	    type of each assertion in the vocabulary of a <termref
> > -	    def='policy_alternative'>policy
> > -	    alternative</termref>. This characteristic is crucial to
> > +	        def='policy_alternative'>policy alternative</termref> the
> > requester supports. This characteristic is crucial to
> >  	    versioning and incremental deployment of new assertions
> >  	    because this allows a provider's policy to include new
> >  	    assertions in new alternatives while allowing requesters
> > @@ -579,7 +578,7 @@
> >  (09)   &lt;/wsp:ExactlyOne&gt;
> >  (10) &lt;/wsp:Policy&gt;</eg>
> >
> > -<p>Lines (02-05) and Lines (06-08) express the two alternatives in the
> > +<p>Lines (03-05) and Lines (06-08) express the two alternatives in the
> >  policy. If the first alternative is selected, only the Basic 256 RSA
> >  15 algorithm suite [<bibref ref="WS-SecurityPolicy"/>] is supported;
> >  conversely, if the second alternative is selected, only the 3DES RSA
> >

Received on Tuesday, 8 August 2006 22:47:42 UTC