*** empty log message ***

4 files changed, 32 insertions, 216 deletions

diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
index db7d3a346b9..c2d394cfede 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
@@ -7,112 +7,6 @@ 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 ()
 {
 }
@@ -183,7 +77,7 @@ Sender_Impl::SenderSwap_exec_i::incarnate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 Sender_Impl::SenderSwap_exec_i::etherealize (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return new Sender_Impl::Sender_exec_i;
+  // return new Sender_Impl::Sender_exec_i;
 }
 
 ::Components::EnterpriseComponent_ptr
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h
index 5e53c8ba334..487b0532e3a 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h
@@ -48,115 +48,6 @@ namespace Sender_Impl
     int count_;
   };
 
-  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")),
-          count_ (0)
-    {
-    }
-
-    /// Secondary construction.
-    Sender_exec_i (const char* local_message)
-      : message_ (CORBA::string_dup (local_message)),
-        count_ (0)
-    {
-    }
-
-    /// 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;
-    int count_;
-  };
-
-
-  //
-  //
-  //
-  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 SenderHome_exec_i
-   *
-   * Sender home executor implementation class.
-   */
   class SENDER_EXEC_Export SenderHome_exec_i :
     public virtual SenderHome_Exec,
     public virtual TAO_Local_RefCounted_Object
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
index c8ac4053263..9342f4a0c73 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
@@ -98,6 +98,36 @@ Sender_Impl::Sender_exec_1_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                    Components::CCMException))
 {
   ACE_DEBUG ((LM_DEBUG, "Sender_Impl::Sender_exec_1_i::ccm_passivate\n"));
+  ACE_DEBUG ((LM_DEBUG, "1 being removed\n"));
+  CORBA::Object_var comp_object =
+    this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  Hello::Sender_var sender = Hello::Sender::_narrow (comp_object.in ()
+                                                    ACE_ENV_ARG_PARAMETER);
+
+  ::Components::ConsumerDescriptions_var cons_desc =
+    sender->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+  ::Components::FacetDescriptions_var facet_desc =
+    sender->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+  ACE_DEBUG ((LM_DEBUG, "i am here\n"));
+
+  CORBA::ULong cons_len = cons_desc->length ();
+  CORBA::ULong facet_len = facet_desc->length ();
+  ACE_DEBUG ((LM_DEBUG, "cons length is %d\n", cons_len));
+  ACE_DEBUG ((LM_DEBUG, "facet length is %d\n", facet_len));
+  for (CORBA::ULong i = 0; i < cons_len; ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "consumer name is %s\n", cons_desc[i]->name ()));
+    }
+  for (CORBA::ULong i = 0; i < facet_len; ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "facet name is %s\n", facet_desc[i]->name ()));
+    }
 }
 
 void
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp
index cbbb9ab0b5c..aaef4026d68 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp
@@ -98,6 +98,7 @@ Sender_Impl::Sender_exec_2_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                    Components::CCMException))
 {
   ACE_DEBUG ((LM_DEBUG, "Sender_Impl::Sender_exec_2_i::ccm_passivate\n"));
+  ACE_DEBUG ((LM_DEBUG, "2 being removed\n"));
 }
 
 void