ChangeLogTag:Mon Oct 20 12:21:11 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

6 files changed, 192 insertions, 127 deletions

diff --git a/TAO/CIAO/ChangeLog_EC b/TAO/CIAO/ChangeLog_EC
index fc97f153114..3eeecfb11fc 100644
--- a/TAO/CIAO/ChangeLog_EC
+++ b/TAO/CIAO/ChangeLog_EC
@@ -1,10 +1,23 @@
+Mon Oct 20 12:21:11 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* ciao/CIAO_CosNotify.cpp:
+	* ciao/CIAO_CosNotify.h
+	* ciao/CIAO_DirectEvent.cpp:
+	* ciao/CIAO_DirectEvent.h:
+	* ciao/CIAO_EventServiceBase.h: //@@ comments for George. 
+
+	  There is also one comment in the changelog
+
 Sat Oct 18 14:19:56 2003  George Edwards <g.edwards@vanderbilt.edu>
 
         Added files:
-        * CIAO_CosNotify.cpp
-        * CIAO_CosNotify.h
-        * CIAO_CosNotify.idl 
-        * CIAO_DirectEvent.cpp
+
+        * ciao/CIAO_CosNotify.cpp
+        * ciao/CIAO_CosNotify.h
+        * ciao/CIAO_CosNotify.idl 
+        * ciao/CIAO_DirectEvent.cpp
+
+//@@ George, could you please add the path to the following files? 	
         * CIAO_DirectEvent.h
         * CIAO_DirectEvent.idl 
         * CIAO_EventServiceBase.h
@@ -34,10 +47,11 @@ Sat Oct 18 14:19:56 2003  George Edwards <g.edwards@vanderbilt.edu>
         * Container_Impl.inl 
         * Cookies.h
 
-          Changed container to dynamically link event service libraries. Added new
-          CIAO_Events project. Added method to CIAO::Container that provides an object
-          reference to the events interface. Removed map of EventServiceInfo structs from
-          CIAO::Container. Added a UUID attribute to CCM_Object.
+          Changed container to dynamically link event service
+          libraries. Added new CIAO_Events project. Added method to
+          CIAO::Container that provides an object reference to the
+          events interface. Removed map of EventServiceInfo structs
+          from CIAO::Container. Added a UUID attribute to CCM_Object.
 
         * Assembly_Deployer/Assembly_Impl.cpp 
         * Assembly_Deployer/Assembly_Impl.h 
@@ -47,8 +61,9 @@ Sat Oct 18 14:19:56 2003  George Edwards <g.edwards@vanderbilt.edu>
         * XML_Helpers/Assembly_Spec.h 
         * XML_Helpers/Assembly_Spec.inl
 
-          Moved glue code that establishes events connections into the Deployer.
-          Added a map of container references to CIAO::Assembly_Context.
+          Moved glue code that establishes events connections into the
+          Deployer. Added a map of container references to
+          CIAO::Assembly_Context. 
 
         * handcrafted/BasicSP_EC/BMClosedED/BMClosedEDE.idl 
         * handcrafted/BasicSP_EC/BMClosedED/BMClosedED_svnt.cpp 
@@ -63,9 +78,10 @@ Sat Oct 18 14:19:56 2003  George Edwards <g.edwards@vanderbilt.edu>
         * handcrafted/BasicSP_EC/EC/EC_svnt.cpp 
         * handcrafted/BasicSP_EC/EC/EC_svnt.h 
 
-          Added a UUID attribute to CCM_Object. Moved glue code that establishes
-          events connections into the Deployer. Changed push_event to use the
-          component UUID with port name appended.
+          Added a UUID attribute to CCM_Object. Moved glue code that
+          establishes events connections into the Deployer. Changed
+          push_event to use the component UUID with port name
+          appended. 
 
         Removed files:
         * CIAO_Events.cpp
diff --git a/TAO/CIAO/ciao/CIAO_CosNotify.cpp b/TAO/CIAO/ciao/CIAO_CosNotify.cpp
index 7b031af61b9..fb79da38dc0 100644
--- a/TAO/CIAO/ciao/CIAO_CosNotify.cpp
+++ b/TAO/CIAO/ciao/CIAO_CosNotify.cpp
@@ -1,57 +1,57 @@
 // -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CIAO_CosNotify.cpp
- *
- *  $Id$
- *
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=============================================================================
-
+//$Id$
 #include "CIAO_CosNotify.h"
 
+// @@ George, ACE_RCSID please..
+
 namespace CIAO
 {
 
-  CosNotifyService::CosNotifyService (CORBA::ORB_ptr orb,
-                                                   PortableServer::POA_ptr poa,
-                                                   CosNotifyChannelAdmin::EventChannel_ptr ec) :
-    orb_ (CORBA::ORB::_duplicate (orb)),
-    root_poa_ (PortableServer::POA::_duplicate (poa)),
-    notify_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)),
-    type_id_ ("Any"),
-    source_id_ ("Any")
+  CosNotifyService::CosNotifyService (
+      CORBA::ORB_ptr orb,
+      PortableServer::POA_ptr poa,
+      CosNotifyChannelAdmin::EventChannel_ptr ec)
+    : orb_ (CORBA::ORB::_duplicate (orb))
+    , root_poa_ (PortableServer::POA::_duplicate (poa))
+    , notify_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
+    , type_id_ ("Any")
+    , source_id_ ("Any")
   {
   }
 
   void
   CosNotifyService::connect_event_supplier (
-          Supplier_Config_ptr supplier_config
-          ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException))
+      Supplier_Config_ptr supplier_config
+      ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
 
-    ACE_DEBUG ((LM_DEBUG, "CIAO::CosNotifyService::connect_event_supplier\n"));
+    ACE_DEBUG ((LM_DEBUG,
+                "CIAO::CosNotifyService::connect_event_supplier\n"));
 
     CosNotifyChannelAdmin::AdminID admin_id;
+
     CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-      this->notify_channel_->new_for_suppliers (CosNotifyChannelAdmin::OR_OP,
-                                                admin_id
-                                                ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->notify_channel_->new_for_suppliers (
+        CosNotifyChannelAdmin::OR_OP,
+        admin_id
+        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CosNotifyChannelAdmin::ProxyID proxy_id;
+
+    // @@ George, what happens if my_proxy is NULL?
     CosNotifyChannelAdmin::ProxyConsumer_var my_proxy =
-      supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT,
-                                                         proxy_id
-                                                         ACE_ENV_SINGLE_ARG_PARAMETER);
+      supplier_admin->obtain_notification_push_consumer (
+        CosNotifyChannelAdmin::STRUCTURED_EVENT,
+        proxy_id
+        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     this->proxy_consumer_ =
       CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (my_proxy.in ());
+
+    // @@ George, This check is good, but you should probably return.
     if (CORBA::is_nil (this->proxy_consumer_.in ()))
       {
         ACE_ERROR ((LM_ERROR,
@@ -59,9 +59,12 @@ namespace CIAO
       }
 
     // Create and register supplier servant
-    CosNotifyServiceSupplier_impl * supplier_servant;
+    CosNotifyServiceSupplier_impl * supplier_servant = 0;
+
+    // @@ George, THROW_EX please..
     ACE_NEW (supplier_servant,
              CosNotifyServiceSupplier_impl (orb_.in ()));
+
     CosNotifyComm::StructuredPushSupplier_var push_supplier =
       supplier_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
@@ -84,16 +87,29 @@ namespace CIAO
       notify_config->notify_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    this->proxy_consumer_->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
+    // @@ George, isin't this a good place to get the QoS values from
+    // the meta level for the conenction?? Do  we have any hooks that
+    // can achieve this?
+
+    // @@ George, what happens if these calls fail? Yes, the exception
+    // would be raised. Do we want to propogate the exception,
+    // probably to the deployer? If so, the exception specification
+    // for this method wouldn't help you at all. You have declared
+    // SystemException. This would mean none of the user exceptions
+    // would get propogated. The deployer would get a UNKNOWN
+    // exception. That isn't very useful, isn't it?
+    this->proxy_consumer_->add_filter (filter.in ()
+                                       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    this->proxy_consumer_->set_qos (qos.in () ACE_ENV_ARG_PARAMETER);
+    this->proxy_consumer_->set_qos (qos.in ()
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    this->proxy_consumer_->connect_structured_push_supplier (push_supplier.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
+    this->proxy_consumer_->connect_structured_push_supplier (
+      push_supplier.in ()
+      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-
   }
 
   void
@@ -103,23 +119,25 @@ namespace CIAO
         ACE_THROW_SPEC ((
           CORBA::SystemException))
   {
-
     Components::EventConsumerBase_var consumer =
       consumer_config->consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
+    // @@ George, the same comments about exceptions, return values
+    // etc etc. apply.
     CosNotifyChannelAdmin::AdminID admin_id;
     CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
       this->notify_channel_->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
                                                 admin_id
-                                                ACE_ENV_SINGLE_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CosNotifyChannelAdmin::ProxyID proxy_id;
     CosNotifyChannelAdmin::ProxySupplier_var my_proxy =
-      consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT,
-                                                         proxy_id
-                                                         ACE_ENV_SINGLE_ARG_PARAMETER);
+      consumer_admin->obtain_notification_push_supplier (
+        CosNotifyChannelAdmin::STRUCTURED_EVENT,
+        proxy_id
+        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier =
@@ -131,9 +149,12 @@ namespace CIAO
       }
 
     // Create and register consumer servant
-    CosNotifyServiceConsumer_impl * consumer_servant;
+    CosNotifyServiceConsumer_impl * consumer_servant = 0;
+
     ACE_NEW (consumer_servant,
-             CosNotifyServiceConsumer_impl (orb_.in (), consumer.in ()));
+             CosNotifyServiceConsumer_impl (orb_.in (),
+                                            consumer.in ()));
+
     CosNotifyComm::StructuredPushConsumer_var push_consumer =
       consumer_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
@@ -170,28 +191,32 @@ namespace CIAO
       consumer_config->consumer_id (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    this->proxy_supplier_map_.bind (consumer_id.c_str (), proxy_supplier._retn ());
-
+    // @@ George, What happens if the bind fails? Don't we want to
+    // roll all this back ie. close the connection etc. ?
+    this->proxy_supplier_map_.bind (consumer_id.c_str (),
+                                    proxy_supplier._retn ());
   }
 
-  void CosNotifyService::disconnect_event_supplier (
+  void
+  CosNotifyService::disconnect_event_supplier (
           ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((
           CORBA::SystemException,
           Components::InvalidName,
           Components::InvalidConnection))
   {
-
+    // @@ Comments about exception applies...
     this->proxy_consumer_->disconnect_structured_push_consumer (
       ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
   }
 
-  void CosNotifyService::disconnect_event_consumer (
-          const char * connection_id
-          ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((
+  void
+  CosNotifyService::disconnect_event_consumer (
+      const char * connection_id
+      ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
           CORBA::SystemException,
           Components::InvalidName,
           Components::InvalidConnection))
@@ -207,32 +232,42 @@ namespace CIAO
 
   }
 
-  void CosNotifyService::push_event (
-          Components::EventBase * ev
-          ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((
-          CORBA::SystemException))
+  void
+  CosNotifyService::push_event (
+      Components::EventBase * ev
+      ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
 
     ACE_DEBUG ((LM_DEBUG, "CIAO::CosNotifyService::push_event\n"));
 
     CosNotification::StructuredEvent event;
-    event.header.fixed_header.event_type.domain_name = CORBA::string_dup ("CIAO_Events");
-    event.header.fixed_header.event_type.type_name = this->type_id_.c_str ();
-    event.header.fixed_header.event_name = this->source_id_.c_str ();
-    event.remainder_of_body <<= ev;
 
-    this->proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+    // @@ George, not now, but later we may want to cache these
+    // details that are in the critical path that way we don't need to
+    // pay for this every call. Just leave the comment around so that
+    // we can get to it once we are done with other things.
+    event.header.fixed_header.event_type.domain_name =
+      CORBA::string_dup ("CIAO_Events");
+    event.header.fixed_header.event_type.type_name =
+      this->type_id_.c_str ();
+    event.header.fixed_header.event_name =
+      this->source_id_.c_str ();
+
+    event.remainder_of_body <<= ev;
 
+    this->proxy_consumer_->push_structured_event (
+      event
+      ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
   }
 
   CosNotifyServiceSupplier_impl::CosNotifyServiceSupplier_impl (void)
   {
   }
 
-  CosNotifyServiceSupplier_impl::CosNotifyServiceSupplier_impl (CORBA::ORB_ptr orb) :
-    orb_ (CORBA::ORB::_duplicate (orb))
+  CosNotifyServiceSupplier_impl::CosNotifyServiceSupplier_impl (CORBA::ORB_ptr orb)
+    : orb_ (CORBA::ORB::_duplicate (orb))
   {
   }
 
@@ -257,23 +292,31 @@ namespace CIAO
   {
   }
 
-  CosNotifyServiceConsumer_impl::CosNotifyServiceConsumer_impl (CORBA::ORB_ptr orb,
-                                                                             Components::EventConsumerBase_ptr consumer) :
-      orb_ (CORBA::ORB::_duplicate (orb)),
+  CosNotifyServiceConsumer_impl::CosNotifyServiceConsumer_impl (
+      CORBA::ORB_ptr orb,
+      Components::EventConsumerBase_ptr consumer)
+    : orb_ (CORBA::ORB::_duplicate (orb)),
       event_consumer_ (Components::EventConsumerBase::_duplicate (consumer))
   {
   }
 
   void
-  CosNotifyServiceConsumer_impl::push_structured_event (const CosNotification::StructuredEvent& event)
+  CosNotifyServiceConsumer_impl::push_structured_event (
+      const CosNotification::StructuredEvent& event)
   {
-    ACE_DEBUG ((LM_DEBUG, "CosNotifyServiceConsumer_impl::push_structured_event\n"));
-    Components::EventBase * ev;
+    ACE_DEBUG ((LM_DEBUG,
+                "CosNotifyServiceConsumer_impl::push_structured_event\n"));
+
+    Components::EventBase *ev = 0;
+
     if (event.remainder_of_body >>= ev)
       {
+        // @@ George, is this add_ref () required?
         ev->_add_ref ();
+
         this->event_consumer_->push_event (ev
                                            ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
       }
   }
 
@@ -300,22 +343,25 @@ namespace CIAO
   }
 
   void
-  CosNotify_Consumer_Config_impl::consumer_id (const char * consumer_id ACE_ENV_ARG_DECL)
+  CosNotify_Consumer_Config_impl::consumer_id (const char * consumer_id
+                                               ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->consumer_id_ = consumer_id;
   }
 
   void
-  CosNotify_Consumer_Config_impl::supplier_id (const char * supplier_id ACE_ENV_ARG_DECL)
+  CosNotify_Consumer_Config_impl::supplier_id (const char * supplier_id
+                                               ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->supplier_id_ = supplier_id;
   }
 
   void
-  CosNotify_Consumer_Config_impl::consumer (Components::EventConsumerBase_ptr consumer ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException))
+  CosNotify_Consumer_Config_impl::consumer (Components::EventConsumerBase_ptr consumer
+                                            ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->consumer_ = consumer;
   }
diff --git a/TAO/CIAO/ciao/CIAO_CosNotify.h b/TAO/CIAO/ciao/CIAO_CosNotify.h
index a7c240dd7ce..d25e6a22846 100644
--- a/TAO/CIAO/ciao/CIAO_CosNotify.h
+++ b/TAO/CIAO/ciao/CIAO_CosNotify.h
@@ -25,11 +25,11 @@
 
 namespace CIAO
 {
-
   /**
    * @class CosNotifyService
    *
-   * An implementation of EventServiceBase using the COS notification service.
+   * @brief An implementation of EventServiceBase to use the
+   * CosNotification service.
    */
   class CosNotifyService :
     public virtual EventServiceBase
@@ -41,32 +41,28 @@ namespace CIAO
                       PortableServer::POA_ptr poa,
                       CosNotifyChannelAdmin::EventChannel_ptr ec);
 
+    // @@ George, just a place holder for you to add documentation.
     virtual void connect_event_supplier (
         CIAO::Supplier_Config_ptr supplier_config
         ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void connect_event_consumer (
         CIAO::Consumer_Config_ptr consumer_config
         ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void disconnect_event_consumer (
         const char * connection_id
         ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidName,
-        Components::InvalidConnection));
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName,
+                       Components::InvalidConnection));
 
-    virtual void disconnect_event_supplier (
-        ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidName,
-        Components::InvalidConnection));
+    virtual void disconnect_event_supplier (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName,
+                       Components::InvalidConnection));
 
     virtual void push_event (
         Components::EventBase * ev
@@ -133,6 +129,7 @@ namespace CIAO
 
   public:
 
+    // @@ George, is it okay to have a default constructor?
     CosNotifyServiceSupplier_impl (void);
 
     CosNotifyServiceSupplier_impl (
@@ -154,9 +151,9 @@ namespace CIAO
   private:
 
     CORBA::ORB_var orb_;
-
   };
 
+
   /**
    * @class CosNotifyServiceConsumer_impl
    *
@@ -201,7 +198,7 @@ namespace CIAO
 
   /**
    * @class CosNotify_Consumer_Config_impl
-   * 
+   *
    * Implementation of the CosNotify_Consumer_Config IDL interface that
    * configures the CosNotification service. An object of this type will be
    * returned from @c CIAO::Container::create_consumer_config () when @c NOTIFY
@@ -260,7 +257,7 @@ namespace CIAO
 
   /**
    * @class CosNotify_Supplier_Config_impl
-   * 
+   *
    * Implementation of the CosNotify_Supplier_Config IDL interface that
    * configures the CosNotification service. An object of this type will be
    * returned from @c CIAO::Container::create_supplier_config () when @c NOTIFY
diff --git a/TAO/CIAO/ciao/CIAO_DirectEvent.cpp b/TAO/CIAO/ciao/CIAO_DirectEvent.cpp
index 6e8a42d9a92..6036c6ca6a1 100644
--- a/TAO/CIAO/ciao/CIAO_DirectEvent.cpp
+++ b/TAO/CIAO/ciao/CIAO_DirectEvent.cpp
@@ -17,9 +17,9 @@ namespace CIAO
 
   DirectEventService::DirectEventService (
     CORBA::ORB_ptr orb,
-    PortableServer::POA_ptr poa) :
-  orb_ (CORBA::ORB::_duplicate (orb)),
-  root_poa_ (PortableServer::POA::_duplicate (poa))
+    PortableServer::POA_ptr poa)
+    : orb_ (CORBA::ORB::_duplicate (orb))
+    , root_poa_ (PortableServer::POA::_duplicate (poa))
   {
   }
 
@@ -38,9 +38,6 @@ namespace CIAO
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-
-    // @@ George, Any reason not to use ACE_NEW_THROW_EX (). Exceptions
-    // comes free then.
     Components::EventConsumerBase_var consumer =
       consumer_config->consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
@@ -79,13 +76,16 @@ namespace CIAO
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
-    ACE_DEBUG ((LM_DEBUG, "CIAO::DirectEventService::push_event\n"));
+    ACE_DEBUG ((LM_DEBUG,
+                "CIAO::DirectEventService::push_event\n"));
 
     size_t end = this->consumer_array_.size ();
 
     // Iterate through the array, pushing the event to each consumer.
-    for (size_t iter = 0; iter < end; ++iter)
+    for (size_t iter = 0; iter != end; ++iter)
       {
+        // @@ George, is this required? Since the push_event () is
+        // going to make a copy, why would this be required?
         ev->_add_ref ();
         this->consumer_array_[iter]->push_event (
           ev
@@ -101,7 +101,7 @@ namespace CIAO
 
   void
   Direct_Consumer_Config_impl::consumer_id (
-      const char * consumer_id 
+      const char * consumer_id
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
@@ -165,8 +165,8 @@ namespace CIAO
     return Components::EventConsumerBase::_duplicate (this->consumer_.in ());
   }
 
-  Direct_Supplier_Config_impl::Direct_Supplier_Config_impl () :
-    service_type_ (DIRECT)
+  Direct_Supplier_Config_impl::Direct_Supplier_Config_impl (void)
+    : service_type_ (DIRECT)
   {
   }
 
diff --git a/TAO/CIAO/ciao/CIAO_DirectEvent.h b/TAO/CIAO/ciao/CIAO_DirectEvent.h
index f96c947c45f..b0ee3d6c564 100644
--- a/TAO/CIAO/ciao/CIAO_DirectEvent.h
+++ b/TAO/CIAO/ciao/CIAO_DirectEvent.h
@@ -86,6 +86,7 @@ namespace CIAO
      *
      * List of consumers.
      */
+    /// @@ George, this is cool! Do you want to use a _var or _ptr?
     ACE_Array<Components::EventConsumerBase_ptr> consumer_array_;
 
   };
@@ -93,7 +94,7 @@ namespace CIAO
 
   /**
    * @class Direct_Consumer_Config_impl
-   * 
+   *
    * Implementation of the Direct_Consumer_Config IDL interface that
    * configures TAO's direct event mechanism. An object of this type will be
    * returned from @c CIAO::Container::create_consumer_config () when @c DIRECT
@@ -107,13 +108,15 @@ namespace CIAO
 
     Direct_Consumer_Config_impl ();
 
-    virtual void consumer_id (const char * consumer_id ACE_ENV_ARG_DECL)
+    virtual void consumer_id (const char * consumer_id
+                              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual CONNECTION_ID consumer_id (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL)
+    virtual void supplier_id (const char * supplier_id
+                              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual CONNECTION_ID supplier_id (ACE_ENV_SINGLE_ARG_DECL)
@@ -125,6 +128,7 @@ namespace CIAO
     virtual Components::EventConsumerBase_ptr consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+    // @@ george, probably this should be const'ified?
     virtual EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -142,7 +146,7 @@ namespace CIAO
 
   /**
    * @class Direct_Supplier_Config_impl
-   * 
+   *
    * Implementation of the Direct_Supplier_Config IDL interface that
    * configures TAO's direct event mechanism. An object of this type will be
    * returned from @c CIAO::Container::create_supplier_config () when @c DIRECT
diff --git a/TAO/CIAO/ciao/CIAO_EventServiceBase.h b/TAO/CIAO/ciao/CIAO_EventServiceBase.h
index b18b756902a..c87d52ce490 100644
--- a/TAO/CIAO/ciao/CIAO_EventServiceBase.h
+++ b/TAO/CIAO/ciao/CIAO_EventServiceBase.h
@@ -14,11 +14,13 @@
 #define CIAO_EVENTSERVICEBASE_H
 #include /**/ "ace/pre.h"
 
+#include "CIAO_EventsS.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CIAO_EventsS.h"
+
 
 namespace CIAO
 {
@@ -42,7 +44,7 @@ namespace CIAO
 
     /**
      * @fn void connect_event_supplier (Supplier_Config_ptr supplier_config)
-     * 
+     *
      * Connects an event supplier using the options specified by
      * @c supplier_config.
      */
@@ -54,7 +56,7 @@ namespace CIAO
 
     /**
      * @fn void connect_event_consumer (Consumer_Config_ptr consumer_config)
-     * 
+     *
      * Connects an event consumer using the options specified by
      * @c consumer_config.
      */
@@ -66,7 +68,7 @@ namespace CIAO
 
     /**
      * @fn void disconnect_event_supplier ()
-     * 
+     *
      * Disconnects the event supplier associated with this object.
      */
     virtual void disconnect_event_supplier (
@@ -78,7 +80,7 @@ namespace CIAO
 
     /**
      * @fn void disconnect_event_consumer (CONNECTION_ID consumer_id)
-     * 
+     *
      * Disconnects the event consumer with UUID @c consumer_id.
      */
     virtual void disconnect_event_consumer (
@@ -91,7 +93,7 @@ namespace CIAO
 
     /**
      * @fn void push_event (Components::EventBase * ev)
-     * 
+     *
      * Pushes event @c ev to all consumers.
      */
     virtual void push_event (