*** empty log message ***

7 files changed, 225 insertions, 7 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
index ac62554d19b..57aab75fad3 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
@@ -185,6 +185,7 @@ namespace CIAO
                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    ACE_DEBUG ((LM_DEBUG, "i am installing the home servant\n"));
     PortableServer::POA_ptr tmp = 0;
 
     if (t == Container::Component)
@@ -244,6 +245,7 @@ namespace CIAO
                      Deployment::InstallationFailure))
   {
 
+    ACE_DEBUG ((LM_DEBUG, "I am here to install the home\n"));
     HomeFactory hcreator = 0;
     ServantFactory screator = 0;
 
@@ -324,6 +326,8 @@ namespace CIAO
                                     ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
+    ACE_DEBUG ((LM_DEBUG, "returning the home reference back\n"));
+
     return homeref._retn ();
 
   }
diff --git a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
index d10336225bd..b490bac1217 100644
--- a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
@@ -163,6 +163,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
   {
+    ACE_DEBUG ((LM_DEBUG, "creating the component\n"));
     return this->create (ACE_ENV_SINGLE_ARG_PARAMETER);
   }
 
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index e93a3315c14..ae3ae6993af 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -391,7 +391,7 @@ CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (this->container_,
-                    CIAO::Swapping_Container (this->orb_.in ()),
+                    CIAO::Session_Container (this->orb_.in (), 0, 0),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp
index 562e27c59f7..3e9939a135d 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp
@@ -171,14 +171,16 @@ Receiver_Impl::ReceiverHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
                    Components::CCMException))
 {
   Components::EnterpriseComponent_ptr tmp;
+  /*
   ACE_NEW_THROW_EX (tmp,
                     Receiver_Impl::ReceiverSwap_exec_i,
                     CORBA::NO_MEMORY ());
-  /*
+  */
+  
   ACE_NEW_THROW_EX (tmp,
                     Receiver_Impl::Receiver_exec_i,
                     CORBA::NO_MEMORY ());
-  */
+  
   return tmp;
 }
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
index bfd3e8692a4..91d2e05fc86 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
@@ -7,6 +7,115 @@ const char* first_exe_entrypt = "createSenderExec_Impl";
 const char* second_exe_dll_name = "Sender_DnC_exec_2";
 const char* second_exe_entrypt = "createSenderExec_Impl";
 
+char*
+Sender_Impl::Message_Impl::get_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG, "Sender sending out message. \n"));
+  return CORBA::string_dup (component_.message_.in ());
+}
+
+Sender_Impl::Sender_exec_i::~Sender_exec_i ()
+{
+}
+
+void
+Sender_Impl::Sender_exec_i::local_message (const char * local_message
+                                           ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  message_ = CORBA::string_dup (local_message);
+}
+
+char *
+Sender_Impl::Sender_exec_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return CORBA::string_dup(message_);
+}
+
+Hello::CCM_ReadMessage_ptr
+Sender_Impl::Sender_exec_i::get_push_message
+(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "Sender_Impl::Sender_exec.i::get_push_message called\n "));
+  return ( new Message_Impl (*this) );
+}
+
+void
+Sender_Impl::Sender_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  Hello::TimeOut_var event = new OBV_Hello::TimeOut;
+  ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n"));
+  this->context_->push_click_out (event ACE_ENV_ARG_PARAMETER);
+}
+
+void
+Sender_Impl::Sender_exec_i::set_session_context
+   (Components::SessionContext_ptr ctx
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG, "Sender_Impl::Sender_exec_i::set_session_context\n"));
+
+  this->context_ =
+        Sender_Impl::Sender_Exec_Context::_narrow (ctx
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (CORBA::is_nil (this->context_.in ()))
+       ACE_THROW (CORBA::INTERNAL ());
+}
+
+void
+Sender_Impl::Sender_exec_i::ciao_preactivate
+(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "Sender_Impl::Sender_exec_i::ciao_preactivate\n"));
+}
+
+void
+Sender_Impl::Sender_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "Sender_Impl::Sender_exec_i::ccm_activate\n"));
+}
+
+void
+Sender_Impl::Sender_exec_i::ciao_postactivate
+(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "Sender_Impl::Sender_exec_i::ciao_postactivate\n"));
+}
+
+void
+Sender_Impl::Sender_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG, "Sender_Impl::Sender_exec_i::ccm_passivate\n"));
+}
+
+void
+Sender_Impl::Sender_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG, "Sender_Impl::Sender_exec_i::ccm_remove\n"));
+}
+
+
 Sender_Impl::SenderHome_exec_i::SenderHome_exec_i ()
 {
 }
@@ -87,8 +196,8 @@ Sender_Impl::SenderHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                    Components::CCMException))
 {
   ACE_DEBUG ((LM_DEBUG, "%P|%t) creating SenderHome \n"));
-  return new Sender_Impl::SenderSwap_exec_i;
-  // return new Sender_Impl::Sender_exec_i;
+  //return new Sender_Impl::SenderSwap_exec_i;
+   return new Sender_Impl::Sender_exec_i;
 }
 
 extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h
index 0b23ea5bac2..f095481ea86 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h
@@ -19,6 +19,108 @@
 
 namespace Sender_Impl
 {
+  class SENDER_EXEC_Export Sender_exec_i :
+      public virtual Sender_Exec,
+      public virtual TAO_Local_RefCounted_Object
+  {
+
+  public:
+    /// Default constructor.
+    Sender_exec_i ()
+        : message_(CORBA::string_dup ("Default Message"))
+    {
+    }
+
+    /// Secondary construction.
+    Sender_exec_i (const char* local_message)
+      : message_ (CORBA::string_dup (local_message))
+    {
+    }
+
+    /// Default destructor.
+    virtual ~Sender_exec_i ();
+
+    /// Operation to set the value of the attribute
+    virtual void local_message (const char * local_message
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    /// Operation to get the value of the attribute
+    virtual char * local_message (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    /* Operations for obtaining the interface reference. */
+    /* This method will be used in the assembly face so the
+     * ObjRef of this read_message facet will be sent to the
+     * client side(receptacle).
+     */
+    // Note: You can specify the return type as ::Hello::CCM_message *
+    virtual Hello::CCM_ReadMessage_ptr
+    get_push_message (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+
+    // Operation inside of the trigger interface.
+    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+    // Operations from Components::SessionComponent
+    virtual void set_session_context (Components::SessionContext_ptr ctx
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+
+    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+
+    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+
+    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+
+    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+
+    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+
+  protected:
+    /// Copmponent specific context
+    Sender_Exec_Context_var context_;
+
+  private:
+    CORBA::String_var message_;
+
+    friend class Message_Impl;
+  };
+
+
+  //
+  //
+  //
+  class Message_Impl : public virtual Hello::CCM_ReadMessage,
+                       public virtual TAO_Local_RefCounted_Object
+  {
+  public:
+    Message_Impl (Sender_exec_i& component)
+        : component_ (component)
+    {
+    }
+
+    virtual char *
+    get_message (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    Sender_exec_i& component_;
+  };
+
   class SenderSwap_exec_i;
 
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/descriptors/hello.dat b/TAO/CIAO/DAnCE/examples/Hello/descriptors/hello.dat
index c92723678c9..0402b2fd2e0 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/descriptors/hello.dat
+++ b/TAO/CIAO/DAnCE/examples/Hello/descriptors/hello.dat
@@ -1,3 +1,3 @@
-Sender      corbaloc:iiop:localhost:30000/NodeManager
-Receiver    corbaloc:iiop:localhost:40000/NodeManager
+Sender      corbaloc:iiop:localhost:10000/NodeManager
+Receiver    corbaloc:iiop:localhost:20000/NodeManager