*** empty log message ***

5 files changed, 8 insertions, 35 deletions

diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index d7ec74d3b02..af82e965d4e 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -865,8 +865,8 @@ handle_publisher_es_connection (
   if (add_connection)
     {
       ::Components::Cookie_var cookie =
-      comp->ciao_connect_es (connection.portName.in (),
-                             event_service);
+      comp->subscribe (connection.portName.in (),
+                       event_service);
 
       ACE_CString key = (*create_connection_key (connection));
       this->cookie_map_.rebind (key, cookie);
@@ -906,8 +906,8 @@ handle_publisher_es_connection (
           ACE_TRY_THROW (Deployment::InvalidConnection ());
         }
 
-      comp->ciao_disconnect_es (connection.portName.in (),
-                                cookie.in ());
+      comp->unsubscribe (connection.portName.in (),
+                         cookie.in ());
       this->cookie_map_.unbind (key);
       event_service->disconnect_event_supplier (sid.c_str ());
 
diff --git a/TAO/CIAO/ciao/CCM_Event.idl b/TAO/CIAO/ciao/CCM_Event.idl
index 73804f53aba..59fa878f97f 100644
--- a/TAO/CIAO/ciao/CCM_Event.idl
+++ b/TAO/CIAO/ciao/CCM_Event.idl
@@ -76,25 +76,6 @@ module Components
       raises (InvalidName,
               InvalidConnection);
 
-    // CIAO specific operations to connect a component to
-    // CIAO_Event_Service
-    // We have to use generic "Object" interface instead of the
-    // CIAO_Event_Service interface type, since CIAO_Event_Service
-    // relies on EventConsumerBase defined within this file, which
-    // causes circular dependencies. -Gan
-    Cookie ciao_connect_es (in FeatureName publisher_name,
-                            in Object es)
-      raises (InvalidName,
-              AlreadyConnected,
-              InvalidConnection,
-              ExceededConnectionLimit);
-
-    Object
-    ciao_disconnect_es (in FeatureName publisher_name,
-                        in Cookie ck)
-      raises (InvalidName,
-              InvalidConnection);
-
     void connect_consumer (in FeatureName emitter_name,
                            in EventConsumerBase consumer)
       raises (InvalidName,
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
index 8b84415b6cc..bcfcca9ef93 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
@@ -48,7 +48,7 @@ module CIAO
     void insert_type (in long event_type);
   };
 
-  interface CIAO_Event_Service
+  interface CIAO_Event_Service : Components::EventConsumerBase
   {
     Supplier_Config create_supplier_config ();
 
@@ -64,6 +64,6 @@ module CIAO
     void disconnect_event_consumer (in CONNECTION_ID conn_id)
       raises (Components::InvalidConnection);
 
-    void push_event (in Components::EventBase ev);
+    //void push_event (in Components::EventBase ev);
   };
 };
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
index d6484618fe6..cf9162581fd 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
@@ -5,7 +5,7 @@
 project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_events_dnc {
 
   requires += dummy_label
-  after += CIAO_DnC_Client
+  after += CIAO_DnC_Container
   sharedname  = CIAO_DnC_Events_Base
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
   dynamicflags = CIAO_EVENTS_BUILD_DLL
@@ -30,7 +30,7 @@ project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_events_dnc {
 project (CIAO_DnC_Events) : orbsvcslib, ciao_events_dnc {
 
   requires += dummy_label
-  after += CIAO_DnC_Events CIAO_RTEvent CIAO_DirectEvent
+  after += CIAO_DnC_Events_Base CIAO_RTEvent
   sharedname  = CIAO_DnC_Events
   libs	+= CIAO_DnC_Events_Base CIAO_RTEvent CIAO_DirectEvent
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
index 0c89e3417e8..6d188ea7871 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
@@ -17,14 +17,6 @@ module CIAO
   interface RTEvent_Consumer_Config :
     Consumer_Config
   {
-    void start_conjunction_group (in long size);
-
-    void start_disjunction_group (in long size);
-
-    void insert_source (in CONNECTION_ID source_id);
-
-    void insert_type (in long event_type);
-
     //void start_logical_and_group (in long size);
 
     //void start_negation ();