Mon Sep 06 16:13:00 2004 Gan Deng <gan.deng@vanderbilt.edu>

4 files changed, 36 insertions, 1 deletions

diff --git a/TAO/CIAO/DAnCE/ChangeLog_EC b/TAO/CIAO/DAnCE/ChangeLog_EC
index d340b14350d..c037f2c83a5 100644
--- a/TAO/CIAO/DAnCE/ChangeLog_EC
+++ b/TAO/CIAO/DAnCE/ChangeLog_EC
@@ -1,3 +1,14 @@
+Mon Sep 06 16:13:00 2004  Gan Deng <gan.deng@vanderbilt.edu>
+
+        * CIAO_EventService_Factory_impl.cpp
+        * CIAO_EventService_Factory_impl.h
+        * CIAO_RTEvent.cpp
+        * CIAO_RTEvent.h
+
+          Modify the files in order to add support for 
+          Event Channel service configuration file and
+          for RT_QoS for both supplier and consumers.
+
 Mon Sep 06 13:35:00 2004  Gan Deng <gan.deng@vanderbilt.edu>
 
         * DAnCE/ciao/CCM_Component.idl
@@ -17,6 +28,13 @@ Mon Sep 06 13:35:00 2004  Gan Deng <gan.deng@vanderbilt.edu>
         
           Added implementation of the interface  
           ::CIAO::ContainerEventService to this class.
+          
+        * DAnCE/ciao/NodeApplication_Impl.h
+        * DAnCE/ciao/NodeApplication_Impl.cpp
+        * DAnCE/ciao/NodeApplication_Impl.inl
+                
+          Added implementation of get_event_service() operation which was
+          added to the NodeApplication IDL interface.
 
         * DAnCE/ciao/CCM_Core.mpc
         
diff --git a/TAO/CIAO/DAnCE/ciao/CIAO_EventService_Factory_impl.cpp b/TAO/CIAO/DAnCE/ciao/CIAO_EventService_Factory_impl.cpp
index b129e948fea..a3221be2ead 100644
--- a/TAO/CIAO/DAnCE/ciao/CIAO_EventService_Factory_impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/CIAO_EventService_Factory_impl.cpp
@@ -16,6 +16,7 @@
 #include "CIAO_CosNotify.h"
 
 #include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 /// Initialize the RTEventService object. Will eventually be moved to a separate init ()
 /// method so exceptions can be handled properly.
@@ -253,6 +254,7 @@ namespace CIAO
 
   // @@ George, not sure how we plan to get the svc.conf file options
   // into the channel. Just a place holder to think about it.
+  // @@ (GD) One place we could set the Event Channel Attributes.
   void
   EventService_Factory_impl::create_rt_event_channel (
       ACE_ENV_SINGLE_ARG_DECL)
@@ -261,6 +263,9 @@ namespace CIAO
   {
     ACE_DEBUG ((LM_DEBUG, "CIAO::EventService_Factory_impl::create_rt_event_channel\n"));
 
+    // @@ (GD) Anything else to do to get the svc.conf file options?
+	TAO_EC_Default_Factory::init_svcs ();
+
     TAO_EC_Event_Channel_Attributes attributes (this->root_poa_.in (),
                                                 this->root_poa_.in ());
     TAO_EC_Event_Channel * ec_servant;
diff --git a/TAO/CIAO/DAnCE/ciao/CIAO_EventService_Factory_impl.h b/TAO/CIAO/DAnCE/ciao/CIAO_EventService_Factory_impl.h
index f1c3837e3a5..e2d072f7c6b 100644
--- a/TAO/CIAO/DAnCE/ciao/CIAO_EventService_Factory_impl.h
+++ b/TAO/CIAO/DAnCE/ciao/CIAO_EventService_Factory_impl.h
@@ -63,6 +63,8 @@ namespace CIAO
     // library. Further, they probably need to be delegated to the
     // underlying concrete type to create it for you instead of
     // providing interfaces.
+    // @@ (GD) I feel this is the place where use could provide a parameter
+    //         which specifies the event channel service configuration file.
     void create_rt_event_channel (
         ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((
diff --git a/TAO/CIAO/DAnCE/ciao/CIAO_RTEvent.h b/TAO/CIAO/DAnCE/ciao/CIAO_RTEvent.h
index bc360ce60a7..744c65788b7 100644
--- a/TAO/CIAO/DAnCE/ciao/CIAO_RTEvent.h
+++ b/TAO/CIAO/DAnCE/ciao/CIAO_RTEvent.h
@@ -31,11 +31,15 @@ namespace CIAO
    * @class RTEventService
    *
    * An implementation of EventServiceBase using the RT event channel.
+   *
+   * @@ (GD) There should be a place where the deployment tool could
+   *         specify the RT Event Channel service configuration file.
+   *         This should be the place where the RtecEventChannel servant was
+   *         first time initialized.
    */
   class RTEventService :
     public virtual EventServiceBase
   {
-
   public:
 
     RTEventService (CORBA::ORB_ptr orb,
@@ -235,6 +239,9 @@ namespace CIAO
     virtual EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+    //@@ (GD) There should be a place where the deployment tool could
+	//        set up the rt_event_qos properties for Consumer Config.
+
     virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -285,6 +292,9 @@ namespace CIAO
     EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+    //@@ (GD) There should be a place where the deployment tool could
+	//        set up the rt_event_qos properties for Supplier Config.
+
     RtecEventChannelAdmin::SupplierQOS * rt_event_qos (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));