*** empty log message ***

9 files changed, 82 insertions, 27 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Component.idl b/TAO/CIAO/DAnCE/ciao/CCM_Component.idl
index c24bf884d7b..475e9bedbc4 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Component.idl
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Component.idl
@@ -133,6 +133,8 @@ module Components
     ComponentPortDescription get_all_ports ();
 
     attribute UUID component_UUID;
+
+    //void set_comp_UUID (in string new_uuid);
   };
 
   // @@ Enumeration and DefaultEnumeration are only for EJB to CCM
diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
index 68cb3b21e25..baba9461f12 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
@@ -35,6 +35,7 @@ project (CIAO_DnC_Events) : orbsvcslib, portableserver, valuetype, ifr_client, s
 
   after += CIAO_DnC_Client
   sharedname  = CIAO_DnC_Events
+  libs      += TAO_CosNotification_Skel
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
   dynamicflags = CIAO_EVENTS_BUILD_DLL
 
diff --git a/TAO/CIAO/DAnCE/ciao/CIAO_Events.idl b/TAO/CIAO/DAnCE/ciao/CIAO_Events.idl
index 8533bc69afa..3c1086e5465 100644
--- a/TAO/CIAO/DAnCE/ciao/CIAO_Events.idl
+++ b/TAO/CIAO/DAnCE/ciao/CIAO_Events.idl
@@ -52,18 +52,18 @@ module CIAO
 
     Consumer_Config create_consumer_config (in EventServiceType type);
     
-    void connect_event_supplier (in Supplier_Config supplier_config);
+    void connect_event_supplier (in Supplier_Config supplier_conf);
     
-    void disconnect_event_supplier (in CONNECTION_ID connection_id)
+    void disconnect_event_supplier (in CONNECTION_ID conn_id)
       raises (Components::InvalidConnection, Components::InvalidName);
     
-    void connect_event_consumer (in Consumer_Config consumer_config);
+    void connect_event_consumer (in Consumer_Config consumer_conf);
     
-    void disconnect_event_consumer (in CONNECTION_ID connection_id)
+    void disconnect_event_consumer (in CONNECTION_ID conn_id)
       raises (Components::InvalidConnection, Components::InvalidName);
     
     void push_event (in Components::EventBase ev,
-                     in CONNECTION_ID connection_id);
+                     in CONNECTION_ID conn_id);
   };
 
   /// An object for setting consumer QoS requirements. This will be expanded to
diff --git a/TAO/CIAO/DAnCE/ciao/CIAO_RTEvent.cpp b/TAO/CIAO/DAnCE/ciao/CIAO_RTEvent.cpp
index a4b6b7610c6..f7d90378ea4 100644
--- a/TAO/CIAO/DAnCE/ciao/CIAO_RTEvent.cpp
+++ b/TAO/CIAO/DAnCE/ciao/CIAO_RTEvent.cpp
@@ -191,7 +191,7 @@ namespace CIAO
       CORBA::SystemException))
   {
 
-    //ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventService::push_event\n"));
+    ACE_DEBUG ((LM_DEBUG, "-------------CIAO::RTEventService::push_event-----------------\n"));
 
     RtecEventComm::EventSet events (1);
     events.length (1);
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
index 5573ad45e95..bb8be20acf9 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
@@ -72,10 +72,11 @@ CIAO::Container::connect_event_consumer (
     CIAO::Consumer_Config_ptr consumer_config
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
+    Components::InvalidConnection,
     CORBA::SystemException))
 {
 
-  //ACE_DEBUG ((LM_DEBUG, "CIAO::Container::connect_event_consumer\n"));
+  ACE_DEBUG ((LM_DEBUG, "CIAO::Container::connect_event_consumer\n"));
 
   // Look up the supplier's event service implementation.
   CIAO::EventServiceBase * event_service = 0;
@@ -86,8 +87,8 @@ CIAO::Container::connect_event_consumer (
 
   if (this->event_service_map_.find (supplier_id.c_str (), event_service) != 0)
     {
-      ACE_THROW (
-      Components::InvalidConnection ());
+      ACE_DEBUG ((LM_DEBUG, "-------------Oops!!! -----------------\n"));
+      ACE_THROW (Components::InvalidConnection ());
     }
 
   // Connect to the supplier's event service implementation
@@ -113,7 +114,7 @@ CIAO::Container::connect_event_supplier (
     CORBA::SystemException))
 {
 
-  //ACE_DEBUG ((LM_DEBUG, "CIAO::Container::connect_event_supplier\n"));
+  ACE_DEBUG ((LM_DEBUG, "CIAO::Container::connect_event_supplier\n"));
 
   // Use factory to create the appropriate implementation of EventServiceBase
   CIAO::EventServiceType type =
@@ -148,14 +149,13 @@ CIAO::Container::disconnect_event_consumer (
     Components::InvalidConnection))
 {
 
-  //ACE_DEBUG ((LM_DEBUG, "CIAO::Container::disconnect_event_consumer\n"));
+  ACE_DEBUG ((LM_DEBUG, "CIAO::Container::disconnect_event_consumer\n"));
 
   CIAO::EventServiceBase * event_service;
 
   if (this->event_service_map_.unbind (connection_id, event_service) != 0)
     {
-      ACE_THROW (
-      Components::InvalidConnection ());
+      ACE_THROW (Components::InvalidConnection ());
     }
 
   event_service->disconnect_event_consumer (connection_id ACE_ENV_ARG_PARAMETER);
@@ -173,14 +173,13 @@ CIAO::Container::disconnect_event_supplier (
     Components::InvalidConnection))
 {
 
-  //ACE_DEBUG ((LM_DEBUG, "CIAO::Container::disconnect_event_supplier\n"));
+  ACE_DEBUG ((LM_DEBUG, "CIAO::Container::disconnect_event_supplier\n"));
 
   CIAO::EventServiceBase * event_service;
 
   if (this->event_service_map_.unbind (connection_id, event_service) != 0)
     {
-      ACE_THROW (
-      Components::InvalidConnection ());
+      ACE_THROW (Components::InvalidConnection ());
     }
 
   event_service->disconnect_event_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -194,17 +193,19 @@ CIAO::Container::push_event (
     const char * connection_id
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
+    Components::InvalidConnection,
     CORBA::SystemException))
 {
 
-  //ACE_DEBUG ((LM_DEBUG, "CIAO::Container::push_event\n"));
+  ACE_DEBUG ((LM_DEBUG, "CIAO::Container::push_event\n"));
 
   CIAO::EventServiceBase * event_service;
-  //ACE_DEBUG ((LM_DEBUG, "Pushing from supplier id: %s\n", connection_id));
+  ACE_DEBUG ((LM_DEBUG, "Pushing from supplier id: %s\n", connection_id));
   if (this->event_service_map_.find (connection_id, event_service) != 0)
     {
-      ACE_THROW (
-      Components::InvalidConnection ());
+      ACE_DEBUG ((LM_DEBUG, "-------------Gosh!!! Invalid Connection! -----------------\n"));
+
+      ACE_THROW (Components::InvalidConnection ());
     }
   event_service->push_event (ev ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h
index 09e3ebab47c..6c79751c0b9 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h
@@ -122,6 +122,7 @@ namespace CIAO
         Consumer_Config_ptr consumer_config
         ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
+        Components::InvalidConnection,
         CORBA::SystemException));
 
     /// Connect an event source.
@@ -155,6 +156,7 @@ namespace CIAO
         const char * connection_id
         ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
+        Components::InvalidConnection,
         CORBA::SystemException));
 
 
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index 69243aa08c3..cfd8025e307 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -2,6 +2,7 @@
 
 #include "NodeApplication_Impl.h"
 #include "ace/UUID.h"
+#include "string.h" // for debug
 
 #if !defined (__ACE_INLINE__)
 # include "NodeApplication_Impl.inl"
@@ -69,8 +70,8 @@ CIAO::NodeApplication_Impl::finishLaunch (
                   }
 
                 comp->connect_consumer(providedReference[i].portName.in (),
-                                      consumer.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                       consumer.in ()
+                                       ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
                 break;
 
@@ -240,13 +241,24 @@ CIAO::NodeApplication_Impl::install (
          comp = kh->create_component (ACE_ENV_SINGLE_ARG_PARAMETER);
          ACE_TRY_CHECK;
 
-         /*
+         
          // @@ Set up a component_UUID for this component
+         /*
          ACE_Utils::UUID_Generator uuid_gen;
          ACE_Utils::UUID * p_uuid = uuid_gen.generateUUID ();
-         comp->component_UUID (p_uuid->to_string ()->c_str ());
+
+         char* str_tmp = p_uuid->to_string ()->c_str ();
          */
 
+         //char* str_tmp;
+         //strcpy (str_tmp, impl_infos[i].component_instance_name.in ());
+         ACE_DEBUG ((LM_DEBUG, "UUID is %s\n", impl_infos[i].component_instance_name.in ()));
+         ACE_DEBUG ((LM_DEBUG, "################ Making a remote CORBA call on component named: %s\n", 
+                    impl_infos[i].component_instance_name.in ()));
+
+         comp->component_UUID (impl_infos[i].component_instance_name.in ());
+         
+
 
          if (this->component_map_.bind (impl_infos[i].component_instance_name.in (),
                                         Components::CCMObject::_duplicate (comp.in ())))
@@ -633,8 +645,14 @@ CIAO::NodeApplication_Impl::build_event_connection (const Deployment::Connection
       }
     
     // supplier ID
+    //ACE_DEBUG ((LM_DEBUG, "################ Making a remote CORBA call on event SOURCE component named: %s\n", supplier_comp_name));
+    //ACE_DEBUG ((LM_DEBUG, "Nil source component object reference\n"));
     //ACE_CString sid = source_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
+
+      ACE_CString test_sid = source_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
+      ACE_DEBUG ((LM_DEBUG, "The COMPONENT UUID I GOT is: %s\n", test_sid.c_str ()));
     ACE_CString sid = supplier_comp_name;
+    ACE_DEBUG ((LM_DEBUG, "The SUPPLIER COMPONENT NAME is: %s\n", supplier_comp_name.c_str ()));
     ACE_CHECK;
 
     sid += "_";
@@ -642,6 +660,7 @@ CIAO::NodeApplication_Impl::build_event_connection (const Deployment::Connection
     sid += "_publisher";
 
     // consumer ID
+    //ACE_DEBUG ((LM_DEBUG, "################ Making a remote CORBA call on event SINK component named: %s\n", consumer_comp_name));
     //ACE_CString cid = sink_objref->component_UUID (ACE_ENV_SINGLE_ARG_DECL);
     ACE_CString cid = consumer_comp_name;
     ACE_CHECK;
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
index 9b2cbff0a85..4902de9f16f 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
@@ -16,7 +16,6 @@ namespace CIAO
   }
 
   // Operations for CCMObject interface.
-  /*
     void
     Servant_Impl_Base::component_UUID (
     const char * new_component_UUID
@@ -33,6 +32,24 @@ namespace CIAO
     {
       return CORBA::string_dup (this->component_UUID_.c_str ());
     }
+
+  /*
+    void
+    Servant_Impl_Base::set_comp_UUID (
+    const char * new_component_UUID
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      this->comp_UUID_ = new_component_UUID;
+    }
+
+    CIAO::CONNECTION_ID
+    Servant_Impl_Base::get_comp_UUID (
+    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return CORBA::string_dup (this->comp_UUID_.c_str ());
+    }
   */
 
   ::Components::PrimaryKeyBase *
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
index cf159fe5ec8..56e5df456aa 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
@@ -52,7 +52,7 @@ namespace CIAO
     virtual ~Servant_Impl_Base (void);
 
     /// Operations for CCMObject interface.
-/*
+
       virtual void
       component_UUID (
       const char * new_component_UUID
@@ -63,6 +63,18 @@ namespace CIAO
       component_UUID (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
+
+/*
+      virtual void
+      set_comp_UUID (
+      const char * new_component_UUID
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+      virtual CIAO::CONNECTION_ID
+      get_comp_UUID (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 */
     virtual ::Components::PrimaryKeyBase *
     get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
@@ -218,7 +230,8 @@ namespace CIAO
     ConsumerTable consumer_table_;
     Session_Container * container_;
 
-    // ACE_CString component_UUID_;
+    //ACE_CString comp_UUID_;
+    ACE_CString component_UUID_;
   };
 }