Mon Nov 9 18:47:23 UTC 2009 Marcel Smit <msmit@remedy.nl>

* connectors/dds4ccm/examples/Hello/Base: * connectors/dds4ccm/examples/Hello/Connector: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3p: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl3p: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h: * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: Completely rewritten this example. This example now uses the connector template implementation.
author: msmit <msmit@remedy.nl> 2009-11-09 18:49:02 +0000
committer: msmit <msmit@remedy.nl> 2009-11-09 18:49:02 +0000
commit: 7ad818b9e4e878035ba44e841b2a28e85396aa13 (patch)
tree: 53965fd5a0a45e995e434f9194071ad8513cc74d
parent: 3e67053b284c0eb6f6accf600872f63024713489 (diff)
download: ATCD-7ad818b9e4e878035ba44e841b2a28e85396aa13.tar.gz
25 files changed, 553 insertions, 2995 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 823df19f49c..e73405f2830 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,34 @@
+Mon Nov  9 18:47:23 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Base:
+        * connectors/dds4ccm/examples/Hello/Connector:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp:
+        * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp:
+        * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3p:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl3p:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp:
+          Completely rewritten this example. This example now uses the connector
+          template implementation. 
+
 Mon Nov  9 13:16:48 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
index 9da182cb4f1..dc26cdda14c 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
@@ -1,30 +1,37 @@
 // $Id$
 
-#ifndef HELLO_RECEIVER_IDL3
-#define HELLO_RECEIVER_IDL3
+/**
+ * @file 
+ * @author Marcel Smit <msmit@remedy.nl>
+ */
 
-#include <Components.idl>
+#ifndef HELLO_RECEIVER_IDL
+#define HELLO_RECEIVER_IDL
 
-#include "Hello_Receiver_Base.idl"
-#include "Hello_Receiver_BaseE.idl"
+#include "Connector/Hello_Connector.idl"
+#include "Connector/Hello_ConnectorE.idl"
 
-module Hello_DDS
+module Hello
 {
   component Receiver
   {
-    uses CCM_DDS::string_Reader read_message_data;
-    uses CCM_DDS::ListenerControl read_message_control;
-    provides CCM_DDS::string_RawListener read_message_listener;
-    uses DDS::DataReader read_message_dds_entity;
-    provides CCM_DDS::PortStatusListener read_message_status;
-    
-    attribute string name;
-    attribute unsigned long expected_samples;
+    uses CCM_DDS::ListenerControl           info_out_control;
+    provides CCM_DDS::DDSHello_RawListener  info_out_listener;
+    provides CCM_DDS::PortStatusListener    info_out_status;
   };
+};
+
+/*
+For future use: IDL3 plus
+#include <dds4ccm/idl/dds4ccm_Connector_Base.idl3p>
+#include <dds4ccm/idl/dds4ccm_Port_RawListen.idl3p>
 
-  home ReceiverHome manages Receiver
+module Hello
+{
+  component Receiver
   {
+    port CCM_DDS::DDS_RawListen <DDSHello> info;
   };
 };
-
+*/
 #endif
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3p b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3p
deleted file mode 100644
index dffd5bc45eb..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3p
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-#ifndef HELLO_RECEIVER_IDL3P
-#define HELLO_RECEIVER_IDL3P
-
-#include "Hello_Base.idl3p"
-
-module Hello_DDS
-{
-  component Receiver
-  {
-    port DDS_RawListen<string> read_message;
-  };
-};
-
-#endif /* HELLO_RECEIVER_IDL3P */
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
index 513374f1029..2be1bb57fdb 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
@@ -1,91 +1,91 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl -b ciao_example_output, dds4ccm_base Hello_Receiver"
 
-project(DDS_Hello_Receiver_idl_gen) : connectoridldefaults, ciao_example_output, dds4ccm_base  {
+project(DDS_Receiver_idl_gen) : componentidldefaults , connectoridldefaults  {
   custom_only = 1
-  after += DDS_Hello_Receiver_Base_idl_gen
+  after += DDS_Hello_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Hello_Receiver_stub_export.h \
+              -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=HELLO_RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Hello_Receiver_svnt_export.h \
+              -Wb,skel_export_include=Receiver_svnt_export.h \
               -Wb,exec_export_macro=HELLO_RECEIVER_EXEC_Export \
-              -I $(CIAO_ROOT)/connectors \
-              -Wb,exec_export_include=Hello_Receiver_exec_export.h
+              -Wb,exec_export_include=Receiver_exec_export.h -I..
 
   IDL_Files {
     Hello_Receiver.idl
   }
 }
 
-project(DDS_Hello_Receiver_lem_gen) : ciaoidldefaults , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Receiver_idl_gen DDS_Hello_Receiver_Connector_idl_gen
+project(DDS_Receiver_lem_gen) : connectoridldefaults,   {
+  after += DDS_Receiver_idl_gen
   custom_only = 1
-  idlflags += -Gxhst -Wb,stub_export_macro=HELLO_RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Hello_Receiver_lem_stub_export.h \
-              -I $(CIAO_ROOT)/connectors \
-              -SS
+  idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_LEM_STUB_Export \
+              -Wb,stub_export_include=Receiver_lem_stub_export.h \
+              -SS -Gxhst -I..
 
   IDL_Files {
     Hello_ReceiverE.idl
   }
 }
 
-project(DDS_Hello_Receiver_stub) : ccm_stub , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Receiver_idl_gen DDS_Hello_Receiver_Base_stub
-  libs  += DDS_Hello_Receiver_Base_stub
-  libpaths    += ../lib
-
-  sharedname = DDS_Hello_Receiver_stub
-  dynamicflags   = HELLO_RECEIVER_STUB_BUILD_DLL
+project(DDS_Receiver_lem_stub) : ccm_svnt , dds4ccm_base  {
+  after += DDS_Receiver_lem_gen DDS_Receiver_stub  DDS_Hello_Connector_stub DDS_Hello_Base_stub
+  libs  +=  Receiver_stub DDS_Hello_Connector_stub DDS_Hello_Base_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = Receiver_lem_stub
+  dynamicflags   = HELLO_RECEIVER_LEM_STUB_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Hello_ReceiverC.cpp
+    Hello_ReceiverEC.cpp
   }
 
   Header_Files {
-    Hello_ReceiverC.h
-    Hello_Receiver_stub_export.h
+    Hello_ReceiverEC.h
+    Hello_Receiver_lem_stub_export.h
   }
 
   Inline_Files {
-    Hello_ReceiverC.inl
+    Hello_ReceiverEC.inl
   }
 }
 
-project(DDS_Hello_Receiver_lem_stub) : ccm_svnt , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Receiver_lem_gen DDS_Hello_Receiver_Base_stub DDS_Hello_Receiver_Connector_lem_gen
-  libpaths    += ../lib
-  libs += DDS_Hello_Receiver_Base_stub
-
-  sharedname = DDS_Hello_Receiver_lem_stub
-  dynamicflags   = HELLO_RECEIVER_LEM_STUB_BUILD_DLL
+project(DDS_Receiver_stub) : ccm_stub , dds4ccm_base  {
+  after += DDS_Receiver_idl_gen  DDS_Hello_Connector_stub DDS_Hello_Base_stub DDS_Hello_Connector_lem_gen
+  libs  += DDS_Hello_Connector_stub DDS_Hello_Base_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = Receiver_stub
+  dynamicflags   = HELLO_RECEIVER_STUB_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Hello_ReceiverEC.cpp
+    Hello_ReceiverC.cpp
   }
 
   Header_Files {
-    Hello_ReceiverEC.h
-    Hello_Receiver_lem_stub_export.h
+    Hello_ReceiverC.h
+    Hello_Receiver_stub_export.h
   }
 
   Inline_Files {
-    Hello_ReceiverEC.inl
+    Hello_ReceiverC.inl
   }
 }
 
-project(DDS_Hello_Receiver_exec) : ciao_executor , ciao_example_output, dds4ccm_base  {
-  after   += DDS_Hello_Receiver_lem_stub DDS_Hello_Receiver_stub DDS_Hello_Receiver_Base_stub DDS4CCM_lem_stub
-  sharedname = DDS_Hello_Receiver_exec
-  libs += DDS_Hello_Receiver_stub DDS_Hello_Receiver_lem_stub DDS_Hello_Receiver_Base_stub DDS4CCM_lem_stub
-  libpaths    += ../lib
-
+project(DDS_Receiver_exec) : ciao_executor , dds4ccm_base  {
+  after   += DDS_Receiver_lem_stub DDS_Receiver_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub
+  sharedname = Receiver_exec
+  libs += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
   dynamicflags   = HELLO_RECEIVER_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -101,17 +101,17 @@ project(DDS_Hello_Receiver_exec) : ciao_executor , ciao_example_output, dds4ccm_
   }
 
   Inline_Files {
-    Hello_ReceiverEC.inl
   }
 }
 
 
-project(DDS_Hello_Receiver_svnt) : ciao_servant, ciao_example_output, dds4ccm_skel  {
-  after      +=  DDS_Hello_Receiver_Base_stub DDS_Hello_Receiver_Base_skel DDS_Hello_Receiver_idl_gen DDS_Hello_Receiver_lem_stub DDS_Hello_Receiver_stub DDS4CCM_lem_stub
-  sharedname  = DDS_Hello_Receiver_svnt
-  libs       += DDS_Hello_Receiver_stub DDS_Hello_Receiver_lem_stub  DDS_Hello_Receiver_Base_stub DDS_Hello_Receiver_Base_skel DDS4CCM_lem_stub
-  libpaths    += ../lib
-
+project(DDS_Receiver_svnt) : ciao_servant , dds4ccm_base, nddslib {
+  after      +=   DDS_Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Receiver_exec DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
+  sharedname  = Receiver_svnt
+  libs       += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt Receiver_exec DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
   dynamicflags = HELLO_RECEIVER_SVNT_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl
deleted file mode 100644
index e1b471cac80..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-#ifndef HELLO_RECEIVER_BASE_IDL
-#define HELLO_RECEIVER_BASE_IDL
-
-#include "dds4ccm/idl/dds4ccm_Base.idl3"
-#include "dds4ccm/idl/dds4ccm_BaseE.idl"
-#include "dds4ccm/idl/dds4ccm_ListenerControl.idl3"
-#include "dds4ccm/idl/dds4ccm_ListenerControlE.idl"
-#include "dds4ccm/idl/dds4ccm_PortStatusListener.idl3"
-#include "dds4ccm/idl/dds4ccm_PortStatusListenerE.idl"
-
-module CCM_DDS
-{
-    interface string_Reader
-    {
-      typedef sequence<string> stringSeq;
-      
-      void read_all (out stringSeq instances, out ReadInfoSeq infos)
-        raises (InternalError);
-      
-      void read_all_history (out stringSeq instances, out ReadInfoSeq infos)
-        raises (InternalError);
-      
-      void read_one (inout string an_instance, out ReadInfo info)
-        raises (NonExistent,
-                InternalError);
-      
-      void read_one_history (in string an_instance,
-                             out stringSeq instances, out ReadInfoSeq infos)
-        raises (NonExistent,
-                InternalError);
-      
-      attribute QueryFilter filter
-        setraises (BadParameter);      
-    };
-
-  interface string_RawListener
-  {
-    void on_data (in string an_instance, in ReadInfo info);
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc
deleted file mode 100644
index d9f8974713b..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc
+++ /dev/null
@@ -1,80 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -n -b ciao_example_output, dds4ccm_base Hello_Receiver_Base"
-
-project(DDS_Hello_Receiver_Base_idl_gen) : connectoridldefaults , ciao_example_output, dds4ccm_base  {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_BASE_STUB_Export \
-              -Wb,stub_export_include=Hello_Receiver_Base_stub_export.h \
-              -Wb,skel_export_macro=HELLO_RECEIVER_BASE_SKEL_Export \
-              -Wb,skel_export_include=Hello_Receiver_Base_skel_export.h \
-              -Wb,exec_export_macro=HELLO_RECEIVER_BASE_EXEC_Export \
-              -Wb,exec_export_include=Hello_Receiver_Base_exec_export.h -I$(CIAO_ROOT)/connectors
-
-  IDL_Files {
-    Hello_Receiver_Base.idl
-  }
-}
-
-project(DDS_Hello_Receiver_Base_lem_gen) : ciaoidldefaults, ciao_example_output, dds4ccm_base  {
-  custom_only = 1
-  after += DDS_Hello_Receiver_Base_idl_gen
-  idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_BASE_STUB_Export \
-              -Wb,stub_export_include=Hello_Receiver_Base_stub_export.h  -SS \
-              -Gxhst -I$(CIAO_ROOT)/connectors
-
-  IDL_Files {
-    Hello_Receiver_BaseE.idl
-  }
-}
-
-project(DDS_Hello_Receiver_Base_stub) : ccm_stub , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Receiver_Base_lem_gen
-  libs  +=
-
-  sharedname = DDS_Hello_Receiver_Base_stub
-  dynamicflags   = HELLO_RECEIVER_BASE_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Receiver_BaseC.cpp
-    Hello_Receiver_BaseEC.cpp
-  }
-
-  Header_Files {
-    Hello_Receiver_BaseC.h
-    Hello_Receiver_Base_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Receiver_BaseC.inl
-  }
-}
-
-project(DDS_Hello_Receiver_Base_skel) : ciao_executor , ciao_example_output, dds4ccm_base  {
-  after      +=  DDS_Hello_Receiver_Base_stub
-  sharedname  = DDS_Hello_Receiver_Base_skel
-  libs       += DDS_Hello_Receiver_Base_stub
-  libpaths   += ../lib
-
-  dynamicflags = HELLO_RECEIVER_BASE_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Receiver_BaseS.cpp
-  }
-
-  Header_Files {
-    Hello_Receiver_BaseS.h
-    Hello_Receiver_Base_skel_export.h
-  }
-
-  Inline_Files {
-    Hello_Receiver_BaseS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl
deleted file mode 100644
index bc07db2e22f..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-#ifndef HELLO_RECEIVER_CONNECTOR
-#define HELLO_RECEIVER_CONNECTOR
-
-
-#include <Components.idl>
-
-
-#include "Hello_Receiver_Base.idl"
-#include "Hello_Receiver_BaseE.idl"
-#include "dds4ccm/idl/dds_rtf2_dcpsE.idl"
-
-module Hello_DDS
-{
-  component Hello_receiver_Connector
-  {
-    provides CCM_DDS::string_Reader receiver_data;
-    provides CCM_DDS::ListenerControl receiver_control;
-    uses CCM_DDS::string_RawListener receiver_listener;
-    provides DDS::DataReader receiver_dds_entity;
-    uses CCM_DDS::PortStatusListener receiver_status;
-  };
-
-  home ReceiverConnectorHome manages Hello_receiver_Connector
-  {
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc
deleted file mode 100644
index 257e9ccb86f..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -b ciao_example_output, dds4ccm_base Hello_Receiver_Connector"
-
-project(DDS_Hello_Receiver_Connector_idl_gen) : connectoridldefaults , ciao_example_output, dds4ccm_base {
-  custom_only = 1
-  after += DDS_Hello_Receiver_Base_idl_gen
-  idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Hello_Receiver_Connector_stub_export.h \
-              -Wb,skel_export_macro=HELLO_RECEIVER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Hello_Receiver_Connector_svnt_export.h \
-              -Wb,exec_export_macro=HELLO_RECEIVER_CONNECTOR_EXEC_Export \
-              -Wb,exec_export_include=Hello_Receiver_Connector_exec_export.h
-
-  IDL_Files {
-    Hello_Receiver_Connector.idl
-  }
-}
-
-project(DDS_Hello_Receiver_Connector_lem_gen) : ciaoidldefaults , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Receiver_Connector_idl_gen DDS_Hello_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Hello_Receiver_Connector_lem_stub_export.h \
-              -SS -I$(CIAO_ROOT)/connectors -Gxhst
-
-  IDL_Files {
-    Hello_Receiver_ConnectorE.idl
-  }
-}
-
-project(DDS_Hello_Receiver_Connector_stub) : ccm_stub , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Receiver_Connector_idl_gen DDS_Hello_Receiver_Base_stub
-  libs  += DDS_Hello_Receiver_Base_stub
-  libpaths += ../lib
-
-  sharedname = DDS_Hello_Receiver_Connector_stub
-  dynamicflags   = HELLO_RECEIVER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Receiver_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Hello_Receiver_ConnectorC.h
-    Hello_Receiver_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Receiver_ConnectorC.inl
-  }
-}
-
-project(DDS_Hello_Receiver_Connector_lem_stub) : ccm_svnt , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Receiver_Connector_lem_gen DDS_Hello_Receiver_Base_stub DDS_Hello_Receiver_lem_gen
-  libs  += DDS_Hello_Receiver_Base_stub
-  libpaths += ../lib
-
-  sharedname = DDS_Hello_Receiver_Connector_lem_stub
-  dynamicflags   = HELLO_RECEIVER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Receiver_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Hello_Receiver_ConnectorEC.h
-    Hello_Receiver_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Receiver_ConnectorEC.inl
-  }
-}
-
-project(DDS_Hello_Receiver_Connector_exec) : ciao_executor , ciao_example_output, dds4ccm_base, nddslib, ciao_dds4ccm_ndds_impl  {
-  after   += DDS_Hello_Receiver_Connector_lem_stub DDS_Hello_Receiver_Connector_stub DDS4CCM_lem_stub DDS_Hello_Receiver_Base_stub
-  sharedname = DDS_Hello_Receiver_Connector_exec
-  libs += DDS_Hello_Receiver_Connector_stub DDS_Hello_Receiver_Connector_lem_stub DDS_Hello_Receiver_Base_stub
-  libs += DDS4CCM_lem_stub
-  libpaths += ../lib
-
-  dynamicflags   = HELLO_RECEIVER_CONNECTOR_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Receiver_Connector_exec.cpp
-  }
-
-  Header_Files {
-    Hello_Receiver_Connector_exec.h
-    Hello_Receiver_Connector_exec_export.h
-  }
-
-  Inline_Files {
-    Hello_Receiver_ConnectorEC.inl
-  }
-}
-
-
-project(Hello_Receiver_Connector_svnt) : ciao_servant , ciao_example_output, dds4ccm_skel  {
-  after      +=  DDS_Hello_Receiver_Base_skel DDS_Hello_Receiver_Connector_idl_gen DDS_Hello_Receiver_Connector_stub DDS_Hello_Receiver_Connector_lem_stub DDS4CCM_lem_stub
-  sharedname  = DDS_Hello_Receiver_Connector_svnt
-  libs       += DDS_Hello_Receiver_Connector_stub DDS_Hello_Receiver_Connector_lem_stub  DDS_Hello_Receiver_Base_stub
-  libs       += DDS_Hello_Receiver_Base_skel
-  libpaths   += ../lib
-  libs += DDS4CCM_lem_stub
-
-  dynamicflags = HELLO_RECEIVER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Receiver_ConnectorS.cpp
-    Hello_Receiver_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_Receiver_ConnectorS.h
-    Hello_Receiver_Connector_svnt.h
-    Hello_Receiver_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    Hello_Receiver_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp
deleted file mode 100644
index 90698e8895a..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp
+++ /dev/null
@@ -1,540 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1278
-
-#define MAX_STRING_SIZE         1024
-
-#include "Hello_Receiver_Connector_exec.h"
-
-#include "dds4ccm/impl/ndds/DomainParticipantFactory.h"
-#include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/ndds/Time_t.h"
-
-/* The listener of events and data from the middleware */
-class HelloListener : public ::DDS::DataReaderListener
-{
-  public:
-    HelloListener ( ::CCM_DDS::string_RawListener_ptr listener,
-                    ::CCM_DDS::PortStatusListener_ptr statuslistener);
-    virtual void on_data_available( ::DDS::DataReader *reader);
-    virtual void
-    on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-    virtual void
-    on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-    bool enabled () const;
-    void enabled (bool enable);
-  private:
-    ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> enabled_;
-    ::CCM_DDS::string_RawListener_var listener_;
-    ::CCM_DDS::PortStatusListener_var statuslistener_;
-};
-
-/* This method gets called back by DDS when one or more data samples have been
- * received.
- */
-
-HelloListener::HelloListener ( ::CCM_DDS::string_RawListener_ptr listener, ::CCM_DDS::PortStatusListener_ptr statuslistener) :
-  enabled_ (true), // @todo should be false later on
-  listener_ ( ::CCM_DDS::string_RawListener::_duplicate (listener)),
-  statuslistener_ (::CCM_DDS::PortStatusListener::_duplicate (statuslistener))
-{
-}
-
-bool
-HelloListener::enabled () const
-{
-  return this->enabled_.value ();
-}
-
-void
-HelloListener::enabled (bool enable)
-{
-  this->enabled_ = enable;
-}
-
-void
-HelloListener::on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status)
-{
-  this->statuslistener_->on_requested_deadline_missed (the_reader, status);
-}
-
-void
-HelloListener::on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status)
-{
-  this->statuslistener_->on_sample_lost (the_reader, status);
-}
-
-void
-HelloListener::on_data_available( ::DDS::DataReader *reader)
-{
-  if (this->enabled_.value ())
-    {
-    /* Perform a safe type-cast from a generic data reader into a
-     * specific data reader for the type "DDS::String"
-     */
-    ::CIAO::DDS4CCM::RTI::RTI_DataReader_i* rd = dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i*>(reader);
-    DDSStringDataReader * string_reader = DDSStringDataReader::narrow(rd->get_datareader ());
-    if (!string_reader) {
-        /* In this specific case, this will never fail */
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("DDSStringDataReader::narrow failed.\n")));
-        return;
-    }
-
-    /* Loop until there are messages available in the queue */
-    for(;;) {
-        char sample[MAX_STRING_SIZE];
-        char *ptr_sample  = &sample[0];
-        DDS_SampleInfo        info;
-        DDS_ReturnCode_t retcode = string_reader->take_next_sample(
-                            ptr_sample,
-                            info);
-        if (retcode == DDS_RETCODE_NO_DATA) {
-            /* No more samples */
-            break;
-        } else if (retcode != DDS_RETCODE_OK) {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), retcode));
-            return;
-        }
-        if (info.valid_data) {
-            ::CCM_DDS::ReadInfo empty;
-            listener_->on_data (sample, empty);
-    }
-  }
-  }
-}
-
-namespace CIAO_Hello_DDS_Hello_receiver_Connector_Impl
-{
-  //============================================================
-  // Facet Executor Implementation Class: string_Reader_exec_i
-  //============================================================
-
-  string_Reader_exec_i::string_Reader_exec_i (DDSStringDataReader *reader)
-    : reader_ (reader),
-      condition_ (0)
-  {
-  }
-
-  string_Reader_exec_i::~string_Reader_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::string_Reader
-
-  void
-  string_Reader_exec_i::read_all (
-    ::CCM_DDS::string_Reader::stringSeq_out /* instances */,
-    ::CCM_DDS::ReadInfoSeq_out /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  string_Reader_exec_i::read_all_history (
-    ::CCM_DDS::string_Reader::stringSeq_out /* instances */,
-    ::CCM_DDS::ReadInfoSeq_out /* infos */)
-  {
-    /*     DDS_StringSeq data;
-    DDS_SampleInfoSeq sample_info;
-    DDS_ReturnCode_t retval = this->reader_->read (data, sample_info);
- */
-  }
-
-  void
-  string_Reader_exec_i::read_one (
-    char *& an_instance,
-    ::CCM_DDS::ReadInfo_out info)
-  {
-    // This has to be reworked using a reader template and traits.
-    DDS_StringSeq data;
-    DDS_SampleInfoSeq sample_info;
-    DDS_ReturnCode_t retval;
-    if (this->condition_)
-      {
-        retval = this->reader_->read_w_condition (data, sample_info, 1, this->condition_);
-      }
-    else
-      {
-        retval = this->reader_->read (data,
-                           sample_info,
-                           1,
-                           DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE ,
-                           DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                           DDS_ALIVE_INSTANCE_STATE);
-       }
-    if (retval == DDS_RETCODE_OK)
-      {
-        an_instance = data[0];
-        info.timestamp <<= sample_info[0].reception_timestamp;
-      }
-    else
-      {
-        //printf ("failed %d", retval);
-        throw ::CCM_DDS::InternalError (retval, 0);
-      }
-  }
-
-  void
-  string_Reader_exec_i::read_one_history (
-    const char * an_instance,
-    ::CCM_DDS::string_Reader::stringSeq_out /* instances */,
-    ::CCM_DDS::ReadInfoSeq_out /* infos */)
-  {
-    ::DDS_InstanceHandle_t instance_handle = this->reader_->lookup_instance (an_instance);
-    if (!DDS_InstanceHandle_equals (&instance_handle, & ::DDS_HANDLE_NIL))
-      {/*
-        DDS_StringSeq data;
-        DDS_SampleInfoSeq sample_info;
-        DDS_ReturnCode_t retval;
-        retval = this->reader_->read_instance (data, sample_info, DDS_LENGTH_UNLIMITED, instance_handle);
-        if (retval == DDS_RETCODE_OK)
-          {
-            // todo
-          }
-        */
-      }
-    else
-      {
-        ::CCM_DDS::InstanceNumberSeq seq;
-        throw ::CCM_DDS::NonExistent (seq);
-      }
-  }
-
-  ::CCM_DDS::QueryFilter *
-  string_Reader_exec_i::filter (void)
-  {
-    ::CCM_DDS::QueryFilter *qf = new ::CCM_DDS::QueryFilter;
-    qf->query = CORBA::string_dup (this->condition_->get_query_expression());
-    ::DDS_StringSeq seq;
-    ::DDS_ReturnCode_t const retval = this->condition_->get_query_parameters (seq);
-    if (retval == DDS_RETCODE_OK)
-      {
-        qf->query_parameters.length (seq.length ());
-        for (::DDS_Long index = 0; index < seq.length (); index++)
-          {
-            qf->query_parameters[index] = CORBA::string_dup (seq[index]);
-          }
-      }
-
-    return qf;
-  }
-
-  void
-  string_Reader_exec_i::filter (
-    const ::CCM_DDS::QueryFilter &filter)
-  {
-    if (this->condition_)
-      {
-        DDS_ReturnCode_t const retval = this->reader_->delete_readcondition (this->condition_);
-        ACE_UNUSED_ARG (retval);
-      }
-    DDS_StringSeq params;
-    for (::DDS::StringSeq::size_type index = 0; index < filter.query_parameters.length (); index++)
-      {
-        //params[index] = filter.query_parameters[index].in ();
-      }
-    this->condition_ = this->reader_->create_querycondition (
-      DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE ,
-      DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-      DDS_ALIVE_INSTANCE_STATE,
-      filter.query,
-      params);
-    if (!this->condition_)
-      {
-        throw ::CCM_DDS::BadParameter ();
-      }
-  }
-  //============================================================
-  // Facet Executor Implementation Class: ListenerControl_exec_i
-  //============================================================
-
-  ListenerControl_exec_i::ListenerControl_exec_i (void)
-  {
-  }
-
-  ListenerControl_exec_i::~ListenerControl_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ListenerControl
-
-  ::CORBA::Boolean
-  ListenerControl_exec_i::enabled (void)
-  {
-    // Need to control the data listener
-    /* Your code here. */
-    return false;
-  }
-
-  void
-  ListenerControl_exec_i::enabled (
-    ::CORBA::Boolean enabled)
-  {
-    if (enabled)
-      {
-        // @todo
-      }
-  }
-  //============================================================
-  // Facet Executor Implementation Class: DataReader_exec_i
-  //============================================================
-
-  //============================================================
-  // Component Executor Implementation Class: Hello_receiver_Connector_exec_i
-  //============================================================
-
-  Hello_receiver_Connector_exec_i::Hello_receiver_Connector_exec_i (void)
-    : dds_configured_ (false)
-  {
-  }
-
-  Hello_receiver_Connector_exec_i::~Hello_receiver_Connector_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes.
-
-  // Port operations.
-
-  ::CCM_DDS::CCM_string_Reader_ptr
-  Hello_receiver_Connector_exec_i::get_receiver_data (void)
-  {
-    this->configure_dds ();
-    ::CIAO::DDS4CCM::RTI::RTI_DataReader_i* rd = dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i*>(this->dr_.in ());
-    DDSStringDataReader * string_reader = DDSStringDataReader::narrow(rd->get_datareader ());
-    if (string_reader)
-      return new string_Reader_exec_i (string_reader);
-
-    throw ::CORBA::INTERNAL ();
-  }
-
-  ::CCM_DDS::CCM_ListenerControl_ptr
-  Hello_receiver_Connector_exec_i::get_receiver_control (void)
-  {
-    this->configure_dds ();
-//    return ::DDS::CCM_DataWriter::_duplicate (this->dw_.in ());
-
-    /* Your code here. */
-    // @todo
-    return new ListenerControl_exec_i ();
-  }
-
-  ::DDS::CCM_DataReader_ptr
-  Hello_receiver_Connector_exec_i::get_receiver_dds_entity (void)
-  {
-    this->configure_dds ();
-    /* Your code here. */
-    // @todo
-    return ::DDS::CCM_DataReader::_duplicate (this->dr_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Hello_receiver_Connector_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    ::Hello_DDS::CCM_Hello_receiver_Connector_Context_var lctx =
-      ::Hello_DDS::CCM_Hello_receiver_Connector_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (lctx.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-
-    this->context_ = lctx;
-  }
-
-  void
-  Hello_receiver_Connector_exec_i::configuration_complete (void)
-  {
-    this->configure_dds ();
-    /* Your code here. */
-  }
-
-  void
-  Hello_receiver_Connector_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-    /* Test code to test the reader interface
-    ::CCM_DDS::CCM_string_Reader_var reader = this->get_receiver_data ();
-    CORBA::String_var string;
-    CCM_DDS::ReadInfo_var ri;
-    reader->read_one (string.out (),  ri.out ());
-    printf ("read <%s>\n", string.in ());
-    */
-  }
-
-  void
-  Hello_receiver_Connector_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Hello_receiver_Connector_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Hello_receiver_Connector_exec_i::configure_dds (void)
-  {
-    if (this->dds_configured_)
-      return;
-
-    try
-      {
-        //NDDSConfigLogger::get_instance()->set_verbosity_by_category(NDDS_CONFIG_LOG_CATEGORY_API,
-          //                                                        NDDS_CONFIG_LOG_VERBOSITY_STATUS_ALL );
-
-        dpf_ = new CIAO::DDS4CCM::RTI::RTI_DomainParticipantFactory_i ();
-        ::DDS::DomainParticipantQos qos;
-        dp_ = dpf_->create_participant (0, qos, 0, 0);
-
-        ::DDS::TopicQos tqos;
-        t_ = dp_->create_topic ("Hello, World",
-                                CIAO::DDS4CCM::RTI::String_Traits::type_support::get_type_name (),
-                                tqos,
-                                0,
-                                DDS_STATUS_MASK_NONE);
-
-        ::DDS::SubscriberQos sqos;
-        sub_ = dp_->create_subscriber (sqos,
-                                      0,
-                                      0);
-
-        ::DDS::DataReaderQos drqos;
-        ::CCM_DDS::string_RawListener_var rawlistener =
-          this->context_->get_connection_receiver_listener ();
-
-        ::CCM_DDS::PortStatusListener_var portstatuslistener =
-          this->context_->get_connection_receiver_status ();
-
-        ::DDS::DataReaderListener_ptr temp = new HelloListener (rawlistener.in (), portstatuslistener.in ());
-        this->listener_ = temp;
-        DDS::DataReader_var drv_tmp = sub_->create_datareader (t_.in (),
-                                                               drqos,
-                                                               listener_.in (),
-                                                               DDS_DATA_AVAILABLE_STATUS);
-
-        dr_ = DDS::CCM_DataReader::_narrow (drv_tmp);
-        printf ("setup done\n");
-      }
-    catch (const CORBA::Exception &ex)
-      {
-        CIAO_ERROR ((LM_ERROR, CLINFO "Hello_receiver_Connector_exec_i::configure_dds - "
-                     "Caught CORBA exception %C\n",
-                     ex._info ().c_str ()));
-      }
-    catch (...)
-      {
-        CIAO_ERROR ((LM_ERROR, CLINFO "Hello_receiver_Connector_exec_i::configure_dds - "
-                     "Error: caught unknown C++ exception while configuring DDS\n"));
-      }
-
-    this->dds_configured_ = true;
-  }
-
-  extern "C" HELLO_RECEIVER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DDS_Hello_receiver_Connector_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      Hello_receiver_Connector_exec_i,
-      ::Components::EnterpriseComponent::_nil ());
-
-    return retval;
-  }
-}
-
-namespace CIAO_Hello_DDS_Hello_receiver_Connector_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: ReceiverConnectorHome_exec_i
-  //============================================================
-
-  ReceiverConnectorHome_exec_i::ReceiverConnectorHome_exec_i (void)
-  {
-  }
-
-  ReceiverConnectorHome_exec_i::~ReceiverConnectorHome_exec_i (void)
-  {
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  ReceiverConnectorHome_exec_i::create (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      Hello_receiver_Connector_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" HELLO_RECEIVER_CONNECTOR_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_DDS_ReceiverConnectorHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      ReceiverConnectorHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h
deleted file mode 100644
index cdf9af2d5d9..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1217
-
-#ifndef CIAO_HELLO_RECEIVER_CONNECTOR_EXEC_H_
-#define CIAO_HELLO_RECEIVER_CONNECTOR_EXEC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Hello_Receiver_ConnectorEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Hello_Receiver_Connector_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/ndds/Writer_T.h"
-#include "dds4ccm/impl/ndds/DataReaderListener.h"
-#include "dds4ccm/impl/ndds/NDDS_Traits.h"
-
-#include <ndds/ndds_cpp.h>
-
-namespace CIAO_Hello_DDS_Hello_receiver_Connector_Impl
-{
-  class HELLO_RECEIVER_CONNECTOR_EXEC_Export string_Reader_exec_i
-    : public virtual ::CCM_DDS::CCM_string_Reader,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    string_Reader_exec_i (DDSStringDataReader *reader);
-    virtual ~string_Reader_exec_i (void);
-
-    // Operations and attributes from ::CCM_DDS::string_Reader
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual void
-    read_all (
-      ::CCM_DDS::string_Reader::stringSeq_out instances,
-      ::CCM_DDS::ReadInfoSeq_out infos);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual void
-    read_all_history (
-      ::CCM_DDS::string_Reader::stringSeq_out instances,
-      ::CCM_DDS::ReadInfoSeq_out infos);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual void
-    read_one (
-      char *& an_instance,
-      ::CCM_DDS::ReadInfo_out info);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual void
-    read_one_history (
-      const char * an_instance,
-      ::CCM_DDS::string_Reader::stringSeq_out instances,
-      ::CCM_DDS::ReadInfoSeq_out infos);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CCM_DDS::QueryFilter *
-    filter (void);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual void
-    filter (
-      const ::CCM_DDS::QueryFilter & filter);
-    private:
-      DDSStringDataReader *reader_;
-      DDSQueryCondition* condition_;
-  };
-
-  class HELLO_RECEIVER_CONNECTOR_EXEC_Export ListenerControl_exec_i
-    : public virtual ::CCM_DDS::CCM_ListenerControl,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenerControl_exec_i (void);
-    virtual ~ListenerControl_exec_i (void);
-
-    // Operations and attributes from ::CCM_DDS::ListenerControl
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Boolean
-    enabled (void);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual void
-    enabled (
-      ::CORBA::Boolean enabled);
-  };
-
-  class HELLO_RECEIVER_CONNECTOR_EXEC_Export Hello_receiver_Connector_exec_i
-    : public virtual Hello_receiver_Connector_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Hello_receiver_Connector_exec_i (void);
-    virtual ~Hello_receiver_Connector_exec_i (void);
-
-    // Supported operations and attributes.
-
-    // Component attributes.
-
-    // Port operations.
-
-    virtual ::CCM_DDS::CCM_string_Reader_ptr
-    get_receiver_data (void);
-
-    virtual ::CCM_DDS::CCM_ListenerControl_ptr
-    get_receiver_control (void);
-
-    virtual ::DDS::CCM_DataReader_ptr
-    get_receiver_dds_entity (void);
-
-    // Operations from Components::SessionComponent.
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    void configure_dds (void);
-
-    ::Hello_DDS::CCM_Hello_receiver_Connector_Context_var context_;
-
-    bool dds_configured_;
-    ::DDS::DomainParticipantFactory_var dpf_;
-    ::DDS::DomainParticipant_var dp_;
-    ::DDS::Topic_var t_;
-    ::DDS::Subscriber_var sub_;
-    ::DDS::DataReaderListener_var listener_;
-    ::DDS::CCM_DataReader_var dr_;
-  };
-
-  extern "C" HELLO_RECEIVER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DDS_Hello_receiver_Connector_Impl (void);
-}
-
-namespace CIAO_Hello_DDS_Hello_receiver_Connector_Impl
-{
-  class HELLO_RECEIVER_CONNECTOR_EXEC_Export ReceiverConnectorHome_exec_i
-    : public virtual ReceiverConnectorHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ReceiverConnectorHome_exec_i (void);
-
-    virtual ~ReceiverConnectorHome_exec_i (void);
-
-    // All operations and attributes.
-
-    // Factory operations.
-
-    // Finder operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  };
-
-  extern "C" HELLO_RECEIVER_CONNECTOR_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_DDS_ReceiverConnectorHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
index 1899adbc3d8..1db5dfca3ec 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
@@ -2,207 +2,137 @@
 //
 // $Id$
 
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1278
-
 #include "Hello_Receiver_exec.h"
-#include "ace/Date_Time.h"
-#include "ace/High_Res_Timer.h"
-
 #include "ciao/Logger/Log_Macros.h"
-#include "ace/Atomic_Op.h"
+#include "tao/ORB_Core.h"
 
-namespace CIAO_Hello_DDS_Receiver_Impl
+namespace CIAO_Hello_Receiver_Impl
 {
   //============================================================
-  // Facet Executor Implementation Class: string_RawListener_exec_i
+  // Facet Executor Implementation Class: DDSHello_RawListener_exec_i
   //============================================================
-
-  string_RawListener_exec_i::string_RawListener_exec_i (Atomic_ULong &received,
-                                                        const ACE_CString &name)
-    : received_ (received),
-      name_ (name)
+  
+  DDSHello_RawListener_exec_i::DDSHello_RawListener_exec_i (void)
   {
   }
-
-  string_RawListener_exec_i::~string_RawListener_exec_i (void)
+  
+  DDSHello_RawListener_exec_i::~DDSHello_RawListener_exec_i (void)
   {
   }
-
-  // Operations from ::CCM_DDS::string_RawListener
-
+  
+  // Operations from ::CCM_DDS::DDSHello_RawListener
+  
   void
-  string_RawListener_exec_i::on_data (
-    const char * an_instance,
+  DDSHello_RawListener_exec_i::on_data (
+    const DDSHello & an_instance ,
     const ::CCM_DDS::ReadInfo & /* info */)
   {
-    
-    ++received_;
-    ACE_CString rec (an_instance);
-    ACE_Date_Time now;
-    int sec_rec = ACE_OS::atoi (rec.substr (0, 2).c_str() );
-    if (sec_rec > 0)
-      {
-        int usec_rec = ACE_OS::atoi (rec.substr (3, 6).c_str ());
-        if (sec_rec != now.second ())
-          usec_rec += 10000000;
-        printf ("<%s> received <%s>. difference <%ld>\n", 
-              this->name_.c_str (), 
-              an_instance,
-              now.microsec () - usec_rec);
-      }
-    else 
-      {
-        printf ("<%s> received <%s>.\n", 
-              this->name_.c_str (), 
-              an_instance);
-      }
+    CIAO_DEBUG ((LM_ERROR, ACE_TEXT ("DDSHello_RawListener: ")
+            ACE_TEXT ("received hello for <%s> - iterator <%d>\n"),
+            an_instance.hello.in (),
+            an_instance.iterator));
   }
   //============================================================
   // Facet Executor Implementation Class: PortStatusListener_exec_i
   //============================================================
-
-  PortStatusListener_exec_i::PortStatusListener_exec_i (Atomic_ULong &lost)
-    : lost_ (lost)
+  
+  PortStatusListener_exec_i::PortStatusListener_exec_i (void)
   {
   }
-
+  
   PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
   {
   }
-
+  
   // Operations from ::CCM_DDS::PortStatusListener
-
+  
   void
   PortStatusListener_exec_i::on_requested_deadline_missed (
     ::DDS::DataReader_ptr /* the_reader */,
     const ::DDS::RequestedDeadlineMissedStatus & /* status */)
   {
-    printf ("port status listener::on_requested_deadline_missed\n");
+    /* Your code here. */
   }
-
+  
   void
   PortStatusListener_exec_i::on_sample_lost (
     ::DDS::DataReader_ptr /* the_reader */,
     const ::DDS::SampleLostStatus & /* status */)
   {
-    ++lost_;
-    printf ("port status listener::on_sample_lost\n");
+   
   }
-
+  
   //============================================================
-  // Component Executor Implementation Class: Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iDDSHello_RawListener_exec_i ();
   //============================================================
-
+  
   Receiver_exec_i::Receiver_exec_i (void)
-    : context_ (0),
-      expected_ (10),
-      received_ (0),
-      lost_ (0)
   {
   }
-
+  
   Receiver_exec_i::~Receiver_exec_i (void)
   {
   }
-
-  // Supported operations and attributes.
-
-  // Component attributes.
-
-  ::CORBA::ULong
-  Receiver_exec_i::expected_samples (void)
-  {
-    return this->expected_;
-  }
-
-  void
-  Receiver_exec_i::expected_samples (::CORBA::ULong expected_samples)
-  {
-    this->expected_ = expected_samples;
-  }
-
-  char *
-  Receiver_exec_i::name (void)
-  {
-    return CORBA::string_dup (this->name_.c_str ());
-  }
-
-  void
-  Receiver_exec_i::name (const char *name)
-  {
-    this->name_ = name;
-  }
-
+  
   // Port operations.
-
-  ::CCM_DDS::CCM_string_RawListener_ptr
-  Receiver_exec_i::get_read_message_listener (void)
+  ::CCM_DDS::CCM_DDSHello_RawListener_ptr
+  Receiver_exec_i::get_info_out_listener (void)
   {
-    return new string_RawListener_exec_i (this->received_, this->name_);
+    CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("new DDSHello RAW listener\n")));
+    return new DDSHello_RawListener_exec_i ();
   }
-
+  
   ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_read_message_status (void)
+  Receiver_exec_i::get_info_out_status (void)
   {
-    return new PortStatusListener_exec_i (this->lost_);
+    CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
+    return new PortStatusListener_exec_i ();
   }
-
+  
   // Operations from Components::SessionComponent.
-
   void
   Receiver_exec_i::set_session_context (
     ::Components::SessionContext_ptr ctx)
   {
     this->context_ =
-      ::Hello_DDS::CCM_Receiver_Context::_narrow (ctx);
-
+      ::Hello::CCM_Receiver_Context::_narrow (ctx);
     if ( ::CORBA::is_nil (this->context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
       }
   }
-
+  
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    /* Your code here. */
   }
-
+  
   void
   Receiver_exec_i::ccm_activate (void)
   {
-  /* Code to use the reader
-    ::CCM_DDS::string_Reader_var reader = this->context_->get_connection_read_message_data ();
-    ::CCM_DDS::ReadInfo_var readinfo;
-    ::CORBA::String_var string;
-    reader->read_one (string.out (), readinfo.out ());
-  */
+    ::CCM_DDS::ListenerControl_var lc = 
+    this->context_->get_connection_info_out_control ();
 
+    if (CORBA::is_nil (lc.in ()))
+      {
+        CIAO_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
+        throw CORBA::INTERNAL ();
+      }
+    lc->enabled (true);
   }
-
+  
   void
   Receiver_exec_i::ccm_passivate (void)
   {
-    /* Your code here. */
   }
-
+  
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    CIAO_DEBUG ((LM_INFO, "Receiver_exec_i received %u messages and lost %u messages\n",
-                 this->received_.value (),
-                 this->lost_.value ()));
-
-    if (this->received_ != this->expected_)
-      {
-        CIAO_ERROR ((LM_EMERGENCY, "Receiver_exec_i: Warning: Expected to receive %u messages, actually got %u\n",
-                     this->expected_, this->received_.value ()));
-      }
   }
-
+  
   extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DDS_Receiver_Impl (void)
+  create_Hello_Receiver_Impl (void)
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
@@ -215,54 +145,3 @@ namespace CIAO_Hello_DDS_Receiver_Impl
   }
 }
 
-namespace CIAO_Hello_DDS_Receiver_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: ReceiverHome_exec_i
-  //============================================================
-
-  ReceiverHome_exec_i::ReceiverHome_exec_i (void)
-  {
-  }
-
-  ReceiverHome_exec_i::~ReceiverHome_exec_i (void)
-  {
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  ReceiverHome_exec_i::create (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-    
-    ACE_NEW_THROW_EX (
-      retval,
-      Receiver_exec_i,
-      ::CORBA::NO_MEMORY ());
-    
-    return retval;
-  }
-  
-  extern "C" HELLO_RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_DDS_ReceiverHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-    
-    ACE_NEW_RETURN (
-      retval,
-      ReceiverHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-    
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
index 0a78e1342de..6e3504c4f6a 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
@@ -2,179 +2,134 @@
 //
 // $Id$
 
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
+/**
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.3
+ * TAO and the TAO IDL Compiler have been developed by:
+ *       Center for Distributed Object Computing
+ *       Washington University
+ *       St. Louis, MO
+ *       USA
+ *       http://www.cs.wustl.edu/~schmidt/doc-center.html
+ * and
+ *       Distributed Object Computing Laboratory
+ *       University of California at Irvine
+ *       Irvine, CA
+ *       USA
+ *       http://doc.ece.uci.edu/
+ * and
+ *       Institute for Software Integrated Systems
+ *       Vanderbilt University
+ *       Nashville, TN
+ *       USA
+ *       http://www.isis.vanderbilt.edu/
+ *
+ * Information about TAO is available at:
+ *     http://www.cs.wustl.edu/~schmidt/TAO.html
+ **/
 
 // TAO_IDL - Generated from
 // be/be_codegen.cpp:1217
 
-#ifndef CIAO_HELLO_RECEIVER_EXEC_H_
-#define CIAO_HELLO_RECEIVER_EXEC_H_
+#ifndef HELLO_RECEIVER_EXEC_H_
+#define HELLO_RECEIVER_EXEC_H_
 
-#include /**/ "ace/pre.h"
 
 #include "Hello_ReceiverEC.h"
 
+#include /**/ "Receiver_exec_export.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "Hello_Receiver_exec_export.h"
 #include "tao/LocalObject.h"
+#include "ace/Task.h"
+#include "ace/Reactor.h"
 
-namespace CIAO_Hello_DDS_Receiver_Impl
+namespace CIAO_Hello_Receiver_Impl
 {
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
-
-  class HELLO_RECEIVER_EXEC_Export string_RawListener_exec_i
-    : public virtual ::CCM_DDS::CCM_string_RawListener,
+  class HELLO_RECEIVER_EXEC_Export DDSHello_RawListener_exec_i
+    : public virtual ::CCM_DDS::CCM_DDSHello_RawListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    string_RawListener_exec_i (Atomic_ULong &,
-                               const ACE_CString &);
-    virtual ~string_RawListener_exec_i (void);
-
-  // Operations and attributes from ::CCM_DDS::string_RawListener
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_ch.cpp:46
-
-  virtual void
-  on_data (const char * an_instance,
-           const ::CCM_DDS::ReadInfo & info);
-
-private:
-  Atomic_ULong &received_;
-  const ACE_CString &name_;
-};
-
-class HELLO_RECEIVER_EXEC_Export PortStatusListener_exec_i
-  : public virtual ::CCM_DDS::CCM_PortStatusListener,
-    public virtual ::CORBA::LocalObject
-{
- public:
-  PortStatusListener_exec_i (Atomic_ULong &);
-  virtual ~PortStatusListener_exec_i (void);
-
-  // Operations and attributes from ::CCM_DDS::PortStatusListener
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_ch.cpp:46
-
-  virtual void
-    on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-                                  const ::DDS::RequestedDeadlineMissedStatus & status);
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_ch.cpp:46
-
-  virtual void
-    on_sample_lost (::DDS::DataReader_ptr the_reader,
-                    const ::DDS::SampleLostStatus & status);
- private:
-  Atomic_ULong &lost_;
-};
-
-class HELLO_RECEIVER_EXEC_Export Receiver_exec_i
-  : public virtual Receiver_Exec,
-    public virtual ::CORBA::LocalObject
-{
- public:
-  Receiver_exec_i (void);
-  virtual ~Receiver_exec_i (void);
-
-  // Supported operations and attributes.
-
-  // Component attributes.
-  virtual ::CORBA::ULong expected_samples (void);
-
-  virtual void expected_samples (::CORBA::ULong expected_samples);
-
-  virtual char * name (void);
-
-  virtual void name (const char *name);
-
-  // Port operations.
-
-  virtual ::CCM_DDS::CCM_string_RawListener_ptr
-    get_read_message_listener (void);
-
-  virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_message_status (void);
-
-  // Operations from Components::SessionComponent.
-
-  virtual void
-    set_session_context (
-                         ::Components::SessionContext_ptr ctx);
-
-  virtual void configuration_complete (void);
-
-  virtual void ccm_activate (void);
-  virtual void ccm_passivate (void);
-  virtual void ccm_remove (void);
-
- private:
-  ::Hello_DDS::CCM_Receiver_Context_var context_;
-  CORBA::ULong expected_;
-  Atomic_ULong received_;
-  Atomic_ULong lost_;
-  ACE_CString name_;
-};
-
-extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-create_Hello_DDS_Receiver_Impl (void);
-}
+    DDSHello_RawListener_exec_i (void);
+    virtual ~DDSHello_RawListener_exec_i (void);
+    
+    // Operations and attributes from ::CCM_DDS::DDSHello_RawListener
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void
+    on_data (
+      const DDSHello & an_instance,
+      const ::CCM_DDS::ReadInfo & info);
+  };
 
-namespace CIAO_Hello_DDS_Receiver_Impl
-{
-  class HELLO_RECEIVER_EXEC_Export ReceiverHome_exec_i
-    : public virtual ReceiverHome_Exec,
+  class HELLO_RECEIVER_EXEC_Export PortStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_PortStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ReceiverHome_exec_i (void);
-
-    virtual ~ReceiverHome_exec_i (void);
-
-    // All operations and attributes.
-
-    // Factory operations.
-
-    // Finder operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-      create (void);
+    PortStatusListener_exec_i (void);
+    virtual ~PortStatusListener_exec_i (void);
+    
+    // Operations and attributes from ::CCM_DDS::PortStatusListener
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::RequestedDeadlineMissedStatus & status);
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::SampleLostStatus & status);
   };
 
-  extern "C" HELLO_RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_DDS_ReceiverHome_Impl (void);
+  class HELLO_RECEIVER_EXEC_Export Receiver_exec_i
+    : public virtual Receiver_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    Receiver_exec_i (void);
+    virtual ~Receiver_exec_i (void);
+    
+    // Supported operations and attributes.
+    // Port operations.
+    
+    virtual ::CCM_DDS::CCM_DDSHello_RawListener_ptr
+    get_info_out_listener (void);
+    
+    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
+    get_info_out_status (void);
+    
+    // Operations from Components::SessionComponent.
+    
+    virtual void
+    set_session_context (
+      ::Components::SessionContext_ptr ctx);
+    
+    virtual void configuration_complete (void);
+    
+    virtual void ccm_activate (void);
+    virtual void ccm_passivate (void);
+    virtual void ccm_remove (void);
+  
+  private:
+    ::Hello::CCM_Receiver_Context_var context_;
+  };
+  
+  extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Hello_Receiver_Impl (void);
 }
 
-#include /**/ "ace/post.h"
-
 #endif /* ifndef */
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
index fc8e2efa9af..21c92efc15d 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
@@ -1,21 +1,36 @@
 // $Id$
 
-#include "Hello_Sender_Base.idl"
-#include <Components.idl>
+/**
+ * @file
+ * @author Marcel Smit <msmit@remedy.nl>
+ *
+ * by-hand idl3 translation of sender components.
+ */
 
-module Hello_DDS
+#ifndef DDS_SENDER_IDL
+#define DDS_SENDER_IDL
+
+#include "Connector/Hello_Connector.idl"
+#include "Connector/Hello_ConnectorE.idl"
+
+module Hello
 {
   component Sender
   {
-    uses CCM_DDS::string_Writer push_data_data;
-    uses DDS::DataWriter push_data_dds_entity;
-
-    attribute unsigned long iterations;
-    attribute string message;
-    attribute boolean log_time;
+    uses CCM_DDS::DDSHello_Writer info_write_data;
+    //port CCM_DDS::DDS_Update info_update;
+    attribute unsigned long rate;
   };
+};
 
-  home SenderHome manages Sender
+/*
+For future use: IDL3 plus
+module Hello
+{
+  component Sender
   {
+    port CCM_DDS::DDS_Write <DDSHello> info;
   };
 };
+*/
+#endif
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl3p b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl3p
deleted file mode 100644
index b09cccdea55..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl3p
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-#ifndef HELLO_SENDER_IDL3P
-#define HELLO_SENDER_IDL3P
-
-#include "Hello_Base.idl3p"
-
-module Hello_DDS
-{
-  component Sender
-  {
-    port DDS_Write<string> push_message;
-  };
-};
-
-#endif /* HELLO_SENDER_IDL3P */
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
index 2c34183205a..d558fadc8ee 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -1,87 +1,92 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl -b ciao_example_output, dds4ccm_base Hello_Sender"
 
-project(DDS_Hello_Sender_idl_gen) : connectoridldefaults , ciao_example_output, dds4ccm_base  {
+project(DDS_Sender_idl_gen) : connectoridldefaults, componentidldefaults   {
+  after += DDS_Hello_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \
-              -Wb,stub_export_include=Hello_Sender_stub_export.h \
+              -Wb,stub_export_include=Sender_stub_export.h \
               -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \
-              -Wb,skel_export_include=Hello_Sender_svnt_export.h \
+              -Wb,skel_export_include=Sender_svnt_export.h \
               -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \
-              -Wb,exec_export_include=Hello_Sender_exec_export.h
+              -Wb,exec_export_include=Sender_exec_export.h \
+              -I ..
 
   IDL_Files {
     Hello_Sender.idl
   }
 }
 
-project(DDS_Hello_Sender_lem_gen) : ciaoidldefaults , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Sender_idl_gen
+project(DDS_Sender_lem_gen) : connectoridldefaults   {
+  after += DDS_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Hello_Sender_lem_stub_export.h \
-              -SS -Gxhst -I$(CIAO_ROOT)/connectors
+              -Wb,stub_export_include=Sender_lem_stub_export.h \
+              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
 
   IDL_Files {
     Hello_SenderE.idl
   }
 }
 
-project(DDS_Hello_Sender_stub) : ccm_stub , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Sender_idl_gen DDS_Hello_Sender_Base_stub
-  libs  += DDS_Hello_Sender_Base_stub
-  libpaths    += ../lib
-
-  sharedname = DDS_Hello_Sender_stub
-  dynamicflags   = HELLO_SENDER_STUB_BUILD_DLL
+project(DDS_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
+  after += DDS_Sender_lem_gen DDS_Sender_stub DDS_Hello_Base_stub
+  libs  += DDS_Hello_Base_stub Sender_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = Sender_lem_stub
+  dynamicflags   = HELLO_SENDER_LEM_STUB_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Hello_SenderC.cpp
+    Hello_SenderEC.cpp
   }
 
   Header_Files {
-    Hello_SenderC.h
-    Hello_Sender_stub_export.h
+    Hello_SenderEC.h
+    Sender_lem_stub_export.h
   }
 
   Inline_Files {
-    Hello_SenderC.inl
+    Hello_SenderEC.inl
   }
 }
 
-project(DDS_Hello_Sender_lem_stub) : ccm_svnt , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Sender_lem_gen
-  libs  +=
-
-  sharedname = DDS_Hello_Sender_lem_stub
-  dynamicflags   = HELLO_SENDER_LEM_STUB_BUILD_DLL
+project(DDS_Sender_stub) : ccm_stub, dds4ccm_base   {
+  after += DDS_Sender_idl_gen DDS_Hello_Base_stub DDS_Hello_Connector_stub
+  libs  += DDS_Hello_Base_stub DDS_Hello_Connector_stub
+  includes += ..
+  libpaths += ../lib
+  libout = ../lib
+  sharedname = Sender_stub
+  dynamicflags   = HELLO_SENDER_STUB_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Hello_SenderEC.cpp
+    Hello_SenderC.cpp
   }
 
   Header_Files {
-    Hello_SenderEC.h
-    Hello_Sender_lem_stub_export.h
+    Hello_SenderC.h
+    Sender_stub_export.h
   }
 
   Inline_Files {
-    Hello_SenderEC.inl
+    Hello_SenderC.inl
   }
 }
 
-project(DDS_Hello_Sender_exec) : ciao_executor , ciao_example_output, dds4ccm_base  {
-  after   += DDS_Hello_Sender_lem_stub DDS_Hello_Sender_stub DDS_Hello_Sender_Base_stub
-  sharedname = DDS_Hello_Sender_exec
-  libs += DDS_Hello_Sender_stub DDS_Hello_Sender_lem_stub DDS_Hello_Sender_Base_stub
-  libpaths    += ../lib
-
+project(DDS_Sender_exec) : ciao_executor, dds4ccm_base   {
+  after   += DDS_Sender_lem_stub DDS_Sender_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub
+  sharedname = Sender_exec
+  libs += Sender_stub Sender_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub
+  libpaths += ../lib
+  includes += ..
+  libout = ../lib
   dynamicflags   = HELLO_SENDER_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -93,7 +98,7 @@ project(DDS_Hello_Sender_exec) : ciao_executor , ciao_example_output, dds4ccm_ba
 
   Header_Files {
     Hello_Sender_exec.h
-    Hello_Sender_exec_export.h
+    Sender_exec_export.h
   }
 
   Inline_Files {
@@ -101,12 +106,14 @@ project(DDS_Hello_Sender_exec) : ciao_executor , ciao_example_output, dds4ccm_ba
 }
 
 
-project(DDS_Hello_Sender_svnt) : ciao_servant , ciao_example_output, dds4ccm_base  {
-  after      +=  DDS_Hello_Sender_Base_stub DDS_Hello_Sender_lem_stub DDS_Hello_Sender_stub
-  sharedname  = DDS_Hello_Sender_svnt 
-  libs       += DDS_Hello_Sender_stub DDS_Hello_Sender_lem_stub  DDS_Hello_Sender_Base_stub
-  libpaths    += ../lib
-
+project(DDS_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+  after      += DDS_Hello_Base_stub  DDS_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Hello_Connector_stub DDS_Hello_Connector_svnt  DDS_Hello_Connector_lem_stub
+  sharedname  = Sender_svnt
+  libs       += Sender_stub Sender_lem_stub  \
+                DDS_Hello_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Connector_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
   dynamicflags = HELLO_SENDER_SVNT_BUILD_DLL
 
   IDL_Files {
@@ -120,7 +127,7 @@ project(DDS_Hello_Sender_svnt) : ciao_servant , ciao_example_output, dds4ccm_bas
   Header_Files {
     Hello_SenderS.h
     Hello_Sender_svnt.h
-    Hello_Sender_svnt_export.h
+    Sender_svnt_export.h
   }
 
   Inline_Files {
@@ -128,4 +135,3 @@ project(DDS_Hello_Sender_svnt) : ciao_servant , ciao_example_output, dds4ccm_bas
   }
 }
 
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl
deleted file mode 100644
index ba7024d61a8..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#ifndef HELLO_SENDER_BASE_IDL_
-#define HELLO_SENDER_BASE_IDL_
-
-#include "dds4ccm/idl/dds4ccm_Base.idl3"
-module CCM_DDS
-{
-  interface string_Writer
-  {
-    typedef sequence<string> stringSeq;
-
-    void write (in string an_instance)
-      raises (InternalError);
-  };
-};
-
-#endif
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc
deleted file mode 100644
index 79738ac1d11..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc
+++ /dev/null
@@ -1,80 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -n -b ciao_example_output, dds4ccm_base Hello_Sender_Base"
-
-project(DDS_Hello_Sender_Base_idl_gen) : connectoridldefaults , ciao_example_output, dds4ccm_base  {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_BASE_STUB_Export \
-              -Wb,stub_export_include=Hello_Sender_Base_stub_export.h \
-              -Wb,skel_export_macro=HELLO_SENDER_BASE_SKEL_Export \
-              -Wb,skel_export_include=Hello_Sender_Base_skel_export.h \
-              -Wb,exec_export_macro=HELLO_SENDER_BASE_EXEC_Export \
-              -Wb,exec_export_include=Hello_Sender_Base_exec_export.h
-
-  IDL_Files {
-    Hello_Sender_Base.idl
-  }
-}
-
-project(DDS_Hello_Sender_Base_lem_gen) : ciaoidldefaults , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Sender_Base_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_BASE_STUB_Export \
-              -Wb,stub_export_include=Hello_Sender_Base_stub_export.h \
-              -SS -Gxhst -I$(CIAO_ROOT)/connectors
-
-  IDL_Files {
-    Hello_Sender_BaseE.idl
-  }
-}
-
-project(DDS_Hello_Sender_Base_stub) : ccm_stub, ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Sender_Base_lem_gen
-  libs  +=
-
-  sharedname = DDS_Hello_Sender_Base_stub
-  dynamicflags   = HELLO_SENDER_BASE_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Sender_BaseC.cpp
-    Hello_Sender_BaseEC.cpp
-  }
-
-  Header_Files {
-    Hello_Sender_BaseC.h
-    Hello_Sender_Base_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Sender_BaseC.inl
-  }
-}
-
-project(DDS_Hello_Sender_Base_skel) : ciao_executor, ciao_example_output, dds4ccm_base  {
-  after      +=  DDS_Hello_Sender_Base_stub
-  sharedname  = DDS_Hello_Sender_Base_skel
-  libs       += DDS_Hello_Sender_Base_stub
-  libpaths   += ../lib
-
-  dynamicflags = HELLO_SENDER_BASE_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Sender_BaseS.cpp
-  }
-
-  Header_Files {
-    Hello_Sender_BaseS.h
-    Hello_Sender_Base_skel_export.h
-  }
-
-  Inline_Files {
-    Hello_Sender_BaseS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl
deleted file mode 100644
index 7ffa63e6f0d..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#include <Components.idl>
-
-#include "Hello_Sender_Base.idl"
-#include "Hello_Sender_BaseE.idl"
-#include "dds4ccm/idl/dds_rtf2_dcpsE.idl"
-
-module Hello_DDS
-{
-  component Hello_sender_Connector
-  {
-    provides CCM_DDS::string_Writer sender_data;
-#ifndef AVOID_E_IDL
-    provides DDS::DataWriter sender_dds_entity;
-#endif
-  };
-
-  home SenderConnectorHome manages Hello_sender_Connector
-  {
-  };
-};
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc
deleted file mode 100644
index 1ae4b13c26f..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc
+++ /dev/null
@@ -1,133 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -b ciao_example_output, dds4ccm_base Hello_Sender_Connector"
-
-project(DDS_Hello_Sender_Connector_idl_gen) : connectoridldefaults , ciao_example_output, dds4ccm_base  {
-  custom_only = 1
-  after += DDS_Hello_Sender_Base_idl_gen
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Hello_Sender_Connector_stub_export.h \
-              -Wb,skel_export_macro=HELLO_SENDER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Hello_Sender_Connector_svnt_export.h \
-              -Wb,exec_export_macro=HELLO_SENDER_CONNECTOR_EXEC_Export \
-              -Wb,exec_export_include=Hello_Sender_Connector_exec_export.h
-
-  IDL_Files {
-    Hello_Sender_Connector.idl
-  }
-}
-
-project(DDS_Hello_Sender_Connector_lem_gen) : ciaoidldefaults , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Sender_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Hello_Sender_Connector_lem_stub_export.h \
-              -SS -Gxhst -I$(CIAO_ROOT)/connectors -DAVOID_E_IDL
-
-  IDL_Files {
-    Hello_Sender_ConnectorE.idl
-  }
-}
-
-project(DDS_Hello_Sender_Connector_stub) : ccm_stub , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Sender_Connector_idl_gen DDS_Hello_Sender_Base_stub
-  libs  += DDS_Hello_Sender_Base_stub
-  libpaths += ../lib
-
-  sharedname = DDS_Hello_Sender_Connector_stub
-  dynamicflags   = HELLO_SENDER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Sender_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Hello_Sender_ConnectorC.h
-    Hello_Sender_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Sender_ConnectorC.inl
-  }
-}
-
-project(DDS_Hello_Sender_Connector_lem_stub) : ccm_svnt , ciao_example_output, dds4ccm_base  {
-  after += DDS_Hello_Sender_Connector_lem_gen DDS_Hello_Sender_Base_stub
-  libs  += DDS_Hello_Sender_Base_stub
-  libpaths += ../lib
-
-  sharedname = DDS_Hello_Sender_Connector_lem_stub
-  dynamicflags   = HELLO_SENDER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Sender_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Hello_Sender_ConnectorEC.h
-    Hello_Sender_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Sender_ConnectorEC.inl
-  }
-}
-
-project(DDS_Hello_Sender_Connector_exec) : ciao_executor , ciao_example_output, dds4ccm_skel, nddslib, ciao_dds4ccm_ndds_impl  {
-  after   += DDS_Hello_Sender_Connector_lem_stub DDS_Hello_Sender_Connector_stub DDS4CCM_lem_stub DDS_Hello_Sender_Base_stub
-  sharedname = DDS_Hello_Sender_Connector_exec
-  libs += DDS_Hello_Sender_Connector_stub DDS_Hello_Sender_Connector_lem_stub DDS_Hello_Sender_Base_stub
-  libs += DDS4CCM_lem_stub
-  libpaths += ../lib
-  dynamicflags   = HELLO_SENDER_CONNECTOR_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Sender_Connector_exec.cpp
-  }
-
-  Header_Files {
-    Hello_Sender_Connector_exec.h
-    Hello_Sender_Connector_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Hello_Sender_Connector_svnt) : ciao_servant , ciao_example_output, dds4ccm_skel  {
-  after      +=  DDS_Hello_Sender_Base_stub DDS_Hello_Sender_Base_skel DDS4CCM_lem_stub DDS_Hello_Sender_Connector_lem_stub DDS4CCM_lem_stub
-  sharedname  = DDS_Hello_Sender_Connector_svnt
-  libs       += DDS_Hello_Sender_Connector_stub DDS_Hello_Sender_Connector_lem_stub  DDS_Hello_Sender_Base_stub DDS_Hello_Sender_Base_skel
-  libs += DDS4CCM_lem_stub
-  libpaths   += ../lib
-  dynamicflags = HELLO_SENDER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Sender_ConnectorS.cpp
-    Hello_Sender_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_Sender_ConnectorS.h
-    Hello_Sender_Connector_svnt.h
-    Hello_Sender_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    Hello_Sender_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp
deleted file mode 100644
index 3f4997f21b4..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1278
-
-#include "Hello_Sender_Connector_exec.h"
-
-#include "dds4ccm/impl/ndds/DomainParticipantFactory.h"
-
-namespace CIAO_Hello_DDS_Hello_sender_Connector_Impl
-{
-  //============================================================
-  // Facet Executor Implementation Class: string_Writer_exec_i
-  //============================================================
-
-  string_Writer_exec_i::string_Writer_exec_i (String_Writer* sw)
-    : writer_ (sw)
-  {
-  }
-
-  string_Writer_exec_i::~string_Writer_exec_i (void)
-  {
-  }
-
-  void
-  string_Writer_exec_i::write (const char *an_instance)
-  {
-    writer_->write (an_instance);
-    /*-----------------7-8-2009 14:13-------------------
-     * Code to call a multi writer
-    ::DDS_StringSeq myseq (1);
-    myseq.length (1);
-    myseq[0] = DDS_String_dup("Multi writer");
-    writer_.write (myseq, true);
-     * --------------------------------------------------*/
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Hello_sender_Connector_exec_i
-  //============================================================
-
-  Hello_sender_Connector_exec_i::Hello_sender_Connector_exec_i (void)
-    : dds_configured_ (false)
-  {
-  }
-
-  Hello_sender_Connector_exec_i::~Hello_sender_Connector_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes.
-
-  // Port operations.
-
-  ::CCM_DDS::CCM_string_Writer_ptr
-  Hello_sender_Connector_exec_i::get_sender_data (void)
-  {
-    this->configure_dds ();
-    return ::CCM_DDS::CCM_string_Writer::_duplicate (this->sw_.in ());
-  }
-
-  ::DDS::CCM_DataWriter_ptr
-  Hello_sender_Connector_exec_i::get_sender_dds_entity (void)
-  {
-    this->configure_dds ();
-    return ::DDS::CCM_DataWriter::_duplicate (this->dw_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Hello_sender_Connector_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Hello_DDS::CCM_Hello_sender_Connector_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Hello_sender_Connector_exec_i::configure_dds (void)
-  {
-    if (this->dds_configured_)
-      return;
-
-    try
-      {
-        //NDDSConfigLogger::get_instance()->set_verbosity_by_category(NDDS_CONFIG_LOG_CATEGORY_API,
-        //                                                          NDDS_CONFIG_LOG_VERBOSITY_STATUS_ALL );
-        dpf_ = new ::CIAO::DDS4CCM::RTI::RTI_DomainParticipantFactory_i ();
-        ::DDS::DomainParticipantQos qos;
-        dp_ = dpf_->create_participant (0, qos, 0, 0);
-
-        ::DDS::TopicQos tqos;
-        t_ = dp_->create_topic ("Hello, World",
-                                ::CIAO::DDS4CCM::RTI::String_Traits::type_support::get_type_name (),
-                                tqos,
-                                0,
-                                0);
-
-        ::DDS::PublisherQos pqos;
-        pub_ = dp_->create_publisher (pqos,
-                                      0,
-                                      0);
-
-        ::DDS::DataWriterQos dwqos;
-        ::DDS::DataWriter_var dwv_tmp = pub_->create_datawriter (t_.in (),
-                                                                 dwqos,
-                                                                 0,
-                                                                 0);
-
-        dw_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp);
-
-        // todo leak
-        String_Writer* sw = new String_Writer(dw_.in ());
-
-        sw_ = new string_Writer_exec_i (sw);
-
-      }
-    catch (const CORBA::Exception &ex)
-      {
-        CIAO_ERROR ((LM_ERROR, CLINFO "Hello_sender_Connector_exec_i::configure_dds - "
-                     "Caught CORBA exception %C\n",
-                     ex._info ().c_str ()));
-      }
-    catch (...)
-      {
-        CIAO_ERROR ((LM_ERROR, CLINFO "Hello_sender_Connector_exec_i::configure_dds - "
-                     "Error: caught unknown C++ exception while configuring DDS\n"));
-      }
-
-    this->dds_configured_ = true;
-  }
-
-
-  void
-  Hello_sender_Connector_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-    this->configure_dds ();
-  }
-
-  void
-  Hello_sender_Connector_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Hello_sender_Connector_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Hello_sender_Connector_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" HELLO_SENDER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DDS_Hello_sender_Connector_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      Hello_sender_Connector_exec_i,
-      ::Components::EnterpriseComponent::_nil ());
-
-    return retval;
-  }
-}
-
-namespace CIAO_Hello_DDS_Hello_sender_Connector_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: SenderConnectorHome_exec_i
-  //============================================================
-
-  SenderConnectorHome_exec_i::SenderConnectorHome_exec_i (void)
-  {
-  }
-
-  SenderConnectorHome_exec_i::~SenderConnectorHome_exec_i (void)
-  {
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  SenderConnectorHome_exec_i::create (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      Hello_sender_Connector_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" HELLO_SENDER_CONNECTOR_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_DDS_SenderConnectorHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      SenderConnectorHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h
deleted file mode 100644
index 43c598d9db1..00000000000
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1217
-
-#ifndef CIAO_HELLO_SENDER_CONNECTOR_EXEC_H_
-#define CIAO_HELLO_SENDER_CONNECTOR_EXEC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Hello_Sender_ConnectorEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Hello_Sender_Connector_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "dds4ccm/impl/ndds/DataWriter.h"
-#include "dds4ccm/impl/ndds/Builtin_Writer_T.h"
-#include "dds4ccm/impl/ndds/NDDS_Traits.h"
-
-namespace CIAO_Hello_DDS_Hello_sender_Connector_Impl
-{
-  typedef CIAO::DDS4CCM::RTI::Builtin_Writer_T< CIAO::DDS4CCM::RTI::String_Traits, ::CCM_DDS::CCM_string_Writer > String_Writer;
-
-  class HELLO_SENDER_CONNECTOR_EXEC_Export string_Writer_exec_i
-    : public virtual ::CCM_DDS::CCM_string_Writer,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    string_Writer_exec_i (String_Writer* wr);
-    virtual ~string_Writer_exec_i (void);
-
-    // Operations and attributes from ::CCM_DDS::string_Writer
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual void write (const char * an_instance);
-
-  private:
-    String_Writer* writer_;
-  };
-
-  /*
-  class HELLO_SENDER_CONNECTOR_EXEC_Export DDSWriter_i :
-    public virtual CIAO::DDS4CCM::RTI::RTI_DataWriter_i,
-    public virtual ::CORBA::LocalObject
-  {
-    DDSWriter_i (CIAO::DDS4CCM::RTI::RTI_DataWriter_i rti_dw)
-      : CIAO::DDS4CCM::RTI::RTI_DataWriter_i (rti_dw)
-      {
-      }
-  };
-  */
-
-  class HELLO_SENDER_CONNECTOR_EXEC_Export Hello_sender_Connector_exec_i
-    : public virtual Hello_sender_Connector_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Hello_sender_Connector_exec_i (void);
-    virtual ~Hello_sender_Connector_exec_i (void);
-
-    // Supported operations and attributes.
-
-    // Component attributes.
-
-    // Port operations.
-
-    virtual ::CCM_DDS::CCM_string_Writer_ptr
-    get_sender_data (void);
-
-    virtual ::DDS::CCM_DataWriter_ptr
-    get_sender_dds_entity (void);
-
-    // Operations from Components::SessionComponent.
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    void configure_dds (void);
-
-    ::Hello_DDS::CCM_Hello_sender_Connector_Context_var context_;
-
-    bool dds_configured_;
-    ::DDS::DomainParticipantFactory_var dpf_;
-    ::DDS::DomainParticipant_var dp_;
-    ::DDS::Topic_var t_;
-    ::DDS::Publisher_var pub_;
-    ::DDS::CCM_DataWriter_var dw_;
-    ::CCM_DDS::CCM_string_Writer_var sw_;
-  };
-
-  extern "C" HELLO_SENDER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DDS_Hello_sender_Connector_Impl (void);
-}
-
-namespace CIAO_Hello_DDS_Hello_sender_Connector_Impl
-{
-  class HELLO_SENDER_CONNECTOR_EXEC_Export SenderConnectorHome_exec_i
-    : public virtual SenderConnectorHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    SenderConnectorHome_exec_i (void);
-
-    virtual ~SenderConnectorHome_exec_i (void);
-
-    // All operations and attributes.
-
-    // Factory operations.
-
-    // Finder operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  };
-
-  extern "C" HELLO_SENDER_CONNECTOR_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_DDS_SenderConnectorHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
index 333ab6a6e1a..d80df23c168 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
@@ -1,161 +1,110 @@
 // -*- C++ -*-
-//
 // $Id$
 
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1278
-
 #include "Hello_Sender_exec.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Task.h"
-#include "ace/Date_Time.h"
+#include "ace/Guard_T.h"
+#include "ciao/Logger/Log_Macros.h"
+#include "tao/ORB_Core.h"
 
-namespace CIAO_Hello_DDS_Sender_Impl
+namespace CIAO_Hello_Sender_Impl
 {
-  class Sending_Task : public virtual ACE_Task_Base
-  {
-  public:
-    Sending_Task (const ACE_CString &msg,
-                  CORBA::ULong iters,
-                  ::CCM_DDS::string_Writer_ptr writer,
-                  bool log_time)
-      : msg_ (msg),
-        iters_ (iters),
-        writer_ (::CCM_DDS::string_Writer::_duplicate (writer)),
-        log_time_ (log_time)
-    {
-    }
-
-    virtual int svc (void)
-    {
-      // Allowing some time for discovery to happen
-      ACE_OS::sleep (5);
-      ACE_Time_Value tv (0, 1000); //1 msec
-      for (size_t i = 0; i < this->iters_; ++i)
-        {
-          ACE_CString msg = create_message (this->msg_);
-          this->writer_->write (msg.c_str ());
-          ACE_DEBUG ((LM_DEBUG, "Sender has sent string\n"));
-          ACE_OS::sleep (tv);
-        }
+  //============================================================
+  // Pulse generator
+  //============================================================
 
-      return 0;
-    }
+  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
+    : pulse_callback_ (callback)
+  {
+  }
 
-    ACE_CString create_message (const ACE_CString &msg)
-    {
-      if (!this->log_time_)
-        return msg;
-      char timestamp[16];
-      ACE_Date_Time now;
-      ACE_OS::sprintf (timestamp,
-                        "%02d.%d",
-                        now.second(),
-                        now.microsec ());
-      ACE_CString ret (timestamp);
-      ret = ret + " " + msg;
-      return ret.c_str ();
-    }
-  private:
-    const ACE_CString &msg_;
-    CORBA::ULong iters_;
-    ::CCM_DDS::string_Writer_var writer_;
-    bool log_time_;
-  };
+  pulse_Generator::~pulse_Generator ()
+  {
+  }
 
+  int
+  pulse_Generator::handle_timeout (const ACE_Time_Value &,
+                                   const void *)
+  {
+    // Notify the subscribers
+    this->pulse_callback_.tick ();
+    return 0;
+  }
 
   //============================================================
   // Component Executor Implementation Class: Sender_exec_i
   //============================================================
 
   Sender_exec_i::Sender_exec_i (void)
-    : iters_ (10),
-      msg_ ("Hi Johnny, I'm a CCM component sending DDS messages!"),
-      task_ (0),
-      log_time_ (true)
+    : rate_ (1),
+      iteration_ (0)
   {
+    this->ticker_ = new pulse_Generator (*this);
   }
 
   Sender_exec_i::~Sender_exec_i (void)
   {
-    if (task_)
-      delete task_;
   }
 
   // Supported operations and attributes.
 
-  // Component attributes.
-
-  char *
-  Sender_exec_i::message (void)
-  {
-    return CORBA::string_dup (this->msg_.c_str());
-  }
-
   void
-  Sender_exec_i::message (const char *msg)
+  Sender_exec_i::tick ()
   {
-    this->msg_ = msg;
+    DDSHello * new_msg = new DDSHello();
+
+    new_msg->hello = "Hello, world!";
+    new_msg->iterator = ++this->iteration_;
+    printf ("TICK\n");
+    this->writer_->write (*new_msg);
   }
 
-  ::CORBA::Boolean
-  Sender_exec_i::log_time (void)
-  {
-    return this->log_time_;
+  void
+  Sender_exec_i::start (void)
+  {
+    // calculate the interval time
+    long usec = 1000000 / this->rate_;
+    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
+                this->ticker_,
+                0,
+                ACE_Time_Value (0, usec),
+                ACE_Time_Value (0, usec)) == -1)
+    {
+      CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
+                             ACE_TEXT ("Error scheduling timer")));
+    }
   }
 
   void
-  Sender_exec_i::log_time (::CORBA::Boolean log_time)
+  Sender_exec_i::stop (void)
   {
-    this->log_time_ = log_time;
+    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
+    CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
+    delete this->ticker_;
   }
 
-
+  // Component attributes.
   ::CORBA::ULong
-  Sender_exec_i::iterations (void)
+  Sender_exec_i::rate (void)
   {
-    return this->iters_;
+    return this->rate_;
   }
 
   void
-  Sender_exec_i::iterations (CORBA::ULong iters)
+  Sender_exec_i::rate (
+    ::CORBA::ULong rate)
   {
-    this->iters_ = iters;
+    this->rate_ = rate;
   }
 
   // Port operations.
 
   // Operations from Components::SessionComponent.
-
   void
   Sender_exec_i::set_session_context (
-                                      ::Components::SessionContext_ptr ctx)
+    ::Components::SessionContext_ptr ctx)
   {
     this->context_ =
-      ::Hello_DDS::CCM_Sender_Context::_narrow (ctx);
+      ::Hello::CCM_Sender_Context::_narrow (ctx);
 
     if ( ::CORBA::is_nil (this->context_.in ()))
       {
@@ -166,97 +115,35 @@ namespace CIAO_Hello_DDS_Sender_Impl
   void
   Sender_exec_i::configuration_complete (void)
   {
-    /* Your code here. */
+    this->writer_ = this->context_->get_connection_info_write_data ();
   }
 
   void
   Sender_exec_i::ccm_activate (void)
   {
-    ::CCM_DDS::string_Writer_var writer =
-      this->context_->get_connection_push_data_data ();
-
-    this->task_ = new Sending_Task (this->msg_,
-                                    this->iters_,
-                                    writer,
-                                    this->log_time_);
-
-    this->task_->activate (THR_NEW_LWP | THR_JOINABLE,
-                           1);
+    this->start ();
   }
 
   void
   Sender_exec_i::ccm_passivate (void)
   {
-    /* Your code here. */
+    this->stop ();
   }
 
   void
   Sender_exec_i::ccm_remove (void)
   {
-    /* Your code here. */
   }
 
   extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DDS_Sender_Impl (void)
+  create_Hello_Sender_Impl (void)
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
 
-    ACE_NEW_RETURN (
-                    retval,
-                    Sender_exec_i,
-                    ::Components::EnterpriseComponent::_nil ());
-
-    return retval;
-  }
-}
-
-namespace CIAO_Hello_DDS_Sender_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: SenderHome_exec_i
-  //============================================================
-
-  SenderHome_exec_i::SenderHome_exec_i (void)
-  {
-  }
-
-  SenderHome_exec_i::~SenderHome_exec_i (void)
-  {
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  SenderHome_exec_i::create (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-                      retval,
-                      Sender_exec_i,
-                      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_DDS_SenderHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-                    retval,
-                    SenderHome_exec_i,
-                    ::Components::HomeExecutorBase::_nil ());
+    ACE_NEW_NORETURN (
+      retval,
+      Sender_exec_i);
 
     return retval;
   }
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
index acb3e004b7d..f398259b02b 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
@@ -1,52 +1,45 @@
 // -*- C++ -*-
-//
 // $Id$
 
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
+#ifndef HELLO_SENDER_EXEC_H_
+#define HELLO_SENDER_EXEC_H_
 
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1217
-
-#ifndef CIAO_HELLO_SENDER_EXEC_H_
-#define CIAO_HELLO_SENDER_EXEC_H_
-
-#include /**/ "ace/pre.h"
 
 #include "Hello_SenderEC.h"
 
+#include /**/ "Sender_exec_export.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "Hello_Sender_exec_export.h"
 #include "tao/LocalObject.h"
+#include "ace/Task.h"
+#include "ace/Reactor.h"
 
-namespace CIAO_Hello_DDS_Sender_Impl
+#include <map>
+
+namespace CIAO_Hello_Sender_Impl
 {
-  class Sending_Task;
+  class Sender_exec_i;
   
-  class HELLO_SENDER_EXEC_Export Sender_exec_i
+  class pulse_Generator : 
+    public ACE_Event_Handler
+  {
+  public:
+    pulse_Generator (Sender_exec_i &callback);
+
+    ~pulse_Generator ();
+
+    /// Handle the timeout.
+    virtual int handle_timeout (const ACE_Time_Value &tv,
+                                const void *arg);
+  private:
+    /// Maintains a handle that actually process the event
+    Sender_exec_i &pulse_callback_;
+  };
+  
+  class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
   {
@@ -56,20 +49,30 @@ namespace CIAO_Hello_DDS_Sender_Impl
     
     // Supported operations and attributes.
     
-    // Component attributes.
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
     
-    virtual ::CORBA::ULong iterations (void);
+    void start (void);
     
-    virtual void iterations (CORBA::ULong iterations);
-
-    virtual char * message (void);
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
     
-    virtual void message (const char *message);
+    void stop (void);
     
-  virtual ::CORBA::Boolean log_time (void);
+    void tick ();
     
-  virtual void log_time (::CORBA::Boolean log_time);
+    // Component attributes.
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
     
+    virtual ::CORBA::ULong
+    rate (void);
+    
+    virtual void
+    rate (
+      ::CORBA::ULong rate);
+
     // Port operations.
     
     // Operations from Components::SessionComponent.
@@ -85,46 +88,17 @@ namespace CIAO_Hello_DDS_Sender_Impl
     virtual void ccm_remove (void);
   
   private:
-    ::Hello_DDS::CCM_Sender_Context_var context_;
+    ::Hello::CCM_Sender_Context_var context_;
     
-    CORBA::ULong iters_;
-    ACE_CString msg_;
-    Sending_Task *task_;
-    bool log_time_;
+    CCM_DDS::DDSHello_Writer_var writer_;
+    pulse_Generator * ticker_;
+    CORBA::ULong rate_;
+    CORBA::Short iteration_;
   };
   
   extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DDS_Sender_Impl (void);
-}
-
-namespace CIAO_Hello_DDS_Sender_Impl
-{
-  class HELLO_SENDER_EXEC_Export SenderHome_exec_i
-    : public virtual SenderHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    SenderHome_exec_i (void);
-    
-    virtual ~SenderHome_exec_i (void);
-    
-    // All operations and attributes.
-    
-    // Factory operations.
-    
-    // Finder operations.
-    
-    // Implicit operations.
-    
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  };
-  
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_DDS_SenderHome_Impl (void);
+  create_Hello_Sender_Impl (void);
 }
 
-#include /**/ "ace/post.h"
-
 #endif /* ifndef */
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp
index b0250ede08e..f0de9c1b24d 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp
@@ -1,80 +1,25 @@
 <Deployment:DeploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Hello_DDS_Deployment_1</label>
-  <UUID>Hello_DDS_Deployment_1</UUID>
-
-  <!-- Implementations declarations -->
-
-  <!-- Home implementation -->
-  <implementation xmi:id="Hello_ReceiverHomeImplementation">
-    <name>Hello_ReceiverHomeImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Receiver_ExecArtifact" />
-    <artifact xmi:idref="Hello_Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_ReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DDS_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Hello_ReceiverConnectorHomeImplementation">
-    <name>Hello_ReceiverConnectorHomeImplementation</name>
+   xmlns:Deployment="http://www.omg.org/Deployment"
+   xmlns:xmi="http://www.omg.org/XMI"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+  <label>Hello_Depl_1</label>
+  <UUID>Hello_Depl_1</UUID>
+
+  <implementation xmi:id="ReceiverComponentImplementation">
+    <name>ReceiverComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Hello_ReceiverConnector_ExecArtifact" />
-    <artifact xmi:idref="Hello_ReceiverConnector_SvntArtifact" />
+    <artifact xmi:idref="Receiver_ExecArtifact" />
+    <artifact xmi:idref="Receiver_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
+      <name>component factory</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_ReceiverConnectorHome_Impl</string>
+          <string>create_Hello_Receiver_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -85,7 +30,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_ReceiverConnectorHome_Servant</string>
+          <string>create_Hello_Receiver_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -96,7 +41,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_ReceiverConnector_svnt</string>
+          <string>Receiver_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -107,41 +52,26 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_ReceiverConnector_exec</string>
+          <string>Receiver_exec</string>
         </value>
       </value>
     </execParameter>
   </implementation>
 
-  <implementation xmi:id="Hello_ReceiverComponentImplementation">
-    <name>Hello_ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Receiver_ExecArtifact" />
-    <artifact xmi:idref="Hello_Receiver_SvntArtifact" />
-  </implementation>
-
-
-  <implementation xmi:id="Hello_ReceiverConnectorComponentImplementation">
-    <name>Hello_ReceiverConnectorComponentImplementation</name>
+  <implementation xmi:id="Hello_ConnectorComponentImplementation">
+    <name>Hello_ConnectorComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Hello_ReceiverConnector_ExecArtifact" />
-    <artifact xmi:idref="Hello_ReceiverConnector_SvntArtifact" />
-  </implementation>
-
-  <implementation xmi:id="Hello_SenderHomeImplementation">
-    <name>Hello_SenderHomeImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Sender_ExecArtifact" />
-    <artifact xmi:idref="Hello_Sender_SvntArtifact" />
+    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
+    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
+      <name>component factory</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_SenderHome_Impl</string>
+          <string>create_Hello_Hello_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -152,7 +82,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_SenderHome_Servant</string>
+          <string>create_Hello_Hello_Connector_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -163,7 +93,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_Sender_svnt</string>
+          <string>Hello_Connector_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -174,27 +104,25 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_Sender_exec</string>
+          <string>Hello_Connector_exec</string>
         </value>
       </value>
     </execParameter>
   </implementation>
-
-
-  <implementation xmi:id="Hello_SenderConnectorHomeImplementation">
-    <name>Hello_SenderConnectorHomeImplementation</name>
+  <implementation xmi:id="SenderComponentImplementation">
+    <name>SenderComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Hello_SenderConnector_ExecArtifact" />
-    <artifact xmi:idref="Hello_SenderConnector_SvntArtifact" />
+    <artifact xmi:idref="Sender_ExecArtifact" />
+    <artifact xmi:idref="Sender_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
+      <name>component factory</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_SenderConnectorHome_Impl</string>
+          <string>create_Hello_Sender_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -205,7 +133,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_SenderConnectorHome_Servant</string>
+          <string>create_Hello_Sender_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -216,7 +144,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_SenderConnector_svnt</string>
+          <string>Sender_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -227,273 +155,62 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_SenderConnector_exec</string>
+          <string>Sender_exec</string>
         </value>
       </value>
     </execParameter>
   </implementation>
-
-  <implementation xmi:id="Hello_SenderComponentImplementation">
-    <name>Hello_SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Sender_ExecArtifact" />
-    <artifact xmi:idref="Hello_Sender_SvntArtifact" />
-  </implementation>
-
-
-  <implementation xmi:id="Hello_SenderConnectorComponentImplementation">
-    <name>Hello_SenderConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_SenderConnector_ExecArtifact" />
-    <artifact xmi:idref="Hello_SenderConnector_SvntArtifact" />
-  </implementation>
-
-  <instance xmi:id="Hello_ReceiverHomeInstance">
-    <name>Hello_ReceiverHome</name>
+  <instance xmi:id="ReceiverComponentInstance">
+    <name>ReceiverComponent</name>
     <node>ReceiverNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Hello_ReceiverHomeImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverHome.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverHome</string>
-        </value>
-      </value>
-    </configProperty>
+    <implementation xmi:idref="ReceiverComponentImplementation" />
   </instance>
-
-
-  <instance xmi:id="Hello_ReceiverConnectorHomeInstance">
-    <name>Hello_ReceiverConnectorHome</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverConnectorHomeImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorHome.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_ReceiverComponentInstance">
-    <name>Hello_ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstance">
-    <name>Hello_ReceiverConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnector.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnector</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Hello_SenderHomeInstance">
-    <name>Hello_SenderHome</name>
+  <instance xmi:id="Hello_ConnectorComponentInstance">
+    <name>Hello_ConnectorComponent</name>
     <node>SenderNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Hello_SenderHomeImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderHome.ior</string>
-        </value>
-      </value>
-    </configProperty>
+    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
+      <name>topic_name</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>SenderHome</string>
+          <string>Hello</string>
         </value>
       </value>
     </configProperty>
   </instance>
-
-
-  <instance xmi:id="Hello_SenderConnectorHomeInstance">
-    <name>Hello_SenderConnectorHome</name>
-    <node>SenderNode</node>
+  <instance xmi:id="Hello_ConnectorComponentInstance2">
+    <name>Hello_ConnectorComponent2</name>
+    <node>ReceiverNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Hello_SenderConnectorHomeImplementation" />
+    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <name>topic_name</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>SenderConnectorHome.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorHome</string>
+          <string>Hello</string>
         </value>
       </value>
     </configProperty>
   </instance>
-
-  <instance xmi:id="Hello_SenderComponentInstance">
-    <name>Hello_SenderComponent</name>
+  <instance xmi:id="SenderComponentInstance">
+    <name>SenderComponent</name>
     <node>SenderNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Hello_SenderComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_SenderHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello, World</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>log_time</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
+    <implementation xmi:idref="SenderComponentImplementation" />
     <configProperty>
-      <name>iterations</name>
+      <name>rate</name>
       <value>
         <type>
           <kind>tk_long</kind>
@@ -503,275 +220,121 @@
         </value>
       </value>
     </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-<!--
-  <instance xmi:id="Hello_SenderComponentInstance">
-    <name>Hello_SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="Hello_SenderComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_SenderHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
--->
-  <instance xmi:id="Hello_SenderConnectorComponentInstance">
-    <name>Hello_SenderConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_SenderConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_SenderConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnector.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnector</string>
-        </value>
-      </value>
-    </configProperty>
   </instance>
 
   <connection>
-    <name>string_writer_connection</name>
+    <name>info_write_data</name>
     <internalEndpoint>
-      <portName>push_data_data</portName>
+      <portName>info_write_data</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstance" />
+      <instance xmi:idref="SenderComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>sender_data</portName>
+      <portName>info_in_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
+      <instance xmi:idref="Hello_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
-
   <connection>
-    <name>dds_data_writer_connection</name>
+    <name>_listenercontrol</name>
     <internalEndpoint>
-      <portName>push_data_dds_entity</portName>
+      <portName>info_out_control</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstance" />
+      <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>sender_dds_entity</portName>
+      <portName>info_out_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
+      <instance xmi:idref="Hello_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
-
-  <connection>
-    <name>ccm_dds_string_reader</name>
-    <internalEndpoint>
-      <portName>read_message_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>receiver_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>ccm_dds_listenercontrol</name>
-    <internalEndpoint>
-      <portName>read_message_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>receiver_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
   <connection>
-    <name>ccm_dds_string_rawlistner</name>
+    <name>_portstatuslistener</name>
     <internalEndpoint>
-      <portName>read_message_listener</portName>
+      <portName>info_out_status</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
+      <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>receiver_listener</portName>
+      <portName>info_out_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
+      <instance xmi:idref="Hello_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
-
   <connection>
-    <name>dds_datareader</name>
+    <name>_rawlistner</name>
     <internalEndpoint>
-      <portName>read_message_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>receiver_dds_entity</portName>
+      <portName>info_out_listener</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
+      <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>ccm_dds_portstatuslistener</name>
     <internalEndpoint>
-      <portName>read_message_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>receiver_status</portName>
+      <portName>info_out_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
+      <instance xmi:idref="Hello_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
 
-  <!-- Artifacts declarations -->
-  <artifact xmi:id="Hello_Receiver_ExecArtifact">
-    <name>Hello_Receiver_exec</name>
+  <artifact xmi:id="Sender_ExecArtifact">
+    <name>Sender_exec</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Receiver_exec</location>
+    <location>Sender_exec</location>
   </artifact>
-  <artifact xmi:id="Hello_Receiver_SvntArtifact">
-    <name>Hello_Receiver_svnt</name>
+  <artifact xmi:id="Sender_SvntArtifact">
+    <name>Sender_svnt</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Receiver_svnt</location>
+    <location>Sender_svnt</location>
   </artifact>
-
-  <artifact xmi:id="Hello_Sender_ExecArtifact">
-    <name>Hello_Sender_exec</name>
+  <artifact xmi:id="Sender_StubArtifact">
+    <name>Sender_stub</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Sender_exec</location>
+    <location>Sender_stub</location>
   </artifact>
-  <artifact xmi:id="Hello_Sender_SvntArtifact">
-    <name>Hello_Sender_svnt</name>
+  <artifact xmi:id="Hello_Connector_ExecArtifact">
+    <name>Hello_Connector_exec</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Sender_svnt</location>
+    <location>DDS_Hello_Connector_exec</location>
   </artifact>
-
-  <artifact xmi:id="Hello_ReceiverConnector_ExecArtifact">
-    <name>Hello_ReceiverConnector_exec</name>
+  <artifact xmi:id="Hello_Connector_SvntArtifact">
+    <name>Hello_Connector_svnt</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Receiver_Connector_exec</location>
+    <location>DDS_Hello_Connector_svnt</location>
   </artifact>
-  <artifact xmi:id="Hello_ReceiverConnector_SvntArtifact">
-    <name>Hello_ReceiverConnector_svnt</name>
+  <artifact xmi:id="Hello_Connector_StubArtifact">
+    <name>Hello_Connector_stub</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Receiver_Connector_svnt</location>
+    <location>DDS_Hello_Connector_stub</location>
   </artifact>
-
-  <artifact xmi:id="Hello_SenderConnector_ExecArtifact">
-    <name>Hello_SenderConnector_exec</name>
+  <artifact xmi:id="Receiver_ExecArtifact">
+    <name>Receiver_exec</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Sender_Connector_exec</location>
+    <location>Receiver_exec</location>
   </artifact>
-  <artifact xmi:id="Hello_SenderConnector_SvntArtifact">
-    <name>Hello_SenderConnector_svnt</name>
+  <artifact xmi:id="Receiver_SvntArtifact">
+    <name>Receiver_svnt</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Sender_Connector_svnt</location>
+    <location>Receiver_svnt</location>
+  </artifact>
+  <artifact xmi:id="Receiver_StubArtifact">
+    <name>Receiver_stub</name>
+    <source/>
+    <node/>
+    <location>Receiver_stub</location>
   </artifact>
-
 </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
index 4d78e56e30a..f6c03d09085 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
@@ -18,7 +18,7 @@ $ns_running = 0;
 
 $daemons = 2;
 @ports = ( 60001, 60002 );
-@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
+@iorfiles = ( "Sender.ior", "Receiver.ior" );
 @nodenames = ( "SenderNode", "ReceiverNode" );
 
 $status = 0;
author	msmit <msmit@remedy.nl>	2009-11-09 18:49:02 +0000
committer	msmit <msmit@remedy.nl>	2009-11-09 18:49:02 +0000
commit	7ad818b9e4e878035ba44e841b2a28e85396aa13 (patch)
tree	53965fd5a0a45e995e434f9194071ad8513cc74d
parent	3e67053b284c0eb6f6accf600872f63024713489 (diff)
download	ATCD-7ad818b9e4e878035ba44e841b2a28e85396aa13.tar.gz