*** empty log message ***

2 files changed, 69 insertions, 65 deletions

diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/SenderE.idl.new_impl b/TAO/CIAO/DAnCE/examples/Hello/Sender/SenderE.idl.new_impl
new file mode 100644
index 00000000000..7237ecb64fd
--- /dev/null
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/SenderE.idl.new_impl
@@ -0,0 +1,69 @@
+// $Id$
+//
+// ****              Code generated by the                 ****
+// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
+// CIAO has been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// CIDL Compiler has been developed by:
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about CIAO is available at:
+//    http://www.dre.vanderbilt.edu/CIAO
+
+#include "Sender.idl"
+module Hello
+{
+  local interface CCM_ReadMessage : ReadMessage
+  {
+  };
+};
+
+module Hello
+{
+  local interface CCM_Sender : ::Components::EnterpriseComponent, ::Hello::trigger
+  {
+    ::Hello::CCM_ReadMessage get_push_message ();
+    attribute string local_message;
+  };
+
+  local interface CCM_Sender_Context : ::Components::SessionContext
+  {
+    void push_click_out (in ::Hello::TimeOut e);
+    ::Components::ConsumerDescriptions get_registered_consumer
+      (in ::Components::FeatureName publisher_name);
+  };
+
+  local interface CCM_SenderHomeImplicit
+  {
+    ::Components::EnterpriseComponent create () raises (::Components::CCMException);
+  };
+
+  local interface CCM_SenderHomeExplicit : ::Components::HomeExecutorBase
+  {
+  };
+
+  local interface CCM_SenderHome : CCM_SenderHomeExplicit, CCM_SenderHomeImplicit
+  {
+  };
+};
+
+module Sender_Impl
+{
+  typedef ::Hello::CCM_Sender_Context Sender_Exec_Context;
+  local interface Sender_Exec : ::Hello::CCM_Sender, ::Components::SessionComponent
+  {
+  };
+
+  local interface SenderHome_Exec : ::Hello::CCM_SenderHome
+  {
+  };
+};
+
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections
index 01be09245db..9d096ae8202 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections
@@ -186,59 +186,6 @@ namespace Sender_Impl
       }
     }
 
-    /*
-    ::Components::ConsumerDescriptions *
-    Sender_Context::get_all_consumers (
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException))
-    {
-      ::Components::ConsumerDescriptions *tmp = 0;
-      ACE_NEW_THROW_EX (tmp,
-                        ::Components::ConsumerDescriptions
-                        (this->ciao_publishes_click_out_map_.current_size ()),
-                        CORBA::NO_MEMORY ());
-      ::Components::ConsumerDescriptions_var retval = tmp;
-
-      retval->length (this->ciao_publishes_click_out_map_.current_size ());
-      CORBA::ULong i = 0;
-
-      ACE_Active_Map_Manager< 
-      ::Hello::TimeOutConsumer_var>::iterator end =
-      this->ciao_publishes_click_out_map_.end ();
-
-      for (ACE_Active_Map_Manager< 
-      ::Hello::TimeOutConsumer_var>::iterator iter =
-      this->ciao_publishes_click_out_map_.begin ();
-      iter != end;
-      ++iter, ++i)
-      {
-        ACE_Active_Map_Manager< 
-        ::Hello::TimeOutConsumer_var>::ENTRY &entry = *iter;
-
-        ::Hello::TimeOutConsumer_var c =
-        ::Hello::TimeOutConsumer::_narrow (
-        entry.int_id_.in ()
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        ::Components::ConsumerDescription *cd = 0;
-        ACE_NEW_THROW_EX (cd,
-                          OBV_Components::ConsumerDescription (),
-                          CORBA::NO_MEMORY ());
-        ::Components::ConsumerDescription_var safe = cd;
-
-        safe->name ("");
-        safe->type_id ("");
-        safe->consumer (c);
-
-        retval[i] = safe;
-      }
-
-      return retval._retn ();
-    }
-    */
-
     ::Components::Cookie *
     Sender_Context::subscribe_click_out (
     ::Hello::TimeOutConsumer_ptr c
@@ -811,18 +758,6 @@ namespace Sender_Impl
       ACE_ENV_SINGLE_ARG_PARAMETER);
     }
 
-    /*
-    ::Components::ConsumerDescriptions *
-    Sender_Servant::get_all_consumers (
-        ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return this->context_->get_all_consumers (
-         ACE_ENV_ARG_PARAMETER);
-    }
-    */
-
     void
     Sender_Servant::local_message (
     const char * local_message