Fri Jun 18 07:21:07 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html:
        * connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html:
        * connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html:
          Update.

4 files changed, 60 insertions, 6 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e4935e4978d..651bbf98d2c 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 18 07:21:07 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html:
+        * connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html:
+        * connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html:
+          Update.
+
 Fri Jun 18 06:43:45 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html
index 82e42a3c410..2e6aa75a68e 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html
@@ -58,7 +58,7 @@
             };<br/>
           </code>
           The ShapeType struct is the the data structure that is send from the
-          sender to the receiver through DDS.<br/>
+          sender to the receiver through DDS. In DDS this struct is called a sample.<br/>
           This file is also used as input for the RTI DDS generator. Since we're
           using RTI DDS in this example, the key of this struct is defined with
           <code>//@key</code> as shown above.
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html
index a8c719de167..dc943287082 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html
@@ -10,19 +10,66 @@
     <tr>
       <td align="left"><a href="./03_executors.html">Previous<a></td>
       <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./05_coding.html"><a></td>
+      <td align="right"><a href="./05_coding.html">Next<a></td>
     </tr>
   </table>
   <hr />
 
-  <h1>DDS4CCM</h1>
+  <h1>DDS4CCM basics</h1>
+  <p>
+    The DDS4CCM connector itself is a CCM component placed between your component
+    and DDS itself.<br/>
+    In DDS there're basically two entities: DataWriters and DataReaders.
+    To gain access to these entities, the DDS4CCM connector offers two basic types
+    of ports (connectors) : DDS_Event and DDS_State.
+    These basic ports have extended ports which allow the user to access the actual
+    datareaders and datawriters. It'll depend on the functionality of your component
+    which type of basic port you're going to use.<br/>
+    A DDS_Event DDS4CCM connector consists of the following extented ports:
+    <ul>
+      <li>A DDS_Write port</li>
+      <li>A DDS_Get port</li>
+      <li>A DDS_Listen port</li>
+    </ul>
+    A DDS_State DDS4CCM connector consists of the following extended ports:
+    <ul>
+      <li>A DDS_Update port</li>
+      <li>A DDS_Read port</li>
+      <li>A DDS_Get port</li>
+      <li>A DDS_Listen port</li>
+      <li>A DDS_StateListen port</li>
+    </ul>
+  </p>
+  <p>
+    See <a href="../../../idl/ccm_dds.idl">ccm_dds.idl<a> for a complete overview
+    of connector types, extend ports and their methods.
+  </p>
+  <h2>Example</h2>
+  <p>
+    The Sender component of this Shapes tutorial writes a ShapeType struct (sample)
+    to DDS every time the Controller invokes setSize or setLocation.
+    The Sender therefor is connected to a DDS_Event connector and uses the
+    DDS_Write extended port. To write a sample, the Sender uses the write_one method
+    of the DDS_Write extended port (see ccm_dds.idl and the Shapes Sender
+    executor file).
+  </p>
+  <p>
+    The Receiver listens to DDS for data. DDS invokes a listener callback method (
+    on_data_available) on the DDS4CCM connector which in turn invokes the
+    on_data_available method on the Receiver component. To establish all this
+    the Receiver is connected to a DDS_Event connector and uses the DDS_Listen
+    extended port (see ccm_dds.idl and the Shapes Receiver executor file).
+  </p>
+  <p>
+    All this will be discussed in more detail later in this tutorial.
+  </p>
 
   <hr />
   <table width="100%" border="0">
     <tr>
       <td align="left"><a href="./03_executors.html">Previous<a></td>
       <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./05_coding.html"><a></td>
+      <td align="right"><a href="./05_coding.html">Next<a></td>
     </tr>
   </table>
 </body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html
index bb9a570e51a..2865ae54958 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html
@@ -10,7 +10,7 @@
     <tr>
       <td align="left"><a href="./04_dds4ccm.html">Previous<a></td>
       <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./06_compilation.html"><a></td>
+      <td align="right"><a href="./06_compilation.html">Next<a></td>
     </tr>
   </table>
   <hr />
@@ -22,7 +22,7 @@
     <tr>
       <td align="left"><a href="./04_dds4ccm.html">Previous<a></td>
       <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
-      <td align="right"><a href="./06_compilation.html"><a></td>
+      <td align="right"><a href="./06_compilation.html">Next<a></td>
     </tr>
   </table>
 </body>