Thu Jun 17 09:09:43 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc:
        * 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.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.cpp:
          Renamed executor files. Also renamed artifacts.

11 files changed, 123 insertions, 109 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 4c714f3031b..7986ee9f942 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Thu Jun 17 09:09:43 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc:
+        * 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.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.cpp:
+          Renamed executor files. Also renamed artifacts.
+
 Thu Jun 17 08:41:42 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp:
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 e5f06657a4f..68ec6cc0e32 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
@@ -42,7 +42,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Shapes_Receiver_svnt</string>
+          <string>Shapes_Receiver_comp_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -53,7 +53,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Shapes_Receiver_exec</string>
+          <string>Shapes_Receiver_comp_exec</string>
         </value>
       </value>
     </execParameter>
@@ -94,7 +94,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Shapes_Control_svnt</string>
+          <string>Shapes_Control_comp_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -105,7 +105,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Shapes_Control_exec</string>
+          <string>Shapes_Control_comp_exec</string>
         </value>
       </value>
     </execParameter>
@@ -198,7 +198,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Shapes_Sender_svnt</string>
+          <string>Shapes_Sender_comp_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -209,7 +209,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Shapes_Sender_exec</string>
+          <string>Shapes_Sender_comp_exec</string>
         </value>
       </value>
     </execParameter>
@@ -408,16 +408,16 @@
   </connection>
 
   <artifact xmi:id="Sender_ExecArtifact">
-    <name>Shapes_Sender_exec</name>
+    <name>Shapes_Sender_comp_exec</name>
     <source/>
     <node/>
-    <location>Shapes_Sender_exec</location>
+    <location>Shapes_Sender_comp_exec</location>
   </artifact>
   <artifact xmi:id="Sender_SvntArtifact">
-    <name>Shapes_Sender_svnt</name>
+    <name>Shapes_Sender_comp_svnt</name>
     <source/>
     <node/>
-    <location>Shapes_Sender_svnt</location>
+    <location>Shapes_Sender_comp_svnt</location>
   </artifact>
   <artifact xmi:id="Sender_StubArtifact">
     <name>Sender_stub</name>
@@ -438,16 +438,16 @@
     <location>Shapes_conn_svnt</location>
   </artifact>
   <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Shapes_Receiver_exec</name>
+    <name>Shapes_Receiver_comp_exec</name>
     <source/>
     <node/>
-    <location>Shapes_Receiver_exec</location>
+    <location>Shapes_Receiver_comp_exec</location>
   </artifact>
   <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Shapes_Receiver_svnt</name>
+    <name>Shapes_Receiver_comp_svnt</name>
     <source/>
     <node/>
-    <location>Shapes_Receiver_svnt</location>
+    <location>Shapes_Receiver_comp_svnt</location>
   </artifact>
   <artifact xmi:id="Receiver_StubArtifact">
     <name>Receiver_stub</name>
@@ -456,16 +456,16 @@
     <location>Receiver_stub</location>
   </artifact>
   <artifact xmi:id="Control_ExecArtifact">
-    <name>Shapes_Control_exec</name>
+    <name>Shapes_Control_comp_exec</name>
     <source/>
     <node/>
-    <location>Shapes_Control_exec</location>
+    <location>Shapes_Control_comp_exec</location>
   </artifact>
   <artifact xmi:id="Control_SvntArtifact">
-    <name>Shapes_Control_svnt</name>
+    <name>Shapes_Control_comp_svnt</name>
     <source/>
     <node/>
-    <location>Shapes_Control_svnt</location>
+    <location>Shapes_Control_comp_svnt</location>
   </artifact>
   <artifact xmi:id="Control_StubArtifact">
     <name>Control_stub</name>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
index cbbba62e7a1..633ebf329b1 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
@@ -4,13 +4,11 @@ project(Shapes_Control_idl_gen) : componentidldefaults {
   after += Shapes_Control_obj_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_STUB_Export \
-              -Wb,stub_export_include=Shapes_Control_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \
-              -Wb,skel_export_include=Shapes_Control_svnt_export.h \
+              -Wb,stub_export_include=Shapes_Control_comp_stub_export.h \
               -Wb,svnt_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Control_svnt_export.h \
+              -Wb,svnt_export_include=Shapes_Control_comp_svnt_export.h \
               -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Control_exec_export.h \
+              -Wb,exec_export_include=Shapes_Control_comp_exec_export.h \
               -I../ports \
               -I../../ports \
               -o GeneratedCode
@@ -25,7 +23,7 @@ project(Shapes_Control_lem_gen) : ciaoidldefaults {
   after += Shapes_Control_idl_gen Shapes_Control_obj_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_Control_lem_stub_export.h \
+              -Wb,stub_export_include=Shapes_Control_comp_lem_stub_export.h \
               -SS -Gxhst \
               -I../ports \
               -I../ports/GeneratedCode \
@@ -38,17 +36,17 @@ project(Shapes_Control_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(Shapes_Control_lem_stub) : ccm_svnt {
-  after += Shapes_Control_lem_gen Shapes_Control_stub Shapes_msg_stub \
+project(Shapes_Control_comp_lem_stub) : ccm_svnt {
+  after += Shapes_Control_lem_gen Shapes_Control_comp_stub Shapes_msg_stub \
            Shapes_Control_obj_stub
 
-  libs  += Shapes_msg_stub Shapes_Control_stub Shapes_Control_obj_stub
+  libs  += Shapes_msg_stub Shapes_Control_comp_stub Shapes_Control_obj_stub
   libpaths += ../../lib
   libout = ../../lib
 
   includes += ../../ports/GeneratedCode ../ports/GeneratedCode
 
-  sharedname = Shapes_Control_lem_stub
+  sharedname = Shapes_Control_comp_lem_stub
   dynamicflags   = SHAPES_CONTROL_COMP_LEM_STUB_BUILD_DLL
 
   IDL_Files {
@@ -60,7 +58,7 @@ project(Shapes_Control_lem_stub) : ccm_svnt {
 
   Header_Files {
     GeneratedCode/Shapes_Control_compEC.h
-    GeneratedCode/Shapes_Control_lem_stub_export.h
+    GeneratedCode/Shapes_Control_comp_lem_stub_export.h
   }
 
   Inline_Files {
@@ -68,7 +66,7 @@ project(Shapes_Control_lem_stub) : ccm_svnt {
   }
 }
 
-project(Shapes_Control_stub) : ccm_stub {
+project(Shapes_Control_comp_stub) : ccm_stub {
   after += Shapes_Control_idl_gen Shapes_msg_stub \
            Shapes_Control_obj_stub Shapes_Control_obj_lem_stub
 
@@ -78,7 +76,7 @@ project(Shapes_Control_stub) : ccm_stub {
 
   includes += ../../ports/GeneratedCode ../ports/GeneratedCode
 
-  sharedname = Shapes_Control_stub
+  sharedname = Shapes_Control_comp_stub
   dynamicflags   = SHAPES_CONTROL_COMP_STUB_BUILD_DLL
 
   IDL_Files {
@@ -90,7 +88,7 @@ project(Shapes_Control_stub) : ccm_stub {
 
   Header_Files {
     GeneratedCode/Shapes_Control_compC.h
-    GeneratedCode/Shapes_Control_stub_export.h
+    GeneratedCode/Shapes_Control_comp_stub_export.h
   }
 
   Inline_Files {
@@ -98,30 +96,30 @@ project(Shapes_Control_stub) : ccm_stub {
   }
 }
 
-project(Shapes_Control_exec) : ciao_executor {
-  after   += Shapes_Control_lem_stub Shapes_Control_stub \
+project(Shapes_Control_comp_exec) : ciao_executor {
+  after   += Shapes_Control_comp_lem_stub Shapes_Control_comp_stub \
              Shapes_Control_obj_lem_stub
 
-  libs += Shapes_Control_stub Shapes_Control_lem_stub Shapes_msg_stub \
+  libs += Shapes_Control_comp_stub Shapes_Control_comp_lem_stub Shapes_msg_stub \
           Shapes_Control_obj_lem_stub Shapes_Control_obj_stub
   libpaths += ../../lib
   libout = ../../lib
 
   includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
 
-  sharedname = Shapes_Control_exec
+  sharedname = Shapes_Control_comp_exec
   dynamicflags   = SHAPES_CONTROL_COMP_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Shapes_Control_exec.cpp
+    Shapes_Control_comp_exec.cpp
   }
 
   Header_Files {
-    Shapes_Control_exec.h
-    Shapes_Control_exec_export.h
+    Shapes_Control_comp_exec.h
+    Shapes_Control_comp_exec_export.h
   }
 
   Inline_Files {
@@ -129,12 +127,12 @@ project(Shapes_Control_exec) : ciao_executor {
 }
 
 
-project(Shapes_Control_svnt) : ciao_servant {
-  after      += Shapes_msg_stub  Shapes_Control_lem_stub \
-                Shapes_Control_stub Shapes_Control_obj_svnt \
+project(Shapes_Control_comp_svnt) : ciao_servant {
+  after      += Shapes_msg_stub  Shapes_Control_comp_lem_stub \
+                Shapes_Control_comp_stub Shapes_Control_obj_svnt \
                 Shapes_Control_obj_lem_stub
 
-  libs       += Shapes_Control_stub Shapes_Control_lem_stub  \
+  libs       += Shapes_Control_comp_stub Shapes_Control_comp_lem_stub  \
                 Shapes_msg_stub \
                 Shapes_Control_obj_stub Shapes_Control_obj_svnt \
                 Shapes_Control_obj_lem_stub
@@ -143,7 +141,7 @@ project(Shapes_Control_svnt) : ciao_servant {
 
   includes += ../ports/GeneratedCode ../../ports/GeneratedCode
 
-  sharedname  = Shapes_Control_svnt
+  sharedname  = Shapes_Control_comp_svnt
   dynamicflags = SHAPES_CONTROL_COMP_SVNT_BUILD_DLL
 
   IDL_Files {
@@ -157,7 +155,7 @@ project(Shapes_Control_svnt) : ciao_servant {
   Header_Files {
     GeneratedCode/Shapes_Control_compS.h
     GeneratedCode/Shapes_Control_comp_svnt.h
-    GeneratedCode/Shapes_Control_svnt_export.h
+    GeneratedCode/Shapes_Control_comp_svnt_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp
index ff18da3fa71..7eea6be956f 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "Shapes_Control_exec.h"
+#include "Shapes_Control_comp_exec.h"
 #include "ace/Guard_T.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h
index eb008f84593..855eef82eb9 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h
@@ -6,7 +6,7 @@
 
 #include "Shapes_Control_compEC.h"
 
-#include /**/ "Shapes_Control_exec_export.h"
+#include /**/ "Shapes_Control_comp_exec_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
index 19e234f77aa..ec71ddf8bb6 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
@@ -4,13 +4,11 @@ project(Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += Shapes_conn_idl_gen
   idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_STUB_Export \
-              -Wb,stub_export_include=Shapes_Receiver_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \
-              -Wb,skel_export_include=Shapes_Receiver_svnt_export.h \
+              -Wb,stub_export_include=Shapes_Receiver_comp_stub_export.h \
               -Wb,svnt_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Receiver_svnt_export.h \
+              -Wb,svnt_export_include=Shapes_Receiver_comp_svnt_export.h \
               -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Receiver_exec_export.h \
+              -Wb,exec_export_include=Shapes_Receiver_comp_exec_export.h \
               -I../../ports \
               -o GeneratedCode
 
@@ -24,7 +22,7 @@ project(Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += Shapes_Receiver_idl_gen Shapes_Sender_idl_lem_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_Receiver_lem_stub_export.h \
+              -Wb,stub_export_include=Shapes_Receiver_comp_lem_stub_export.h \
               -SS -Gxhst \
               -I../../ports \
               -I../../ports/GeneratedCode \
@@ -36,17 +34,17 @@ project(Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(Shapes_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Shapes_Receiver_lem_gen Shapes_Receiver_stub  Shapes_conn_stub \
+project(Shapes_Receiver_comp_lem_stub) : ccm_svnt, dds4ccm_base {
+  after += Shapes_Receiver_lem_gen Shapes_Receiver_comp_stub  Shapes_conn_stub \
            Shapes_msg_stub
 
-  libs  += Shapes_Receiver_stub Shapes_conn_stub Shapes_msg_stub
+  libs  += Shapes_Receiver_comp_stub Shapes_conn_stub Shapes_msg_stub
   libpaths += ../../lib
   libout = ../../lib
 
   includes += ../../ports/GeneratedCode
 
-  sharedname = Shapes_Receiver_lem_stub
+  sharedname = Shapes_Receiver_comp_lem_stub
   dynamicflags   = SHAPES_RECEIVER_COMP_LEM_STUB_BUILD_DLL
 
   IDL_Files {
@@ -58,7 +56,7 @@ project(Shapes_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
 
   Header_Files {
     GeneratedCode/Shapes_Receiver_compEC.h
-    GeneratedCode/Shapes_Receiver_lem_stub_export.h
+    GeneratedCode/Shapes_Receiver_comp_lem_stub_export.h
   }
 
   Inline_Files {
@@ -66,7 +64,7 @@ project(Shapes_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   }
 }
 
-project(Shapes_Receiver_stub) : ccm_stub, dds4ccm_base {
+project(Shapes_Receiver_comp_stub) : ccm_stub, dds4ccm_base {
   after += Shapes_Receiver_idl_gen Shapes_conn_stub \
            Shapes_msg_stub Shapes_conn_lem_gen
 
@@ -76,7 +74,7 @@ project(Shapes_Receiver_stub) : ccm_stub, dds4ccm_base {
 
   includes += ../../ports/GeneratedCode
 
-  sharedname = Shapes_Receiver_stub
+  sharedname = Shapes_Receiver_comp_stub
   dynamicflags   = SHAPES_RECEIVER_COMP_STUB_BUILD_DLL
 
   IDL_Files {
@@ -88,7 +86,7 @@ project(Shapes_Receiver_stub) : ccm_stub, dds4ccm_base {
 
   Header_Files {
     GeneratedCode/Shapes_Receiver_compC.h
-    GeneratedCode/Shapes_Receiver_stub_export.h
+    GeneratedCode/Shapes_Receiver_comp_stub_export.h
   }
 
   Inline_Files {
@@ -96,31 +94,31 @@ project(Shapes_Receiver_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(Shapes_Receiver_exec) : ciao_executor, dds4ccm_base {
-  after += Shapes_Receiver_lem_stub Shapes_Receiver_stub \
+project(Shapes_Receiver_comp_exec) : ciao_executor, dds4ccm_base {
+  after += Shapes_Receiver_comp_lem_stub Shapes_Receiver_comp_stub \
            Shapes_msg_stub Shapes_conn_stub Shapes_conn_lem_stub \
            DDS4CCM_lem_stub
 
-  libs += Shapes_Receiver_stub Shapes_Receiver_lem_stub Shapes_msg_stub \
+  libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_msg_stub \
           Shapes_conn_stub Shapes_conn_lem_stub DDS4CCM_lem_stub
   libpaths += ../../lib
   libout = ../../lib
 
   includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
 
-  sharedname = Shapes_Receiver_exec
+  sharedname = Shapes_Receiver_comp_exec
   dynamicflags   = SHAPES_RECEIVER_COMP_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Shapes_Receiver_exec.cpp
+    Shapes_Receiver_comp_exec.cpp
   }
 
   Header_Files {
-    Shapes_Receiver_exec.h
-    GeneratedCode/Shapes_Receiver_exec_export.h
+    Shapes_Receiver_comp_exec.h
+    GeneratedCode/Shapes_Receiver_comp_exec_export.h
   }
 
   Inline_Files {
@@ -128,20 +126,20 @@ project(Shapes_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(Shapes_Receiver_svnt) : ciao_servant, dds4ccm_base {
-  after      += Shapes_Receiver_lem_stub Shapes_msg_stub \
-                Shapes_conn_stub Shapes_conn_svnt Shapes_Receiver_exec \
+project(Shapes_Receiver_comp_svnt) : ciao_servant, dds4ccm_base {
+  after      += Shapes_Receiver_comp_lem_stub Shapes_msg_stub \
+                Shapes_conn_stub Shapes_conn_svnt Shapes_Receiver_comp_exec \
                 Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
 
-  libs       += Shapes_Receiver_stub Shapes_Receiver_lem_stub Shapes_msg_stub \
-                Shapes_conn_stub Shapes_conn_svnt Shapes_Receiver_exec \
+  libs       += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_msg_stub \
+                Shapes_conn_stub Shapes_conn_svnt Shapes_Receiver_comp_exec \
                 Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   libpaths += ../../lib
   libout = ../../lib
 
   includes += ../ports/GeneratedCode ../../ports/GeneratedCode
 
-  sharedname  = Shapes_Receiver_svnt
+  sharedname  = Shapes_Receiver_comp_svnt
   dynamicflags = SHAPES_RECEIVER_COMP_SVNT_BUILD_DLL
 
   IDL_Files {
@@ -155,7 +153,7 @@ project(Shapes_Receiver_svnt) : ciao_servant, dds4ccm_base {
   Header_Files {
     GeneratedCode/Shapes_Receiver_compS.h
     GeneratedCode/Shapes_Receiver_comp_svnt.h
-    GeneratedCode/Shapes_Receiver_svnt_export.h
+    GeneratedCode/Shapes_Receiver_comp_svnt_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
index cf361fba097..ff5c1e6820b 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-#include "Shapes_Receiver_exec.h"
+#include "Shapes_Receiver_comp_exec.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
index 6a4ffd7fd45..f5ecd2669e5 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
@@ -6,7 +6,7 @@
 
 #include "Shapes_Receiver_compEC.h"
 
-#include /**/ "Shapes_Receiver_exec_export.h"
+#include /**/ "Shapes_Receiver_comp_exec_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
index 60acd36a1ab..8050063e636 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
@@ -4,13 +4,11 @@ project(Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += Shapes_conn_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_STUB_Export \
-              -Wb,stub_export_include=Shapes_Sender_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_SENDER_COMP_SVNT_Export \
-              -Wb,skel_export_include=Shapes_Sender_svnt_export.h \
+              -Wb,stub_export_include=Shapes_Sender_comp_stub_export.h \
               -Wb,svnt_export_macro=SHAPES_SENDER_COMP_SVNT_Export \
-              -Wb,svnt_export_include=Shapes_Sender_svnt_export.h \
+              -Wb,svnt_export_include=Shapes_Sender_comp_svnt_export.h \
               -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \
-              -Wb,exec_export_include=Shapes_Sender_exec_export.h \
+              -Wb,exec_export_include=Shapes_Sender_comp_exec_export.h \
               -I../../ports \
               -I../../Shapes_Control_comp/ports \
               -o GeneratedCode
@@ -25,7 +23,7 @@ project(Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += Shapes_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_LEM_STUB_Export \
-              -Wb,stub_export_include=Shapes_Sender_lem_stub_export.h \
+              -Wb,stub_export_include=Shapes_Sender_comp_lem_stub_export.h \
               -SS -Gxhst -I $CIAO_ROOT/connectors \
               -I../../ports \
               -I../../ports/GeneratedCode \
@@ -39,16 +37,16 @@ project(Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(Shapes_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Shapes_Sender_lem_gen Shapes_Sender_stub Shapes_msg_stub
+project(Shapes_Sender_comp_lem_stub) : ccm_svnt, dds4ccm_base {
+  after += Shapes_Sender_lem_gen Shapes_Sender_comp_stub Shapes_msg_stub
 
-  libs  += Shapes_msg_stub Shapes_Sender_stub
+  libs  += Shapes_msg_stub Shapes_Sender_comp_stub
   libpaths += ../../lib
   libout = ../../lib
 
   includes += ../../ports/GeneratedCode ../../Shapes_Control_comp/ports/GeneratedCode
 
-  sharedname = Shapes_Sender_lem_stub
+  sharedname = Shapes_Sender_comp_lem_stub
   dynamicflags = SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL
 
   IDL_Files {
@@ -60,7 +58,7 @@ project(Shapes_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
 
   Header_Files {
     GeneratedCode/Shapes_Sender_compEC.h
-    GeneratedCode/Shapes_Sender_lem_stub_export.h
+    GeneratedCode/Shapes_Sender_comp_lem_stub_export.h
   }
 
   Inline_Files {
@@ -68,7 +66,7 @@ project(Shapes_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
   }
 }
 
-project(Shapes_Sender_stub) : ccm_stub, dds4ccm_base {
+project(Shapes_Sender_comp_stub) : ccm_stub, dds4ccm_base {
   after += Shapes_Sender_idl_gen Shapes_msg_stub Shapes_conn_stub
 
   libs  += Shapes_msg_stub Shapes_conn_stub
@@ -77,7 +75,7 @@ project(Shapes_Sender_stub) : ccm_stub, dds4ccm_base {
 
   includes += ../../ports/GeneratedCode ../../Shapes_Control_comp/ports/GeneratedCode
 
-  sharedname = Shapes_Sender_stub
+  sharedname = Shapes_Sender_comp_stub
   dynamicflags   = SHAPES_SENDER_COMP_STUB_BUILD_DLL
 
   IDL_Files {
@@ -89,7 +87,7 @@ project(Shapes_Sender_stub) : ccm_stub, dds4ccm_base {
 
   Header_Files {
     GeneratedCode/Shapes_Sender_compC.h
-    GeneratedCode/Shapes_Sender_stub_export.h
+    GeneratedCode/Shapes_Sender_comp_stub_export.h
   }
 
   Inline_Files {
@@ -97,13 +95,13 @@ project(Shapes_Sender_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(Shapes_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += Shapes_Sender_lem_stub Shapes_Sender_stub Shapes_conn_lem_stub \
-             Shapes_conn_stub Shapes_Control_lem_stub Shapes_Control_obj_lem_stub \
+project(Shapes_Sender_comp_exec) : ciao_executor, dds4ccm_base {
+  after   += Shapes_Sender_comp_lem_stub Shapes_Sender_comp_stub Shapes_conn_lem_stub \
+             Shapes_conn_stub Shapes_Control_comp_lem_stub Shapes_Control_obj_lem_stub \
              Shapes_defn_stub Shapes_Control_obj_stub
 
-  libs += Shapes_Sender_stub Shapes_Sender_lem_stub Shapes_msg_stub \
-          Shapes_conn_lem_stub Shapes_conn_stub Shapes_Control_lem_stub \
+  libs += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub Shapes_msg_stub \
+          Shapes_conn_lem_stub Shapes_conn_stub Shapes_Control_comp_lem_stub \
           Shapes_Control_obj_lem_stub Shapes_defn_stub Shapes_Control_obj_stub
   libpaths += ../../lib
   libout = ../../lib
@@ -111,19 +109,19 @@ project(Shapes_Sender_exec) : ciao_executor, dds4ccm_base {
   includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode \
               ../../Shapes_Control_comp/ports/GeneratedCode
 
-  sharedname = Shapes_Sender_exec
+  sharedname = Shapes_Sender_comp_exec
   dynamicflags   = SHAPES_SENDER_COMP_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Shapes_Sender_exec.cpp
+    Shapes_Sender_comp_exec.cpp
   }
 
   Header_Files {
-    Shapes_Sender_exec.h
-    Shapes_Sender_exec_export.h
+    Shapes_Sender_comp_exec.h
+    Shapes_Sender_comp_exec_export.h
   }
 
   Inline_Files {
@@ -131,17 +129,17 @@ project(Shapes_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(Shapes_Sender_svnt) : ciao_servant, dds4ccm_base {
-  after      += Shapes_msg_stub  Shapes_Sender_lem_stub DDS4CCM_lem_stub \
+project(Shapes_Sender_comp_svnt) : ciao_servant, dds4ccm_base {
+  after      += Shapes_msg_stub  Shapes_Sender_comp_lem_stub DDS4CCM_lem_stub \
                 DDS4CCM_skel Shapes_conn_stub Shapes_conn_svnt \
-                Shapes_conn_lem_stub Shapes_Control_svnt \
+                Shapes_conn_lem_stub Shapes_Control_comp_svnt \
                 Shapes_Control_obj_stub Shapes_Control_obj_svnt \
                 Shapes_Control_obj_lem_stub
 
-  libs       += Shapes_Sender_stub Shapes_Sender_lem_stub  \
+  libs       += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub  \
                 Shapes_msg_stub DDS4CCM_lem_stub DDS4CCM_skel \
                 Shapes_conn_stub Shapes_conn_svnt \
-                Shapes_conn_lem_stub Shapes_Control_svnt \
+                Shapes_conn_lem_stub Shapes_Control_comp_svnt \
                 Shapes_Control_obj_stub Shapes_Control_obj_svnt \
                 Shapes_Control_obj_lem_stub
   libpaths += ../../lib
@@ -150,7 +148,7 @@ project(Shapes_Sender_svnt) : ciao_servant, dds4ccm_base {
   includes += ../ports/GeneratedCode ../../ports/GeneratedCode \
               ../../Shapes_Control_comp/ports/GeneratedCode
 
-  sharedname  = Shapes_Sender_svnt
+  sharedname  = Shapes_Sender_comp_svnt
   dynamicflags = SHAPES_SENDER_COMP_SVNT_BUILD_DLL
 
   IDL_Files {
@@ -164,7 +162,7 @@ project(Shapes_Sender_svnt) : ciao_servant, dds4ccm_base {
   Header_Files {
     GeneratedCode/Shapes_Sender_compS.h
     GeneratedCode/Shapes_Sender_comp_svnt.h
-    GeneratedCode/Shapes_Sender_svnt_export.h
+    GeneratedCode/Shapes_Sender_comp_svnt_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
index db7f93beee7..dd2b79ded90 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "Shapes_Sender_exec.h"
+#include "Shapes_Sender_comp_exec.h"
 #include "ace/Guard_T.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h
index b56e9a0de9d..2f7b0d528bb 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h
@@ -7,7 +7,7 @@
 #include "Shapes_Sender_compEC.h"
 #include "Shapes_Control_objEC.h"
 
-#include /**/ "Shapes_Sender_exec_export.h"
+#include /**/ "Shapes_Sender_comp_exec_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once