2006/ws/policy ws-policy-guidelines.xml,1.19,1.20

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

Modified Files:
	ws-policy-guidelines.xml 
Log Message:
Example formatting in sec. 4.2 and sec. 8, updated change log accordingly.

Index: ws-policy-guidelines.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-guidelines.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ws-policy-guidelines.xml	30 Nov 2006 06:03:53 -0000	1.19
+++ ws-policy-guidelines.xml	18 Dec 2006 03:48:58 -0000	1.20
@@ -495,8 +495,9 @@
 	   		recursively nested policy operators, and a policy reference/inclusion mechanism.
       		</p>
 			<example>
-				<eg xml:space="preserve">&lt;wsp:Policy xmlns:wsp='&nsuri;'   xmlns:sp='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy' 
-                   xmlns:wsrmp='http://docs.oasis-open.org/ws-rx/wsrmp/200608'&gt;
+				<eg xml:space="preserve">&lt;wsp:Policy xmlns:wsp='&nsuri;'
+ xmlns:sp='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy' 
+ xmlns:wsrmp='http://docs.oasis-open.org/ws-rx/wsrmp/200608'&gt;
  &lt;wsrmp:RMAssertion wsp:Optional="true"/&gt;
  &lt;wsp:ExactlyOne&gt; 
   &lt;wsp:All&gt;
@@ -519,11 +520,12 @@
       		
       		
 			<example>
-				<eg xml:space="preserve">&lt;wsp:Policy xmlns:wsp='&nsuri;'   xmlns:sp='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy' 
+				<eg xml:space="preserve">&lt;wsp:Policy xmlns:wsp='&nsuri;'
+ xmlns:sp='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy' 
  xmlns:wsrmp='http://docs.oasis-open.org/ws-rx/wsrmp/200608'&gt;
  &lt;wsp:ExactlyOne&gt; 
-  &lt;wsp:All&gt;
 
+  &lt;wsp:All&gt;
    &lt;wsrmp:RMAssertion&gt;
       &lt;sp:TransportBinding&gt;
        &lt;wsp:Policy&gt;
@@ -532,8 +534,7 @@
                   &lt;sp:HttpsToken RequireClientCertificate='true' /&gt;
             &lt;/wsp:Policy&gt;
           &lt;/sp:TransportToken&gt;
-
- &lt;/wsp:Policy&gt;
+      &lt;/wsp:Policy&gt;
      &lt;/sp:TransportBinding&gt;
   &lt;/wsp:All&gt;
 
@@ -548,6 +549,7 @@
        &lt;/wsp:Policy&gt;
       &lt;/sp:TransportBinding&gt;
   &lt;/wsp:All&gt;
+
  &lt;/wsp:ExactlyOne&gt;
 &lt;/wsp:Policy&gt;</eg>
 			</example>
@@ -1334,16 +1336,16 @@
 				<head>Message with Security Headers</head>
 				<eg xml:space="preserve">&lt;soap:Envelope&gt; 
   &lt;soap:Header&gt;
-	&lt;wss:Security soap:mustUnderstand ="1"&gt;
-	  &lt;wsu:Timestamp u:Id=_0"&gt;
-		&lt;wsu:Created&gt; 20006-01-19T02:49:53.914Z &lt;/u:Created&gt; 
-		&lt;wsu:Expires&gt; 20006-01-19T02:54:53.914Z &lt;/u:Expires&gt;
-	  &lt;/wsu:Timestamp&gt;
+    &lt;wss:Security soap:mustUnderstand ="1"&gt;
+      &lt;wsu:Timestamp u:Id=_0"&gt;
+        &lt;wsu:Created&gt; 20006-01-19T02:49:53.914Z &lt;/u:Created&gt; 
+        &lt;wsu:Expires&gt; 20006-01-19T02:54:53.914Z &lt;/u:Expires&gt;
+      &lt;/wsu:Timestamp&gt;
     &lt;/wss:Security&gt;
-	&lt;wsa:To&gt; http://CompanyA/quote &lt;wsa:To&gt;
-	&lt;wsa:Action&gt; http://CompanyA/GetRealQuote&lt;/wsa:Action&gt;
-&lt;/soap:Header&gt;
-&lt;soap:Body&gt;
+    &lt;wsa:To&gt; http://CompanyA/quote &lt;wsa:To&gt;
+    &lt;wsa:Action&gt; http://CompanyA/GetRealQuote&lt;/wsa:Action&gt;
+ &lt;/soap:Header&gt;
+ &lt;soap:Body&gt; ...
 &lt;/soap:Envelope&gt;</eg>
 			</example>
 			<p>The SOAP message in the example above includes security
@@ -1393,11 +1395,13 @@
      after it is processed by the transport.  The additional security
      processing is not required by all Company A web services. </p>
      <example> <head>CompanyA-ProfileB (not expanded)</head> <eg
-     xml:space="preserve"> &lt;Policy wsu:Id="CompanyA-ProfileB"&gt;
-     &lt;wsa:UsingAddressing /&gt; &lt;ExactlyOne&gt;
-     &lt;sp:TransportBinding&gt;&lt;/sp:TransportBinding&gt;
-     &lt;sp:AsymmetricBinding&gt;&lt;/sp:AssymetricBinding&gt;
-     &lt;/ExactlyOne&gt; &lt;/Policy&gt; </eg> </example>
+     xml:space="preserve">&lt;Policy wsu:Id="CompanyA-ProfileB"&gt;
+ &lt;wsa:UsingAddressing/&gt;
+ &lt;ExactlyOne&gt;
+  &lt;sp:TransportBinding&gt;&lt;/sp:TransportBinding&gt;
+  &lt;sp:AsymmetricBinding&gt;&lt;/sp:AssymetricBinding&gt;
+ &lt;/ExactlyOne&gt;
+&lt;/Policy&gt;</eg> </example>
 			<p>We have shown above that Company A offered a
     second profile that included two security options.  The details of
     the Bindings, requires a more detailed exploration of some of the
@@ -1421,27 +1425,26 @@
      <code>sp:TransportBinding</code> policy assertion.  </p>
 			<example>
 				<head>CompanyA-ProfileB (fully expanded)</head>
-				<eg xml:space="preserve">
-&lt;Policy wsu:Id="CompanyA-ProfileB"&gt; 
-	&lt;wsa:UsingAddressing /&gt;
-	&lt;ExactlyOne&gt;
-	   &lt;sp:TransportBinding&gt;
-              &lt;Policy&gt;
-   	         &lt;sp:TransportToken&gt;
-		    &lt;Policy&gt;
-		      &lt;sp:HttpsToken RequireClienCertificate="false" /&gt;
-                    &lt;/Policy&gt;
-                 &lt;/sp:TransportToken&gt;
-                 &lt;sp:AlgorithmSuite&gt;
-                    &lt;Policy&gt;
-		       &lt;sp:Basic256Rsa15 /&gt;
-                    &lt;/Policy&gt;
-                 &lt;/sp:AlgorithmSuite&gt;
-              &lt;/Policy&gt;
-        &lt;/sp:TransportBinding&gt;
-	   &lt;sp:AsymmetricBinding&gt;
+				<eg xml:space="preserve">&lt;Policy wsu:Id="CompanyA-ProfileB"&gt; 
+ &lt;wsa:UsingAddressing/&gt;
+ &lt;ExactlyOne&gt;
+  &lt;sp:TransportBinding&gt;
+   &lt;Policy&gt;
+    &lt;sp:TransportToken&gt;
+     &lt;Policy&gt;
+      &lt;sp:HttpsToken RequireClienCertificate="false" /&gt;
+     &lt;/Policy&gt;
+    &lt;/sp:TransportToken&gt;
+    &lt;sp:AlgorithmSuite&gt;
+     &lt;Policy&gt;
+      &lt;sp:Basic256Rsa15 /&gt;
+     &lt;/Policy&gt;
+    &lt;/sp:AlgorithmSuite&gt;
+   &lt;/Policy&gt;
+  &lt;/sp:TransportBinding&gt;
+  &lt;sp:AsymmetricBinding&gt;
   &lt;/sp:AssymetricBinding&gt;
-	&lt;/ExactlyOne&gt;
+ &lt;/ExactlyOne&gt;
 &lt;/Policy&gt;</eg>
 			</example>
 			<p>
@@ -1477,12 +1480,10 @@
      in the wsdl binding for each web service. </p>
 			<example>
 				<head/>
-				<eg xml:space="preserve">
-&lt;wsdl:binding name="CompanyADefaultBinding" type="tns:CompanyADefault"&gt; 
-  &lt;wsp:PolicyReference URI="http://www.CompanyA.com/WebServicesProfileA.xml"&gt;
-
-&lt;wsdl:operation name="GetQuote"&gt; &lt;/wsdl:operation&gt;
-&lt;/wsdl:binding&gt; </eg>
+				<eg xml:space="preserve">&lt;wsdl:binding name="CompanyADefaultBinding" type="tns:CompanyADefault"&gt;
+ &lt;wsp:PolicyReference URI="http://www.CompanyA.com/WebServicesProfileA.xml"&gt;
+ &lt;wsdl:operation name="GetQuote"&gt; &lt;/wsdl:operation&gt;
+&lt;/wsdl:binding&gt;</eg>
 			</example>
 			<p>The partner specified policy is included in the beginning of
     the WSDL 1.1 document and referenced by the binding for the service
@@ -1515,10 +1516,9 @@
 &lt;/wsp:Policy&gt;
 
 &lt;wsdl:binding name="CompanyADefaultBinding" type="tns:CompanyADefault"&gt; 
-  &lt;wsp:PolicyReference id=#CompanyA-ProfileB&gt;
-	&lt;wsdl:operation name="GetQuote"&gt; &lt;/wsdl:operation&gt;
-
-&lt;/wsdl:binding&gt; </eg>
+ &lt;wsp:PolicyReference id=#CompanyA-ProfileB&gt;
+ &lt;wsdl:operation name="GetQuote"&gt; &lt;/wsdl:operation&gt;
+&lt;/wsdl:binding&gt;</eg>
 			</example>
 			<p>In some cases, companies may chose to implement their own
   assertions.  When companies chose to become policy authors they need
@@ -1850,6 +1850,12 @@
 						<td>ASV</td>
 						<td>Formatted examples in <specref ref="extending-assertions"/>. 
 						</td>
+					</tr>
+	<tr>
+						<td>20061218</td>
+						<td>FS</td>
+						<td>Formatted examples in <specref ref="compact-full"/> and <specref ref="scenario"/>. 
+						</td>
 					</tr>									
 				</tbody>
 			</table>

Received on Monday, 18 December 2006 03:49:23 UTC