Mon Jun 28 12:53:39 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl:
        * connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html:
        * connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html:
        * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp:
          Renamed ShapesCOnnector to ShapeType_conn

11 files changed, 36 insertions, 22 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 9a4fcad92bf..58b6fe2b3de 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Mon Jun 28 12:53:39 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html:
+        * connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html:
+        * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp:
+          Renamed ShapesCOnnector to ShapeType_conn
+
 Mon Jun 28 12:13:08 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * bin/ciao_tests.lst:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp
index b9fbbc766c9..627d2db4897 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp
@@ -124,7 +124,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Shapes_ShapesConnector_DDS_Event_Impl</string>
+          <string>create_Shapes_ShapeType_conn_DDS_Event_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -135,7 +135,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Shapes_ShapesConnector_DDS_Event_Servant</string>
+          <string>create_Shapes_ShapeType_conn_DDS_Event_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl
index 4ab103f4ecc..1360f9c08c5 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl
@@ -9,7 +9,7 @@ module Shapes
 {
   component Receiver_comp
   {
-    port ShapesConnector::DDS_Listen info_out;
+    port ShapeType_conn::DDS_Listen info_out;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
index 49a45fdb70c..b1bd82470b2 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
@@ -57,7 +57,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl
   // Component attributes.
 
   // Port operations.
-  ::Shapes::ShapesConnector::CCM_Listener_ptr
+  ::Shapes::ShapeType_conn::CCM_Listener_ptr
   Receiver_comp_exec_i::get_info_out_data_listener (void)
   {
     if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
@@ -66,13 +66,13 @@ namespace CIAO_Shapes_Receiver_comp_Impl
         ACE_NEW_RETURN (
           tmp,
           info_out_data_listener_exec_i (),
-          ::Shapes::ShapesConnector::CCM_Listener::_nil ());
+          ::Shapes::ShapeType_conn::CCM_Listener::_nil ());
 
         this->ciao_info_out_data_listener_ = tmp;
       }
 
     return
-      ::Shapes::ShapesConnector::CCM_Listener::_duplicate (
+      ::Shapes::ShapeType_conn::CCM_Listener::_duplicate (
         this->ciao_info_out_data_listener_.in ());
   }
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
index f1922101ca6..604e4ea27f5 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
@@ -21,7 +21,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl
   // info_out_data_listener_exec_i
   //============================================================
   class SHAPES_RECEIVER_COMP_EXEC_Export info_out_data_listener_exec_i
-    : public virtual ::Shapes::ShapesConnector::CCM_Listener,
+    : public virtual ::Shapes::ShapeType_conn::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
@@ -51,7 +51,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl
     // Component attributes.
 
     // Port operations.
-    virtual ::Shapes::ShapesConnector::CCM_Listener_ptr
+    virtual ::Shapes::ShapeType_conn::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -70,7 +70,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl
 
   private:
     ::Shapes::CCM_Receiver_comp_Context_var context_;
-    ::Shapes::ShapesConnector::CCM_Listener_var ciao_info_out_data_listener_;
+    ::Shapes::ShapeType_conn::CCM_Listener_var ciao_info_out_data_listener_;
   };
 
   extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl
index 2cf416c301e..56e73042ddd 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl
@@ -10,7 +10,7 @@ module Shapes
 {
   component Sender_comp
   {
-    port ShapesConnector::DDS_Write info_write;
+    port ShapeType_conn::DDS_Write info_write;
 
     provides Shapes::Control_obj control;
   };
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
index dd2b79ded90..0191c9696af 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
@@ -76,7 +76,7 @@ namespace CIAO_Shapes_Sender_comp_Impl
   ::Shapes::ReturnStatus
   Sender_exec_i::update_square ()
   {
-    ::Shapes::ShapesConnector::Writer_var writer =
+    ::Shapes::ShapeType_conn::Writer_var writer =
       this->context_->get_connection_info_write_data ();
     if (::CORBA::is_nil (writer.in ()))
       {
@@ -129,7 +129,7 @@ namespace CIAO_Shapes_Sender_comp_Impl
   void
   Sender_exec_i::ccm_activate (void)
   {
-    ::Shapes::ShapesConnector::Writer_var writer =
+    ::Shapes::ShapeType_conn::Writer_var writer =
       this->context_->get_connection_info_write_data ();
     if (::CORBA::is_nil (writer.in ()))
       {
@@ -163,7 +163,7 @@ namespace CIAO_Shapes_Sender_comp_Impl
   void
   Sender_exec_i::ccm_passivate (void)
   {
-    ::Shapes::ShapesConnector::Writer_var writer =
+    ::Shapes::ShapeType_conn::Writer_var writer =
       this->context_->get_connection_info_write_data ();
     if (::CORBA::is_nil (writer.in ()))
       {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
index b08c9fa6a9b..3e87d01efed 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
@@ -12,7 +12,7 @@
 module Shapes
 {
   typedef sequence<ShapeType_msg> ShapeType_msgSeq;
-  module ::CCM_DDS::Typed < ::ShapeType_msg, ShapeType_msgSeq> ShapesConnector;
+  module ::CCM_DDS::Typed < ::ShapeType_msg, ShapeType_msgSeq> ShapeType_conn;
 };
 
 #endif /* SHAPES_SHAPETYPE_CONN_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html
index 2e6aa75a68e..fcd700fd43c 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html
@@ -43,7 +43,7 @@
             {<br/>
             &nbsp;&nbsp;<b>typedef</b> <b>sequence</b><ShapeType> ShapeTypeSeq;<br/>
             &nbsp;&nbsp;<b>module</b> ::CCM_DDS::Typed < ::ShapeType, ShapeTypeSeq>
-            ShapesConnector;<br/>
+            ShapeType_conn;<br/>
             };<br/>
           </code>
           This IDL contains the declaration of the DDS4CCM connector. The used
@@ -146,7 +146,7 @@
     {<br/>
     &nbsp;&nbsp;<b>component</b> Sender_comp<br/>
     &nbsp;&nbsp;{<br/>
-    &nbsp;&nbsp;&nbsp;&nbsp;<b>port</b> ShapesConnector::DDS_Write info_write;<br/>
+    &nbsp;&nbsp;&nbsp;&nbsp;<b>port</b> ShapeType_conn::DDS_Write info_write;<br/>
     &nbsp;&nbsp;&nbsp;&nbsp;<b>provides</b> Shapes::Control_obj control;<br/>
     &nbsp;&nbsp;};<br/>};
     </code><br/><br/>
@@ -176,7 +176,7 @@
       {<br/>
       &nbsp;&nbsp;component Receiver_comp<br/>
       &nbsp;&nbsp;{<br/>
-      &nbsp;&nbsp;&nbsp;&nbsp;<b>port</b> ShapesConnector::DDS_Listen info_out;<br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;<b>port</b> ShapeType_conn::DDS_Listen info_out;<br/>
       &nbsp;&nbsp;};<br/>};<br/>
     </code>
   </p>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html
index 8a79df3619d..cbe53218956 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html
@@ -187,7 +187,7 @@
     DDS_Event basic port. The following code retrieves the connection to the
     Writer interface from the context.
     <br/>
-    <code>::Shapes::ShapesConnector::Writer_var writer =
+    <code>::Shapes::ShapeType_conn::Writer_var writer =
       this->context_->get_connection_info_write_data ();</code>
     <br/>
   </p>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp
index a71b7f73b0f..a87a91047a0 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp
@@ -50,7 +50,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl
   {
   }
   
-  // Operations from ::Shapes::ShapesConnector::Listener
+  // Operations from ::Shapes::ShapeType_conn::Listener
   
   void
   info_out_data_listener_exec_i::on_one_data (
@@ -118,7 +118,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl
   
   // Component attributes and port operations.
   
-  ::Shapes::ShapesConnector::CCM_Listener_ptr
+  ::Shapes::ShapeType_conn::CCM_Listener_ptr
   Receiver_comp_exec_i::get_info_out_data_listener (void)
   {
     if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
@@ -128,13 +128,13 @@ namespace CIAO_Shapes_Receiver_comp_Impl
           tmp,
           info_out_data_listener_exec_i (
             this->ciao_context_.in ()),
-          ::Shapes::ShapesConnector::CCM_Listener::_nil ());
+          ::Shapes::ShapeType_conn::CCM_Listener::_nil ());
         
         this->ciao_info_out_data_listener_ = tmp;
       }
     
     return
-      ::Shapes::ShapesConnector::CCM_Listener::_duplicate (
+      ::Shapes::ShapeType_conn::CCM_Listener::_duplicate (
         this->ciao_info_out_data_listener_.in ());
   }