ChangeLogTag: Fri Jun 24 14:21:31 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 367 insertions, 356 deletions

diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp
index 173ff2ef6d7..1d0b3979306 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp
@@ -2,109 +2,113 @@
 
 #include "Receiver_exec.h"
 
-void
-ReceiverImpl::test_i::method (void)
-  throw (CORBA::SystemException)
+namespace CIDL_ReceiverImpl
 {
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::test_i::method\n"));
+  void
+  test_i::method (void)
+    throw (CORBA::SystemException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "test_i::method\n"));
+  }
+
+  ReceiverExec_i::ReceiverExec_i (void)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ReceiverExec_i\n"));
+
+    int argc = 0;
+    char **argv = 0;
+
+    this->orb_ =
+      CORBA::ORB_init (argc,
+                      argv,
+                      "");
+
+  }
+
+  ::DiffServ::CCM_test_ptr
+  ReceiverExec_i::get_writer (void)
+    throw (CORBA::SystemException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::get_writer\n"));
+    return new test_i;
+  }
+
+  void
+  ReceiverExec_i::shutdown (void)
+    throw (CORBA::SystemException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::shutdown\n"));
+    this->orb_->shutdown ();
+  }
+
+  void
+  ReceiverExec_i::set_session_context (Components::SessionContext_ptr ctx)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::set_session_context\n"));
+
+    this->context_ =
+      ReceiverExec_Context::_narrow (ctx);
+
+    if (CORBA::is_nil (this->context_.in ()))
+      throw CORBA::INTERNAL ();
+  }
+
+  void
+  ReceiverExec_i::ccm_activate (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_activate\n"));
+  }
+
+  void
+  ReceiverExec_i::ccm_passivate (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_passivate\n"));
+  }
+
+  void
+  ReceiverExec_i::ccm_remove (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_remove\n"));
+  }
+
+  void
+  ReceiverExec_i::ciao_preactivate (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_preactivate\n"));
+  }
+
+  void
+  ReceiverExec_i::ciao_postactivate (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::ccm_postactivate\n"));
+  }
+
+  ::Components::EnterpriseComponent_ptr
+  ReceiverHomeExec_i::create (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "ReceiverHome_exec::create\n"));
+    return new ReceiverExec_i;
+  }
+
+  extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
+  createReceiverHome_Impl (void)
+  {
+    ACE_DEBUG ((LM_DEBUG, "createReceiverHome_Impl\n"));
+    return new ReceiverHomeExec_i;
+  }
 }
 
-ReceiverImpl::ReceiverExec_i::ReceiverExec_i (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverExec_i::ReceiverExec_i\n"));
-
-  int argc = 0;
-  char **argv = 0;
-
-  this->orb_ =
-    CORBA::ORB_init (argc,
-                     argv,
-                     "");
-
-}
-
-::DiffServ::CCM_test_ptr
-ReceiverImpl::ReceiverExec_i::get_writer (void)
-  throw (CORBA::SystemException)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverExec_i::get_writer\n"));
-  return new test_i;
-}
-
-void
-ReceiverImpl::ReceiverExec_i::shutdown (void)
-  throw (CORBA::SystemException)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverExec_i::shutdown\n"));
-  this->orb_->shutdown ();
-}
-
-void
-ReceiverImpl::ReceiverExec_i::set_session_context (Components::SessionContext_ptr ctx)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverExec_i::set_session_context\n"));
-
-  this->context_ =
-    ReceiverImpl::ReceiverExec_Context::_narrow (ctx);
-
-  if (CORBA::is_nil (this->context_.in ()))
-    throw CORBA::INTERNAL ();
-}
-
-void
-ReceiverImpl::ReceiverExec_i::ccm_activate (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverExec_i::ccm_activate\n"));
-}
-
-void
-ReceiverImpl::ReceiverExec_i::ccm_passivate (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverExec_i::ccm_passivate\n"));
-}
-
-void
-ReceiverImpl::ReceiverExec_i::ccm_remove (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverExec_i::ccm_remove\n"));
-}
-
-void
-ReceiverImpl::ReceiverExec_i::ciao_preactivate (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverExec_i::ccm_preactivate\n"));
-}
-
-void
-ReceiverImpl::ReceiverExec_i::ciao_postactivate (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverExec_i::ccm_postactivate\n"));
-}
-
-::Components::EnterpriseComponent_ptr
-ReceiverImpl::ReceiverHomeExec_i::create (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "ReceiverImpl::ReceiverHome_exec::create\n"));
-  return new ReceiverImpl::ReceiverExec_i;
-}
-
-extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createReceiverHome_Impl (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "createReceiverHome_Impl\n"));
-  return new ReceiverImpl::ReceiverHomeExec_i;
-}
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.h b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.h
index 755322b2c93..fedbdf34e50 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.h
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver_exec.h
@@ -4,7 +4,7 @@
 #include "Receiver_exec_export.h"
 #include "tao/LocalObject.h"
 
-namespace ReceiverImpl
+namespace CIDL_ReceiverImpl
 {
   class RECEIVER_EXEC_Export ReceiverExec_i :
     public virtual ReceiverExec,
@@ -74,7 +74,8 @@ namespace ReceiverImpl
              Components::CCMException);
   };
 
+  extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
+  createReceiverHome_Impl (void);
 }
 
-extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createReceiverHome_Impl (void);
+
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
index 902adc3a04d..c5a7004456d 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
@@ -8,276 +8,281 @@
 #include "Sender_exec.h"
 #include "ace/OS_NS_unistd.h"
 
-SenderImpl::SenderExec_i::SenderExec_i (void)
+namespace CIDL_SenderImpl
 {
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderExec_i::SenderExec_i\n"));
-
-  int argc = 0;
-  char **argv = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      this->orb_ =
-        CORBA::ORB_init (argc,
-                         argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-
-      ACE_TRY_CHECK;
-
-      RTCORBA::TCPProtocolProperties_var normal_tcp_protocol_properties =
-        rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                1,
-                                                0,
-                                                1,
-                                                0);
-
-      RTCORBA::TCPProtocolProperties_var diffserv_tcp_protocol_properties =
-        rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                1,
-                                                0,
-                                                1,
-                                                1);
-
-      RTCORBA::ProtocolList protocols;
-      protocols.length (1);
-      protocols[0].protocol_type = 0;
-      protocols[0].transport_protocol_properties =
-        RTCORBA::ProtocolProperties::_duplicate (normal_tcp_protocol_properties.in ());
-      protocols[0].orb_protocol_properties =
-        RTCORBA::ProtocolProperties::_nil ();
-
-      this->normal_policy_list_.length (1);
-      this->normal_policy_list_[0] =
-        rt_orb->create_client_protocol_policy (protocols);
-
-      protocols[0].transport_protocol_properties =
-        RTCORBA::ProtocolProperties::_duplicate (diffserv_tcp_protocol_properties.in ());
-
-      this->diffserv_policy_list_.length (1);
-      this->diffserv_policy_list_[0] =
-        rt_orb->create_client_protocol_policy (protocols);
-
-      object =
-        this->orb_->resolve_initial_references ("ORBPolicyManager"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->policy_manager_ =
-        CORBA::PolicyManager::_narrow (object.in ());
-
-      object =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (object.in ());
-
-      object =
-        this->orb_->resolve_initial_references ("NetworkPriorityMappingManager"
-                                                ACE_ENV_ARG_PARAMETER);
-
-      ACE_TRY_CHECK;
-
-      RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
-        RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ());
-
-      this->custom_network_priority_mapping_ =
-        new Custom_Network_Priority_Mapping;
-
-      mapping_manager->mapping (this->custom_network_priority_mapping_);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Caught exception in SenderExec_i \n");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
+  SenderExec_i::SenderExec_i (void)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::SenderExec_i\n"));
 
-void
-SenderImpl::SenderExec_i::change_network_priority (int enable_network_priority,
-                                                   Priority_Level level,
-                                                   DiffServ::test_var &test)
-{
-  CORBA::PolicyList *policy_list = 0;
+    int argc = 0;
+    char **argv = 0;
 
-  if (enable_network_priority)
-    policy_list = &this->diffserv_policy_list_;
-  else
-    policy_list = &this->normal_policy_list_;
+    ACE_DECLARE_NEW_CORBA_ENV;
 
-  switch (level)
-    {
-      // Change policy at ORB level
-    case ORB:
+    ACE_TRY
       {
-        this->policy_manager_->set_policy_overrides (*policy_list,
-                                                     CORBA::SET_OVERRIDE);
+        this->orb_ =
+          CORBA::ORB_init (argc,
+                          argv,
+                          ""
+                          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-        break;
+        CORBA::Object_var object =
+          this->orb_->resolve_initial_references ("RTORB"
+                                                  ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        RTCORBA::RTORB_var rt_orb =
+          RTCORBA::RTORB::_narrow (object.in ()
+                                  ACE_ENV_ARG_PARAMETER);
+
+        ACE_TRY_CHECK;
+
+        RTCORBA::TCPProtocolProperties_var normal_tcp_protocol_properties =
+          rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
+                                                  ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
+                                                  1,
+                                                  0,
+                                                  1,
+                                                  0);
+
+        RTCORBA::TCPProtocolProperties_var diffserv_tcp_protocol_properties =
+          rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
+                                                  ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
+                                                  1,
+                                                  0,
+                                                  1,
+                                                  1);
+
+        RTCORBA::ProtocolList protocols;
+        protocols.length (1);
+        protocols[0].protocol_type = 0;
+        protocols[0].transport_protocol_properties =
+          RTCORBA::ProtocolProperties::_duplicate (normal_tcp_protocol_properties.in ());
+        protocols[0].orb_protocol_properties =
+          RTCORBA::ProtocolProperties::_nil ();
+
+        this->normal_policy_list_.length (1);
+        this->normal_policy_list_[0] =
+          rt_orb->create_client_protocol_policy (protocols);
+
+        protocols[0].transport_protocol_properties =
+          RTCORBA::ProtocolProperties::_duplicate (diffserv_tcp_protocol_properties.in ());
+
+        this->diffserv_policy_list_.length (1);
+        this->diffserv_policy_list_[0] =
+          rt_orb->create_client_protocol_policy (protocols);
+
+        object =
+          this->orb_->resolve_initial_references ("ORBPolicyManager"
+                                                  ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        this->policy_manager_ =
+          CORBA::PolicyManager::_narrow (object.in ());
+
+        object =
+          this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                  ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        this->policy_current_ =
+          CORBA::PolicyCurrent::_narrow (object.in ());
+
+        object =
+          this->orb_->resolve_initial_references ("NetworkPriorityMappingManager"
+                                                  ACE_ENV_ARG_PARAMETER);
+
+        ACE_TRY_CHECK;
+
+        RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
+          RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ());
+
+        this->custom_network_priority_mapping_ =
+          new Custom_Network_Priority_Mapping;
+
+        mapping_manager->mapping (this->custom_network_priority_mapping_);
       }
-
-      // Change policy at THREAD level
-    case THREAD:
+    ACE_CATCHANY
       {
-        this->policy_current_->set_policy_overrides (*policy_list,
-                                                     CORBA::SET_OVERRIDE);
-
-        break;
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                            "(%P|%t) Caught exception in SenderExec_i \n");
       }
-
-      // Change policy at OBJECT level
-    case OBJECT:
+    ACE_ENDTRY;
+    ACE_CHECK;
+  }
+
+  void
+  SenderExec_i::change_network_priority (int enable_network_priority,
+                                         Priority_Level level,
+                                         DiffServ::test_var &test)
+  {
+    CORBA::PolicyList *policy_list = 0;
+
+    if (enable_network_priority)
+      policy_list = &this->diffserv_policy_list_;
+    else
+      policy_list = &this->normal_policy_list_;
+
+    switch (level)
       {
-        CORBA::Object_var object =
-          test->_set_policy_overrides (*policy_list,
-                                       CORBA::SET_OVERRIDE);
-
-        test = DiffServ::test::_narrow (object.in ());
-
-        break;
-      }
-    }
-}
-
-void
-SenderImpl::SenderExec_i::start (CORBA::ULong iterations,
-                                 CORBA::Short priority)
-  throw (CORBA::SystemException)
-{
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderExec_i::start\n"));
-
-  this->custom_network_priority_mapping_->corba_priority (priority);
-
-  DiffServ::test_var test =
-    this->context_->get_connection_reader ();
-
-  int enable_network_priority = 1;
-
-  for (CORBA::ULong i = 0; i < iterations; ++i)
-    {
-      this->toggle (enable_network_priority);
-
-      switch (i)
+        // Change policy at ORB level
+      case ORB:
         {
-        case 0:
-        case 1:
-          this->change_network_priority (enable_network_priority, ORB, test);
-          break;
-        case 2:
-        case 3:
-          this->change_network_priority (enable_network_priority, THREAD, test);
-          break;
-        default:
-          this->change_network_priority (enable_network_priority, OBJECT, test);
+          this->policy_manager_->set_policy_overrides (*policy_list,
+                                                      CORBA::SET_OVERRIDE);
+
           break;
         }
 
-      test->method ();
-      ACE_OS::sleep (1);
-    }
-}
-
-void
-SenderImpl::SenderExec_i::shutdown (void)
-  throw (CORBA::SystemException)
-{
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderExec_i::shutdown\n"));
-  this->orb_->shutdown ();
-}
-
-void
-SenderImpl::SenderExec_i::toggle (int &i)
-{
-  if (i == 0)
-    i = 1;
-  else i = 0;
-}
+        // Change policy at THREAD level
+      case THREAD:
+        {
+          this->policy_current_->set_policy_overrides (*policy_list,
+                                                      CORBA::SET_OVERRIDE);
 
-void
-SenderImpl::SenderExec_i::set_session_context (Components::SessionContext_ptr ctx)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderExec_i::set_session_context\n"));
+          break;
+        }
 
-  this->context_ =
-    SenderImpl::SenderExec_Context::_narrow (ctx);
+        // Change policy at OBJECT level
+      case OBJECT:
+        {
+          CORBA::Object_var object =
+            test->_set_policy_overrides (*policy_list,
+                                        CORBA::SET_OVERRIDE);
 
-  if (CORBA::is_nil (this->context_.in ()))
-    throw CORBA::INTERNAL ();
-}
+          test = DiffServ::test::_narrow (object.in ());
 
-void
-SenderImpl::SenderExec_i::ccm_activate (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderExec_i::ccm_activate\n"));
-}
+          break;
+        }
+      }
+  }
 
-void
-SenderImpl::SenderExec_i::ccm_passivate (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderExec_i::ccm_passivate\n"));
-}
+  void
+  SenderExec_i::start (CORBA::ULong iterations,
+                       CORBA::Short priority)
+    throw (CORBA::SystemException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::start\n"));
 
-void
-SenderImpl::SenderExec_i::ccm_remove (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderExec_i::ccm_remove\n"));
-}
+    this->custom_network_priority_mapping_->corba_priority (priority);
 
+    DiffServ::test_var test =
+      this->context_->get_connection_reader ();
 
-void
-SenderImpl::SenderExec_i::ciao_preactivate (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderExec_i::ccm_preactivate\n"));
-}
+    int enable_network_priority = 1;
 
-void
-SenderImpl::SenderExec_i::ciao_postactivate (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderExec_i::ccm_postactivate\n"));
+    for (CORBA::ULong i = 0; i < iterations; ++i)
+      {
+        this->toggle (enable_network_priority);
+
+        switch (i)
+          {
+          case 0:
+          case 1:
+            this->change_network_priority (enable_network_priority, ORB, test);
+            break;
+          case 2:
+          case 3:
+            this->change_network_priority (enable_network_priority, THREAD, test);
+            break;
+          default:
+            this->change_network_priority (enable_network_priority, OBJECT, test);
+            break;
+          }
+
+        test->method ();
+        ACE_OS::sleep (1);
+      }
+  }
+
+  void
+  SenderExec_i::shutdown (void)
+    throw (CORBA::SystemException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::shutdown\n"));
+    this->orb_->shutdown ();
+  }
+
+  void
+  SenderExec_i::toggle (int &i)
+  {
+    if (i == 0)
+      i = 1;
+    else i = 0;
+  }
+
+  void
+  SenderExec_i::set_session_context (Components::SessionContext_ptr ctx)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::set_session_context\n"));
+
+    this->context_ =
+      SenderExec_Context::_narrow (ctx);
+
+    if (CORBA::is_nil (this->context_.in ()))
+      throw CORBA::INTERNAL ();
+  }
+
+  void
+  SenderExec_i::ccm_activate (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_activate\n"));
+  }
+
+  void
+  SenderExec_i::ccm_passivate (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_passivate\n"));
+  }
+
+  void
+  SenderExec_i::ccm_remove (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_remove\n"));
+  }
+
+
+  void
+  SenderExec_i::ciao_preactivate (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_preactivate\n"));
+  }
+
+  void
+  SenderExec_i::ciao_postactivate (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderExec_i::ccm_postactivate\n"));
+  }
+
+  ::Components::EnterpriseComponent_ptr
+  SenderHomeExec_i::create (void)
+    throw (CORBA::SystemException,
+          Components::CCMException)
+  {
+    ACE_DEBUG ((LM_DEBUG, "SenderHome_exec::create\n"));
+    return new SenderExec_i;
+  }
+
+  extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
+  createSenderHome_Impl (void)
+  {
+    ACE_DEBUG ((LM_DEBUG, "createSenderHome_Impl\n"));
+    return new SenderHomeExec_i;
+  }
 }
 
-::Components::EnterpriseComponent_ptr
-SenderImpl::SenderHomeExec_i::create (void)
-  throw (CORBA::SystemException,
-         Components::CCMException)
-{
-  ACE_DEBUG ((LM_DEBUG, "SenderImpl::SenderHome_exec::create\n"));
-  return new SenderImpl::SenderExec_i;
-}
 
-extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createSenderHome_Impl (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "createSenderHome_Impl\n"));
-  return new SenderImpl::SenderHomeExec_i;
-}
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.h b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.h
index 47a6f52de51..295e1e761c6 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.h
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.h
@@ -6,7 +6,7 @@
 
 class Custom_Network_Priority_Mapping;
 
-namespace SenderImpl
+namespace CIDL_SenderImpl
 {
   class SENDER_EXEC_Export SenderExec_i :
     public virtual SenderExec,
@@ -89,7 +89,8 @@ namespace SenderImpl
              Components::CCMException);
   };
 
+  extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
+  createSenderHome_Impl (void);
 }
 
-extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-createSenderHome_Impl (void);
+