4 files changed, 28 insertions, 34 deletions

diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc
index 0f26536a785..85f9fd94d1f 100644
--- a/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/CIAO/examples/Hello/Sender/Sender.mpc
@@ -32,7 +32,7 @@ project(Hello_Sender_cidl_gen) : ciaocidldefaults, taoidldefaults {
   }
 }
 
-project(Hello_Sender_stub) : ciao_client_dnc {
+project(Hello_Sender_stub) : ccm_stub {
   avoids += ace_for_tao
   after += Hello_Sender_idl_gen Hello_Base_stub
   libs  += Hello_Base_stub
@@ -57,7 +57,7 @@ project(Hello_Sender_stub) : ciao_client_dnc {
   }
 }
 
-project(Hello_Sender_exec) : ciao_component_dnc {
+project(Hello_Sender_exec) : ciao_executor {
   avoids += ace_for_tao
   after   += Hello_Sender_cidl_gen Hello_Sender_stub
   sharedname = Hello_Sender_exec
@@ -85,7 +85,7 @@ project(Hello_Sender_exec) : ciao_component_dnc {
 }
 
 
-project(Hello_Sender_svnt) : ciao_servant_dnc {
+project(Hello_Sender_svnt) : ciao_servant {
   avoids += ace_for_tao
   after      += Hello_Base_skel Hello_Sender_exec
   sharedname  = Hello_Sender_svnt
@@ -118,7 +118,7 @@ project(Hello_Sender_svnt) : ciao_servant_dnc {
   }
 }
 
-project (Hello_starter) : ciao_client_dnc, valuetype {
+project (Hello_starter) : ccm_stub, valuetype {
   avoids += ace_for_tao
   exename = starter
   after += Hello_Sender_stub
diff --git a/CIAO/examples/Hello/Sender/Sender_exec.cpp b/CIAO/examples/Hello/Sender/Sender_exec.cpp
index 05834007ace..e2c27d3e202 100644
--- a/CIAO/examples/Hello/Sender/Sender_exec.cpp
+++ b/CIAO/examples/Hello/Sender/Sender_exec.cpp
@@ -26,7 +26,7 @@ namespace CIDL_Sender_Impl
   char*
   Message_Impl::get_message ()
   {
-    ACE_DEBUG ((LM_DEBUG, "Sender sending out message: [%s]\n", component_.message_.in ()));
+    ACE_DEBUG ((LM_EMERGENCY, "Sender sending out message: [%C]\n", component_.message_.in ()));
     return CORBA::string_dup (component_.message_.in ());
   }
 
@@ -50,7 +50,7 @@ namespace CIDL_Sender_Impl
   Sender_exec_i::hertz (CORBA::Long hertz)
   {
     this->hertz_ = hertz;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::Hertz:%d\n", this->hertz_));
+    ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::Hertz:%d\n", this->hertz_));
   }
 
   CORBA::Long
@@ -75,7 +75,7 @@ namespace CIDL_Sender_Impl
   Hello::CCM_ReadMessage_ptr
   Sender_exec_i::get_push_message ()
   {
-    ACE_DEBUG ((LM_DEBUG,
+    ACE_DEBUG ((LM_EMERGENCY,
                 "Sender_exec.i::get_push_message called\n "));
     return ( new Message_Impl (*this) );
   }
@@ -85,31 +85,31 @@ namespace CIDL_Sender_Impl
   {
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     event->data ("ACE/TAO/CIAO");
-    ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n"));
+    ACE_DEBUG ((LM_EMERGENCY, "Sender initiates the process.\n"));
     this->context_->push_click_out (event.in ());
 
-    ACE_DEBUG ((LM_DEBUG, "My current color is:"));
+    ACE_DEBUG ((LM_EMERGENCY, "My current color is:"));
 
     switch (this->color_)
       {
       case ::Hello::empty:
-        ACE_DEBUG ((LM_DEBUG, "ERROR: Enum attribute initialization failed.\n"));
+        ACE_DEBUG ((LM_EMERGENCY, "ERROR: Enum attribute initialization failed.\n"));
         break;
 
       case ::Hello::white:
-        ACE_DEBUG ((LM_DEBUG, "white\n"));
+        ACE_DEBUG ((LM_EMERGENCY, "white\n"));
         break;
 
       case ::Hello::red:
-        ACE_DEBUG ((LM_DEBUG, "red\n"));
+        ACE_DEBUG ((LM_EMERGENCY, "red\n"));
         break;
 
       case ::Hello::yellow:
-        ACE_DEBUG ((LM_DEBUG, "yellow\n"));
+        ACE_DEBUG ((LM_EMERGENCY, "yellow\n"));
         break;
 
       default:
-        ACE_DEBUG ((LM_DEBUG, "Unknown color!\n"));
+        ACE_DEBUG ((LM_EMERGENCY, "Unknown color!\n"));
 
       }
   }
@@ -117,7 +117,7 @@ namespace CIDL_Sender_Impl
   void
   Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
   {
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_session_context\n"));
+    ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::set_session_context\n"));
 
     this->context_ =
       ::Hello::CCM_Sender_Context::_narrow (ctx);
@@ -129,36 +129,29 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ciao_preactivate ()
+  Sender_exec_i::configuration_complete ()
   {
-    ACE_DEBUG ((LM_DEBUG,
-                "Sender_exec_i::ciao_preactivate\n"));
+    ACE_DEBUG ((LM_EMERGENCY,
+                "Sender_exec_i::configuration_complete\n"));
   }
 
   void
   Sender_exec_i::ccm_activate ()
   {
-    ACE_DEBUG ((LM_DEBUG,
+    ACE_DEBUG ((LM_EMERGENCY,
                 "Sender_exec_i::ccm_activate\n"));
   }
 
   void
-  Sender_exec_i::ciao_postactivate ()
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Sender_exec_i::ciao_postactivate\n"));
-  }
-
-  void
   Sender_exec_i::ccm_passivate ()
   {
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_passivate\n"));
+    ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::ccm_passivate\n"));
   }
 
   void
   Sender_exec_i::ccm_remove ()
   {
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_remove\n"));
+    ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::ccm_remove\n"));
   }
 
   SenderHome_exec_i::SenderHome_exec_i ()
@@ -172,7 +165,7 @@ namespace CIDL_Sender_Impl
   ::Components::EnterpriseComponent_ptr
   SenderHome_exec_i::create ()
   {
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating SenderHome \n"));
+    ACE_DEBUG ((LM_EMERGENCY, "(%P|%t) creating SenderHome \n"));
 
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/examples/Hello/Sender/Sender_exec.h b/CIAO/examples/Hello/Sender/Sender_exec.h
index 1a3d186dfc5..cf68e2b689f 100644
--- a/CIAO/examples/Hello/Sender/Sender_exec.h
+++ b/CIAO/examples/Hello/Sender/Sender_exec.h
@@ -95,12 +95,10 @@ namespace CIDL_Sender_Impl
     // Operations from Components::SessionComponent
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
 
-    virtual void ciao_preactivate ();
+    virtual void configuration_complete ();
 
     virtual void ccm_activate ();
 
-    virtual void ciao_postactivate ();
-
     virtual void ccm_passivate ();
 
     virtual void ccm_remove ();
@@ -166,6 +164,9 @@ namespace CIDL_Sender_Impl
     create ();
   };
 
+  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
+    create_Hello_Sender_Impl (void);
+
   extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
   create_Hello_SenderHome_Impl (void);
 }
diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp
index 1ce3ceced18..3900c541fc1 100644
--- a/CIAO/examples/Hello/Sender/starter.cpp
+++ b/CIAO/examples/Hello/Sender/starter.cpp
@@ -4,7 +4,7 @@
 #include "ace/Get_Opt.h"
 
 // IOR file of the Sender
-const char * ior = 0;
+const ACE_TCHAR * ior = 0;
 const char * message = 0;
 
 int
@@ -39,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
   if (ior  == 0)
     {
-      ior = "file://Sender.ior";
+      ior = ACE_TEXT("file://Sender.ior");
     }
 
   return 0;