*** empty log message ***

61 files changed, 849 insertions, 764 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 923401be19d..c2288781012 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,97 @@
+Fri Oct  4 14:01:05 2002  D A Hanvey  <dhanvey@qub.ac.uk>
+
+	* orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp: 
+	* orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h: 
+	* orbsvcs/tests/Log/Basic_Log_Test/client.cpp: 
+
+	  Native exceptions fixed.
+
+Fri Oct  4 13:56:19 2002  D A Hanvey  <dhanvey@qub.ac.uk>
+
+	* orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp: 
+	* orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h:
+
+	* orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp: 
+	* orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h:
+
+	* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp: 
+	* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp: 
+	* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h:
+
+	* orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp: 
+	* orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h:
+
+	  Native exceptions fixed.
+
+Fri Oct  4 13:51:22 2002  D A Hanvey  <dhanvey@qub.ac.uk>
+
+	* orbsvcs/examples/Log/Basic/main.cpp: 
+	* orbsvcs/examples/Log/Basic/TLS_Client.cpp:
+	* orbsvcs/examples/Log/Basic/TLS_Client.h:	
+
+	* orbsvcs/examples/Log/Event/Event_Consumer.cpp: 
+	* orbsvcs/examples/Log/Event/Event_Consumer.h: 
+	* orbsvcs/examples/Log/Event/Event_Supplier.cpp:
+	* orbsvcs/examples/Log/Event/Event_Supplier.h:
+
+	* orbsvcs/examples/Log/Notify/Notify_Consumer.cpp: 
+	* orbsvcs/examples/Log/Notify/Notify_Consumer.h: 
+	* orbsvcs/examples/Log/Notify/Notify_Supplier.cpp:
+	* orbsvcs/examples/Log/Notify/Notify_Supplier.h:
+
+	* orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp: 
+	* orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h: 
+	* orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp:
+	* orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h:
+
+	  Native exceptions fixed.	
+
+Fri Oct  4 13:41:44 2002  D A Hanvey  <dhanvey@qub.ac.uk>
+
+	* orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp: 
+	* orbsvcs/orbsvcs/Log/BasicLog_i.cpp:
+	* orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/EventLog_i.cpp:
+	* orbsvcs/orbsvcs/Log/EventLogNotification.cpp:
+	* orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
+	* orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp:
+	* orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
+	* orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp:
+	* orbsvcs/orbsvcs/Log/Iterator_i.cpp:
+	* orbsvcs/orbsvcs/Log/Log_i.cpp:
+	* orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+	* orbsvcs/orbsvcs/Log/LogNotification.cpp:
+	* orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp:
+	* orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+	* orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
+	* orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp:
+	* orbsvcs/orbsvcs/Log/PersistStore.cpp:
+
+	* orbsvcs/orbsvcs/Log/BasicLogFactory_i.h: 
+	* orbsvcs/orbsvcs/Log/BasicLog_i.h:
+	* orbsvcs/orbsvcs/Log/EventLogFactory_i.h:
+	* orbsvcs/orbsvcs/Log/EventLog_i.h:
+	* orbsvcs/orbsvcs/Log/EventLogNotification.h:
+	* orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h:
+	* orbsvcs/orbsvcs/Log/RTEventLog_i.h:
+	* orbsvcs/orbsvcs/Log/RTEventLogNotification.h:
+	* orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h:
+	* orbsvcs/orbsvcs/Log/NotifyLog_i.h:
+	* orbsvcs/orbsvcs/Log/NotifyLogNotification.h:
+	* orbsvcs/orbsvcs/Log/Iterator_i.h:
+	* orbsvcs/orbsvcs/Log/Log_i.h:
+	* orbsvcs/orbsvcs/Log/LogMgr_i.h:
+	* orbsvcs/orbsvcs/Log/LogNotification.h:
+	* orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h:
+	* orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
+	* orbsvcs/orbsvcs/Log/LogRecordStore.h:
+	* orbsvcs/orbsvcs/Log/LogRecordStore_persist.h:
+	* orbsvcs/orbsvcs/Log/PersistStore.h:
+
+	  Native exception fixes.
+
 Thu Oct  3 18:26:48 2002  Ossama Othman  <ossama@uci.edu>
 
 	* orbsvcs/tests/LoadBalancing/GenericFactory/run_test.pl:
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index 7461018c144..704e8ffc933 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -1,8 +1,12 @@
-/* -*- C++ -*- $Id$ */
 #include "Basic_Logging_Service.h"
 #include "ace/Get_Opt.h"
 #include "orbsvcs/Log/BasicLogFactory_i.h"
 
+ACE_RCSID (Basic_Logging_Service,
+           Basic_Logging_Service,
+           "$Id$")
+
+
 Basic_Logging_Service::Basic_Logging_Service (void)
   : basic_log_factory_name_ ("BasicLogFactory")
 {
@@ -52,23 +56,23 @@ Basic_Logging_Service::startup (int argc, char *argv[]
   // initalize the ORB.
   this->init_ORB (argc, argv
                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (-1);
 
   // Resolve the naming service.
   this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (-1);
 
   // Activate the basic log factory
   // CORBA::Object_var obj =
   DsLogAdmin::BasicLogFactory_var obj =
     this->basic_log_factory_.activate (this->poa_.in ()
                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (-1);
   ACE_ASSERT (!CORBA::is_nil (obj.in ()));
 
   CORBA::String_var str =
     this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
               "The Basic Log Factory IOR is <%s>\n", str.in ()));
@@ -83,7 +87,7 @@ Basic_Logging_Service::startup (int argc, char *argv[]
   this->naming_->rebind (name,
                          obj.in ()
                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
               "Registered with the naming service as: %s\n",
@@ -159,6 +163,8 @@ Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 int
 main (int argc, char *argv[])
 {
+  ACE_DECLARE_NEW_CORBA_ENV;
+
   Basic_Logging_Service service;
 
   if (service.startup (argc, argv ACE_ENV_ARG_PARAMETER) == -1)
@@ -166,23 +172,13 @@ main (int argc, char *argv[])
                        "Failed to start the Basic Logging Service.\n"),
                       1);
 
-  ACE_TRY_NEW_ENV
-    {
-      if (service.run () == -1)
-        {
-          service.shutdown ();
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Failed to run the Telecom Log Service.\n"),
-                            1);
-        }
-    }
-  ACE_CATCHANY
+  if (service.run () == -1)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start the Telecom Log Service\n");
-      return 1;
+      service.shutdown ();
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Failed to run the Telecom Log Service.\n"),
+                        1);
     }
-  ACE_ENDTRY;
 
   service.shutdown ();
 
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
index 605cf2edc47..5daeee42484 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-//
+
 // ============================================================================
-//
-// = FILENAME
-//   Basic_Logging_Service.h
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   Telecom Log Service front end.
-//
+/**
+ *  @file   Basic_Logging_Service.h
+ *
+ *  $Id$
+ *
+ *  Front End of the Telecom Log Service 
+ *  Basic_Logging_Service
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef BASIC_LOGGING_SERVICE_H
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index d397eac1b23..72db521dccc 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -1,10 +1,13 @@
-/* -*- C++ -*- $Id$ */
-
 #include "ace/Get_Opt.h"
 #include "Event_Logging_Service.h"
 #include "orbsvcs/Log/EventLogFactory_i.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 
+ACE_RCSID (Event_Logging_Service,
+           Event_Logging_Service,
+           "$Id$")
+
+
 Event_Logging_Service::Event_Logging_Service (void)
   : event_log_factory_name_ ("EventLogFactory")
 {
@@ -93,7 +96,7 @@ Event_Logging_Service::startup (int argc, char *argv[]
 }
 
 void
-Event_Logging_Service::resolve_naming_service (ACE_ENV_ARG_DECL)
+Event_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService"
@@ -162,32 +165,23 @@ main (int argc, char *argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
+  ACE_DECLARE_NEW_CORBA_ENV;
+
   Event_Logging_Service service;
 
-  ACE_TRY_NEW_ENV
-    {
-      service.startup (argc,
-                       argv//,
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  service.startup (argc,
+                   argv
+                   ACE_ENV_ARG_PARAMETER);
 
-      if (service.run () == -1)
-        {
-          service.shutdown ();
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Failed to run the Telecom EventLog Service.\n"),
-                            1);
-        }
-    }
-  ACE_CATCHANY
+  if (service.run () == -1)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start the Telecom EventLog Service\n");
-      return 1;
+      service.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Failed to run the Telecom EventLog Service.\n"),
+                        1);
     }
-  ACE_ENDTRY;
 
-  service.shutdown ();
+  service.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
index 41214cb5fb3..e817654652b 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
@@ -1,16 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
+
 // ============================================================================
-//
-// = FILENAME
-//   Event_Logging_Service.h
-//
-// = AUTHOR
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// = DESCRIPTION
-//   Telecom EventLog Service front end.
-//
+/**
+ *  @file   Event_Logging_Service.h
+ *
+ *  $Id$
+ *
+ *  Front End of the Telecom Log Service 
+ *  Event_Logging_Service
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef EVENT_LOGGING_SERVICE_H
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
index 931dd016b65..04512878c27 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- $Id$ */
-
 #include "Notify_Logging_Service.h"
 #include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
 #include "orbsvcs/Notify/Notify_Default_CO_Factory.h"
@@ -7,6 +5,10 @@
 #include "orbsvcs/Notify/Notify_Default_Collection_Factory.h"
 #include "orbsvcs/Notify/Notify_Default_EMO_Factory.h"
 
+ACE_RCSID (Notify_Logging_Service,
+           Notify_Logging_Server,
+           "$Id$")
+
 // Driver function for the TAO Notify Service.
 
 int
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 9362aaf3a4d..f5c11d7cda3 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- $Id$ */
-
 #include "Notify_Logging_Service.h"
 #include "tao/debug.h"
 #include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
@@ -7,6 +5,11 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 
+ACE_RCSID (Notify_Logging_Service,
+           Notify_Logging_Service,
+           "$Id$")
+
+
 Notify_Logging_Service::Notify_Logging_Service (void)
 : notify_factory_name_ (NOTIFY_KEY)
 {
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
index d5e4c18b8ab..ca3da6f579b 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ============================================================================
-//
-// = FILENAME
-//   Notify_Logging_Service.h
-//
-// = AUTHORS
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// = DESCRIPTION
-//   Notification Log Service front end.
-//
+/**
+ *  @file   Notify_Logging_Service.h
+ *
+ *  $Id$
+ *
+ *  Front End of the Telecom Log Service 
+ *  Notify_Logging_Service
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef NOTIFY_LOGGING_SERVICE_H
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index f7474111a8c..df954409e5e 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -1,20 +1,18 @@
-/* -*- C++ -*- $Id$ */
-
 #include "RTEvent_Logging_Service.h"
-
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
-
 #include "orbsvcs/CosNamingC.h"
-
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Sched/Config_Scheduler.h"
 #include "orbsvcs/Event/Module_Factory.h"
 #include "orbsvcs/Event/Event_Channel.h"
-
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 
+ACE_RCSID (RTEvent_Logging_Service,
+           RTEvent_Logging_Service,
+           "$Id$")
+
 int main (int argc, char *argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
index a1926264f38..2e4bbe84b42 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-//
+
 // ============================================================================
-//
-// = FILENAME
-//   RTEvent_Logging_Service.h
-//
-// = AUTHORS
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// = DESCRIPTION
-//   RTEvent Log Service front end.
-//
+/**
+ *  @file   RTEvent_Logging_Service.h
+ *
+ *  $Id$
+ *
+ *  Front End of the Telecom Log Service 
+ *  RTEvent_Logging_Service
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef RTEVENT_LOGGING_SERVICE_H
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index ef40868858d..c5c3e6d11a1 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -1,6 +1,9 @@
-/* -*- C++ -*- $Id$ */
 #include "TLS_Client.h"
 
+ACE_RCSID (Basic,
+           TLS_Client,
+           "$Id$")
+
 #define NAMING_SERVICE_NAME "NameService"
 #define BASIC_TLS_LOG_FACTORY_NAME "BasicLogFactory"
 #define LOG_EVENT_COUNT 9
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
index 6e4980a65fb..b06ffc65f92 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
@@ -1,17 +1,17 @@
-// -*- C++ -*-
-// $Id$
+/* -*- C++ -*- */
 
 // ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Telecom Log Service examples
-//
-// = FILENAME
-//   TLS_Client
-//
-// = AUTHOR
-//   D A Hanvey (d.hanvey@qub.ac.uk)
-//
+/**
+ *  @file   TLS_Client.h
+ *
+ *  $Id$
+ *
+ *  An example of using the Basic_Logging_Service
+ *
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef TLS_CLIENT_H
diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp
index 4dacc2e20c6..cb04bf7b963 100644
--- a/TAO/orbsvcs/examples/Log/Basic/main.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp
@@ -1,6 +1,10 @@
-/* -*- C++ -*- $Id$ */
 #include "TLS_Client.h"
 
+ACE_RCSID (Basic,
+           main,
+           "$Id$")
+
+
 int
 main (int argc, char *argv [])
 {
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index c3e00eea375..4e62a0863ff 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -1,7 +1,11 @@
-/* -*- C++ -*- $Id$ */
 #include "Event_Consumer.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 
+ACE_RCSID (Event,
+           Event_Consumer,
+           "$Id$")
+
+
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory"
 
@@ -55,7 +59,7 @@ Consumer::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW (CORBA::UNKNOWN ());
+        ACE_THROW_RETURN (CORBA::UNKNOWN (),0);
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index 61d8e6dc94f..946299dc55d 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-//
+
 // ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Telecom Log Event Service examples
-//
-// = FILENAME
-//   Event_Consumer
-//
-// = AUTHOR
-//   D A Hanvey (d.hanvey@qub.ac.uk)
-//
+/**
+ *  @file   Event_Consumer.h
+ *
+ *  $Id$
+ *
+ *  An example of using the Event_Logging_Service.
+ *  The Event_Consumer consumes log-generated events.
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef EVENT_CONSUMER_H
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index 4bda6edc683..46fa820d1b9 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -1,7 +1,11 @@
-/* -*- C++ -*- $Id$ */
 #include "Event_Supplier.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 
+ACE_RCSID (Event,
+           Event_Supplier,
+           "$Id$")
+
+
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory"
 #define LOG_EVENT_COUNT 9
@@ -54,7 +58,7 @@ Supplier::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW (CORBA::UNKNOWN ());
+        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
index 0410b8fedf0..c37b9a5c9df 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-//
+
 // ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Telecom Log Event Service examples
-//
-// = FILENAME
-//   Event_Supplier
-//
-// = AUTHOR
-//   D A Hanvey (d.hanvey@qub.ac.uk)
-//
+/**
+ *  @file   Event_Supplier.h
+ *
+ *  $Id$
+ *
+ *  An example of using the Event_Logging_Service.
+ *  
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef EVENT_SUPPLIER_H
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 34b61ae21f3..0fb2c8afe1e 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -1,9 +1,12 @@
-/* -*- C++ -*- $Id$ */
-
 #include "Notify_Consumer.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
+ACE_RCSID (Notify,
+           Notify_Consumer,
+           "$Id$")
+
+
 #define NAMING_SERVICE_NAME "NameService"
 #define NOTIFY_TLS_LOG_FACTORY_NAME "NotifyLogFactory"
 #define LOG_EVENT_COUNT 29
@@ -64,7 +67,7 @@ Consumer::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW (CORBA::UNKNOWN ());
+        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
@@ -146,7 +149,7 @@ Consumer::push (const CORBA::Any &event
 
 void
 Consumer::disconnect_push_consumer
-   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index 5fb78306ece..cc256a1bdb6 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-//
+
 // ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Telecom Log Service examples
-//
-// = FILENAME
-//   Notify_Consumer
-//
-// = AUTHOR
-//   D A Hanvey (d.hanvey@qub.ac.uk)
-//
+/**
+ *  @file   Notify_Consumer.h
+ *
+ *  $Id$
+ *
+ *  An example of using the Notify_Logging_Service.
+ *  The Notify_Consumer consumes log-generated events.
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef NOTIFY_CONSUMER_H
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index dd1b7d88cee..f03c0be4389 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -1,8 +1,11 @@
-/* -*- C++ -*- $Id$ */
-
 #include "Notify_Supplier.h"
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
+ACE_RCSID (Notify,
+           Notify_Supplier,
+           "$Id$")
+
+
 #define NAMING_SERVICE_NAME "NameService"
 #define NOTIFY_TLS_LOG_FACTORY_NAME "NotifyLogFactory"
 #define LOG_EVENT_COUNT 10
@@ -52,7 +55,7 @@ Supplier::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW (CORBA::UNKNOWN ());
+        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
@@ -282,7 +285,7 @@ Supplier::run (int argc, char* argv[])
 }
 
 
-Filter_StructuredPushSupplier::Filter_StructuredPushSupplier  ()
+Filter_StructuredPushSupplier::Filter_StructuredPushSupplier  (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
index 7a46281c5d1..ab7e112f93d 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-//
+
 // ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Telecom Log Service examples 
-//
-// = FILENAME
-//   Notify_Supplier
-//
-// = AUTHOR
-//   D A Hanvey (d.hanvey@qub.ac.uk)
-//
+/**
+ *  @file   Notify_Supplier.h
+ *
+ *  $Id$
+ *
+ *  An example of using the Notify_Logging_Service.
+ *  
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef NOTIFY_SUPPLIER_H
@@ -76,7 +76,7 @@ class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSu
   //
  public:
   // = Initialization and Termination code
-  Filter_StructuredPushSupplier (ACE_ENV_SINGLE_ARG_DECL);
+  Filter_StructuredPushSupplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Constructor.
 
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index 579f37250a7..d33df0ab64e 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -1,9 +1,12 @@
-/* -*- C++ -*- $Id$ */
-
 #include "RTEvent_Consumer.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
+ACE_RCSID (RTEvent,
+           RTEvent_Consumer,
+           "$Id$")
+
+
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory"
 
@@ -77,7 +80,7 @@ Consumer::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW (CORBA::UNKNOWN ());
+        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index 2cd6efba0ea..5c908495901 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-//
+
 // ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Logging Service examples
-//
-// = FILENAME
-//   RTEvent_Consumer
-//
-// = AUTHOR
-//   D A Hanvey (d.hanvey@qub.ac.uk)
-//
+/**
+ *  @file   RTEvent_Consumer.h
+ *
+ *  $Id$
+ *
+ *  An example of using the RTEvent_Logging_Service.
+ *  The RTEvent_Consumer consumes log-generated events.
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef RTEVENT_CONSUMER_H
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 9b596af5239..d3494027503 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -1,9 +1,12 @@
-/* -*- C++ -*- $Id$ */
-
 #include "RTEvent_Supplier.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
+ACE_RCSID (RTEvent,
+           RTEvent_Supplier,
+           "$Id$")
+
+
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory"
 #define LOG_EVENT_COUNT 29
@@ -83,7 +86,7 @@ Supplier::run (int argc, char* argv[])
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
-        ACE_THROW (CORBA::UNKNOWN ());
+        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
index 7c4c3fe0385..170a98db896 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-//
+
 // ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Logging Service examples
-//
-// = FILENAME
-//   RTEvent_Supplier
-//
-// = AUTHOR
-//   D A Hanvey (d.hanvey@qub.ac.uk)
-//
+/**
+ *  @file   RTEvent_Supplier.h
+ *
+ *  $Id$
+ *
+ *  An example of using the RTEvent_Logging_Service.
+ *  
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef RTEVENT_SUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index 07ec4d59ae0..ed6fd394376 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -1,21 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   BasicLogFactory_i.h
-//
-// = DESCRIPTION
-//   Implements the Factory for BasicLog Objects.
-//
-// = AUTHOR
-//   Matthew Braun <mjb2@cs.wustl.edu>
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   BasicLogFactory_i.h
+ *
+ *  $Id$
+ *
+ *  Implementation of the DsLogAdmin::BasicLogFactory interface.
+ *
+ *
+ *  @author Matthew Braun <mjb2@cs.wustl.edu>
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *  @David A. Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
 
 #ifndef TLS_BASICLOGFACTORY_I_H
 #define TLS_BASICLOGFACTORY_I_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 8c615bcb631..0be88958a46 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -1,7 +1,4 @@
 #include "orbsvcs/Log/EventLogFactory_i.h"
-// @@ David, once you switch to a PortableServer::ServantBase_var, you
-//    won't need to include the ace/Auto_Ptr.h header.
-#include "ace/Auto_Ptr.h"
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/EventLogNotification.h"
 
@@ -81,7 +78,7 @@ EventLogFactory_i::activate (PortableServer::POA_ptr poa
                              ACE_ENV_ARG_DECL)
 {
   this->poa_ = poa;
-  this->event_channel_ = init (this->poa_.in ());
+  this->event_channel_ = init (this->poa_.in () ACE_ENV_ARG_PARAMETER);
 
   this->consumer_admin_ =
     this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -185,39 +182,25 @@ EventLogFactory_i::create_with_id (
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
 
-  // @@ David, EventLog_i is reference count.  auto_ptr<> does not
-  //    apply in this case.  Use PortableServer::ServantBase_var
-  //    instead.  Also remove the below call to _remove_ref().
-  auto_ptr<EventLog_i> event_log_auto (event_log_i);
-  // just in case the activation fails.
+  PortableServer::ServantBase_var safe_event_log_i = event_log_i;
+  //Transfer ownership to the POA.
 
   event_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
 
   //dhanvey
   //initialise the LogConsumer object
-  event_log_i->activate();
+  event_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   // Register with the poa
   event_log = event_log_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
 
-  // @@ David, once you switch from an auto_ptr<> to a
-  //    PortableServer::ServantBase_var above,  remove this
-  //    _remove_ref() call (and the ACE_CHECK_RETURN after it).
-  event_log_i->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
-
   // Add to the Hash table..
   if (hash_map_.bind (id, event_log.in ()) == -1)
     ACE_THROW_RETURN (CORBA::INTERNAL (),
                       DsEventLogAdmin::EventLog::_nil ());
 
-  // @@ David, zap this auto_ptr<>::release() call once you switch to
-  //    a PortableServer::ServantBase_var above.
-  // All is well, release the reference.
-  event_log_auto.release ();
-
   notifier_->object_creation (event_log.in (), id
                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
@@ -241,16 +224,3 @@ EventLogFactory_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 
-// @@ David, once you switch to a PortableServer::ServantBase_var, you
-//    won't need these explicit template instantations.
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr <EventLog_i>;
-template class ACE_Auto_Basic_Ptr<EventLog_i>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr <EventLog_i>
-#pragma instantiate ACE_Auto_Event_Ptr <EventLog_i>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
index beb04defb46..062a62b13ba 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -1,21 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   EventLogFactory_i.h
-//
-// = DESCRIPTION
-//   Implements the Factory for EventLog Objects.
-//
-// = AUTHOR
-//   Rob Ruff <rruff@scires.com>
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   EventLogFactory_i.h
+ *
+ *  $Id$
+ *
+ *  Implementation of the DsEventLogAdmin::EventLogFactory interface.
+ *
+ *
+ *  @author Rob Ruff <rruff@scires.com>
+ *  @David A. Hanvey <d.hanvey@qub.ac.uk>
+ *  
+ */
+//=============================================================================
 
 #ifndef TLS_EVENTLOGFACTORY_I_H
 #define TLS_EVENTLOGFACTORY_I_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 625be86575e..54ef0919f0d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -1,10 +1,13 @@
-/* -*- C++ -*- $Id$ */
-
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/EventLogNotification.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
+ACE_RCSID (Log,
+           EventLogNotification,
+           "$Id$")
+
+
 EventLogNotification::EventLogNotification (CosEventChannelAdmin::EventChannel_ptr ec)
 : LogNotification (), event_channel_ (CosEventChannelAdmin::EventChannel::_duplicate (ec))
 {
@@ -17,7 +20,7 @@ EventLogNotification::~EventLogNotification (void)
 }
 
 void
-EventLogNotification::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EventLogNotification::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -32,16 +35,17 @@ EventLogNotification::obtain_proxy_consumer()
   consumer_ = supplier_admin->obtain_push_consumer ();
 
   CosEventComm::PushSupplier_var supplier =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->_this ();
 
   consumer_->connect_push_supplier (supplier.in());
 }
 
 void
-EventLogNotification::send_notification (const CORBA::Any& any )
+EventLogNotification::send_notification (const CORBA::Any& any 
+                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  consumer_->push (any);
+  consumer_->push (any ACE_ENV_ARG_PARAMETER);
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index a1e1f49489b..42ba24e6143 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -1,20 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   EventLogNotification_i.h
-//
-// = DESCRIPTION
-//   Implementation of Log generated events for EventLog.
-//
-// = AUTHOR
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   EventLogNotification.h
+ *
+ *  $Id$
+ *
+ *  Methods to enable log-generated events.
+ *
+ *
+ *  @author D A Hanvey <d.hanvey@qub.ac.uk>
+ *   
+ *  
+ */
+//=============================================================================
 
 #ifndef TLS_EVENT_LOG_NOTIFICATION_H
 #define TLS_EVENT_LOG_NOTIFICATION_H
@@ -48,7 +47,7 @@ public:
   ~EventLogNotification (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index a95a87fa382..107e2449410 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -68,7 +68,7 @@ EventLog_i::EventLog_i (LogMgr_i &logmgr_i,
 {
   ACE_UNUSED_ARG (event_log_factory);
 
-  ACE_ENV_SINGLE_ARG_DECL
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Create an instance of the event channel.
   PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -87,34 +87,44 @@ EventLog_i::~EventLog_i ()
 
 
 DsLogAdmin::Log_ptr
-EventLog_i::copy (DsLogAdmin::LogId &id)
+EventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the log.
   DsEventLogAdmin::EventLogFactory_var eventLogFactory =
-    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
+    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ()
+                                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   DsEventLogAdmin::EventLog_var log =
-    eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id);
+    eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id
+                             ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
-  copy_attributes (log.in ());
+  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   return log._retn ();
 
 }
 
 DsLogAdmin::Log_ptr
-EventLog_i::copy_with_id (DsLogAdmin::LogId id)
+EventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the log supplying the log id.
   DsEventLogAdmin::EventLogFactory_var eventLogFactory =
-    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
+    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ()
+                                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   DsEventLogAdmin::EventLog_var log =
-    eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_);
+    eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_
+                                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
-  copy_attributes (log.in ());
+  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   return log._retn ();
 
@@ -126,7 +136,7 @@ EventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Send event to indicate the log has been deleted.
-  notifier_->object_deletion (logid_);
+  notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
 
   // Remove ourselves from the list of logs.
   this->logmgr_i_.remove (this->logid_); // check for error?
@@ -150,25 +160,16 @@ EventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EventLog_i::activate (void)
+EventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create the PushConsumer that will log the events.
-      this->my_log_consumer_ = new LogConsumer (this);
-      this->my_log_consumer_->connect (consumer_admin.in ());
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in EventLog_i::activate()");
-    }
-  ACE_ENDTRY;
+  CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
+  this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Create the PushConsumer that will log the events.
+  this->my_log_consumer_ = new LogConsumer (this);
+  ACE_CHECK;
+  this->my_log_consumer_->connect (consumer_admin.in ());
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index e9dfaaf63e7..585ec292427 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -1,20 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   EventLog_i.h
-//
-// = DESCRIPTION
-//   Implementation of the DsLogAdmin::EventLog interface.
-//
-// = AUTHOR
-//   Rob Ruff <rruff@scires.com>
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
+/**
+ *  @file   EventLog_i.h
+ *
+ *  $Id$
+ *
+ *  Implementation of the DsLogAdmin::EventLog interface.
+ *
+ * 
+ *
+ *  @author Rob Ruff <rruff@scires.com>
+ *  @D A Hanvey <d.hanvey@qub.ac.uk>
+ */
 // ============================================================================
 
 #ifndef TLS_EVENTLOG_I_H
@@ -73,16 +71,17 @@ class LogConsumer : public virtual POA_CosEventComm::PushConsumer
     EventLog_i *log_;
 };
 
-
+/**
+ * @class EventLog_i
+ *
+ * @brief EventLog_i
+ *
+ * The class supports the @c destroy> method to destroy the Log.
+ */ 
 class EventLog_i : public Log_i,
                    public POA_DsEventLogAdmin::EventLog,
                    public virtual PortableServer::RefCountServantBase
 {
-  // = TITLE
-  //   EventLog_i
-  // = DESCRIPTION
-  //   The class supports the <destroy> method to destroy the Log.
-  //
 public:
   // = Initialization and Termination.
   EventLog_i (LogMgr_i &logmgr_i,
@@ -95,14 +94,13 @@ public:
               ACE_Reactor *reactor = ACE_Reactor::instance ());
   // Constructor
 
-  ~EventLog_i ();
-  // Destructor.
-
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Duplicate the log.
 
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id
+                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Duplicate the log specifying an id.
 
@@ -112,7 +110,7 @@ public:
   // Destroy the log object and all contained records.
 
   void
-  activate (void);
+  activate (ACE_ENV_SINGLE_ARG_DECL);
 
   CosEventChannelAdmin::ConsumerAdmin_ptr
   for_consumers (ACE_ENV_SINGLE_ARG_DECL)
@@ -138,7 +136,15 @@ public:
       ));
   // Used to write records to the log.
 
-
+ protected:
+   
+   /// Destructor
+   /**
+    * Protected destructor to enforce proper memory management through
+    * reference counting.
+    */
+  ~EventLog_i ();
+ 
  protected:
   LogMgr_i &logmgr_i_;
   // Used to access the hash map that holds all the Logs created.
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 3fd4443d474..844ee82bd2b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -1,10 +1,13 @@
-/* -*- C++ -*- $Id$ */
-
 #include "Iterator_i.h"
 #include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
 #include "orbsvcs/DsLogAdminC.h"
 
+ACE_RCSID (Log,
+           Iterator_i,
+           "$Id$")
+
+
 Iterator_i::Iterator_i (LogRecordStore::LOG_RECORD_STORE &store,
                         CORBA::ULong start,
                         const char *constraint,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 6b2405341e0..70d392eb658 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Iterator_i.h
-//
-// = DESCRIPTION
-//   Implementation of the DsLogAdmin::Iterator interface.
-//
-// = AUTHOR
-//   Matthew Braun <mjb2@cs.wustl.edu>
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Iterator_i.h
+ *
+ *  $Id$
+ *
+ *  Implementation of the DsLogAdmin::Iterator interface.
+ *
+ *
+ *  @author Matthew Braun <mjb2@cs.wustl.edu>
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *  
+ */
+//=============================================================================
 
 #ifndef TLS_ITERATOR_H
 #define TLS_ITERATOR_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index f0be3bfbc1b..95e053baa26 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -1,7 +1,9 @@
-/* -*- C++ -*- $Id$ */
-
 #include "LogMgr_i.h"
 
+ACE_RCSID (Log,
+           LogMgr_i,
+           "$Id$")
+
 LogMgr_i::LogMgr_i (void)
 {
   // No-Op.
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index 353f3854b11..7337905eb3a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -1,22 +1,18 @@
-/* -*- C++ -*- */
-// $Id$
+// -*- C++ -*-
 
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   LogMgr_i.h
-//
-// = DESCRIPTION
-//   Implementation of the LogManager i,e DsLogAdmin::LogMgr interface.
-//
-// = AUTHOR
-//    Matthew Braun <mjb2@cs.wustl.edu>
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//    D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   LogMgr_i.h
+ *
+ *  $Id$
+ *
+ *  Implementation of the DsLogAdmin::LogMgr interface.
+ *
+ *  @author Matthew Braun <mjb2@cs.wustl.edu>
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
 
 #ifndef TLS_LOGMGR_I_H
 #define TLS_LOGMGR_I_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index f32b47be622..54cf493d809 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -1,10 +1,13 @@
-/* -*- C++ -*- $Id$ */
-
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Log/LogRecordStore.h"
 #include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
 
+ACE_RCSID (Log,
+           LogRecordStore,
+           "$Id$")
+
+
 LogRecordStore::LogRecordStore (CORBA::ULongLong max_size,
                                 DsLogAdmin::LogId logid,
                                 CORBA::ULong max_rec_list_len)
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 974ecd7891e..1db840f4605 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -1,24 +1,19 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   LogRecordStore.h
-//
-// = DESCRIPTION
-//   This file declares the tools used to provide the store of
-//   DsLogAdmin::LogRecords for the Telecom Logging_Service
-//
-// = AUTHORS
-//   Matthew Braun <mjb2@cs.wustl.edu>
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   LogRecordStore.h
+ *
+ *  $Id$
+ *
+ *  This file declares the tools used to provide the store of
+ *  DsLogAdmin::LogRecords for the Telecom Logging_Service
+ *
+ *  @author Matthew Braun <mjb2@cs.wustl.edu>
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
 
 #ifndef LOG_RECORD_STORE_H
 #define LOG_RECORD_STORE_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
index 48d6b330693..683c6884ce8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
@@ -1,10 +1,13 @@
-/* -*- C++ -*- $Id$ */
-
-#include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Log/LogRecordStore.h"
+#include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
 
+ACE_RCSID (Log,
+           LogRecordStore_persist,
+           "$Id$")
+
+
 LogRecordStore::LogRecordStore (CORBA::ULongLong max_size,
                                 DsLogAdmin::LogId logid,
                                 CORBA::ULong max_rec_list_len)
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
index 08f7d281601..960ed3dab97 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
@@ -1,24 +1,21 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   LogRecordStore.h
-//
-// = DESCRIPTION
-//   This file declares the tools used to provide the store of
-//   DsLogAdmin::LogRecords for the Telecom Logging_Service
-//
-// = AUTHORS
-//   Matthew Braun <mjb2@cs.wustl.edu>
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   LogRecordStore_persist.h
+ *
+ *  $Id$
+ *
+ *  This file declares the tools used to provide the store of
+ *  DsLogAdmin::LogRecords for the Telecom Logging_Service
+ *  NOTE : This file is not built - It is included as a possible example
+ *         of how to add basic flat file persistence.
+ *
+ *  @author Matthew Braun <mjb2@cs.wustl.edu>
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
 
 #ifndef LOG_RECORD_STORE_H
 #define LOG_RECORD_STORE_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index 05d53a7aae7..7311f1fc4a9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -1,9 +1,10 @@
-/* -*- C++ -*- $Id$ */
-
 #include "Log_Constraint_Interpreter.h"
 #include "Log_Constraint_Visitors.h"
 
-ACE_RCSID(Log, Log_Constraint_Interpreter, "$Id$")
+ACE_RCSID (Log,
+           Log_Constraint_Interpreter,
+           "$Id$")
+
 
 TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
     const char *constraints
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index c4736403f52..40e37be29f4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Log_Constraint_Interpreter.h
-//
-// = DESCRIPTION
-//
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu> 
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Log_Constraint_Interpreter.h
+ *
+ *  $Id$
+ *
+ *  
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *  @author D A Hanvey <d.hanvey@qub.ac.uk>
+ *  
+ */
+//=============================================================================
 
 #ifndef TAO_LOG_CONSTRAINT_INTERPRETER_H
 #define TAO_LOG_CONSTRAINT_INTERPRETER_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
index d3987329168..e5d4d99dae7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
@@ -1,23 +1,20 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Log_Constraint_Visitors.h
-//
-// = DESCRIPTION
-//
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//   Jeff Parsons <parsons@cs.wustl.edu>
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ==========================================================================
+
+//=============================================================================
+/**
+ *  @file   Log_Constraint_Visitors.h
+ *
+ *  $Id$
+ *
+ *  
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ *  @author D A Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
+
 
 #ifndef LOG_CONSTRAINT_VISITORS_H
 #define LOG_CONSTRAINT_VISITORS_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index e554ca213f0..c70248da049 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- * Implementation of the DsLogAdmin::Log interface.
+ *  Implementation of the DsLogAdmin::Log interface.
  *
  *  @author Matthew Braun <mjb2@cs.wustl.edu>
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index b480f20e14c..77a33c3f2bd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -1,20 +1,22 @@
-/* -*- C++ -*- $Id$ */
-
 #include "orbsvcs/Log/NotifyLogFactory_i.h"
-#include "ace/Auto_Ptr.h"
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/NotifyLogNotification.h"
 
-const char *ior_output_file = "ec.ior";
+ACE_RCSID (Log,
+           NotifyLogFactory_i,
+           "$Id$")
+
 
 NotifyLogFactory_i::NotifyLogFactory_i (void)
 {
   // No-Op.
 }
 
-NotifyLogFactory_i::NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf ACE_ENV_ARG_DECL)
+NotifyLogFactory_i::NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf)
 : notify_factory_ (ecf)
 {
+  ACE_DECLARE_NEW_CORBA_ENV;  
+
   CosNotifyChannelAdmin::ChannelID id;
   CosNotifyChannelAdmin::AdminID adminID = 0;
   CosNotification::QoSProperties initial_qos;
@@ -50,7 +52,7 @@ NotifyLogFactory_i::~NotifyLogFactory_i()
 }
 
 DsNotifyLogAdmin::NotifyLogFactory_ptr
-NotifyLogFactory_i::activate (PortableServer::POA_ptr poa//,
+NotifyLogFactory_i::activate (PortableServer::POA_ptr poa
                            ACE_ENV_ARG_DECL)
 {
   DsNotifyLogAdmin::NotifyLogFactory_var v_return;
@@ -170,33 +172,28 @@ NotifyLogFactory_i::create_with_id (
 
   ACE_CHECK_RETURN (notify_log._retn ());
 
-  auto_ptr<NotifyLog_i> notify_log_auto (notify_log_i);
-  // just in case the activation fails.
+  PortableServer::ServantBase_var safe_notify_log_i = notify_log_i;
+  // Transfer ownership to the POA.
 
   notify_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (notify_log._retn ());
 
   //initialise the LogConsumer object
-  notify_log_i->activate();
+  notify_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   // Register with the poa
   notify_log = notify_log_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (notify_log._retn ());
 
-  notify_log_i->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
-
-  // widening a BasicLog_var to a Log_var.
-  DsLogAdmin::Log_var log = DsNotifyLogAdmin::NotifyLog::_duplicate(notify_log.in ());
-
   // Add to the Hash table..
-  if (hash_map_.bind (id, log) == -1)
+  if (hash_map_.bind (id, notify_log.in ()) == -1)
     ACE_THROW_RETURN (CORBA::INTERNAL (),
                       DsNotifyLogAdmin::NotifyLog::_nil ());
 
-  // All is well, release the reference.
-  notify_log_auto.release ();
-  notifier_->object_creation (ACE_static_cast(DsLogAdmin::Log*, log.in ()), id);
+  notifier_->object_creation (notify_log.in (),
+                              id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
+
   return notify_log._retn ();
 }
 
@@ -206,7 +203,7 @@ NotifyLogFactory_i::MyID (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->MyID();
+  return consumer_admin_->MyID (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr 
@@ -215,7 +212,7 @@ NotifyLogFactory_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  throw CORBA_NO_IMPLEMENT();
+  ACE_THROW_RETURN (CORBA_NO_IMPLEMENT(), 0);
 }
 
 CosNotifyChannelAdmin::InterFilterGroupOperator 
@@ -224,7 +221,7 @@ NotifyLogFactory_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->MyOperator();
+  return consumer_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyFilter::MappingFilter_ptr 
@@ -233,7 +230,7 @@ NotifyLogFactory_i::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->priority_filter();
+  return consumer_admin_->priority_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
@@ -242,7 +239,7 @@ NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filter A
       CORBA::SystemException
     ))
 {
-  consumer_admin_->priority_filter(filter);
+  consumer_admin_->priority_filter(filter ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::MappingFilter_ptr 
@@ -251,7 +248,7 @@ NotifyLogFactory_i::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->lifetime_filter();
+  return consumer_admin_->lifetime_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
@@ -260,7 +257,7 @@ NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filter A
       CORBA::SystemException
     ))
 {
-  consumer_admin_->lifetime_filter(filter);
+  consumer_admin_->lifetime_filter (filter ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq* 
@@ -269,7 +266,7 @@ NotifyLogFactory_i::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->pull_suppliers();
+  return consumer_admin_->pull_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq* 
@@ -278,7 +275,7 @@ NotifyLogFactory_i::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->push_suppliers();
+  return consumer_admin_->push_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr 
@@ -289,7 +286,7 @@ NotifyLogFactory_i::get_proxy_supplier (
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->get_proxy_supplier(proxy_id);
+  return consumer_admin_->get_proxy_supplier (proxy_id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr 
@@ -301,7 +298,7 @@ NotifyLogFactory_i::obtain_notification_pull_supplier (
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->obtain_notification_pull_supplier(ctype, proxy_id);
+  return consumer_admin_->obtain_notification_pull_supplier (ctype, proxy_id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr 
@@ -313,7 +310,7 @@ NotifyLogFactory_i::obtain_notification_push_supplier (
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->obtain_notification_push_supplier(ctype, proxy_id);
+  return consumer_admin_->obtain_notification_push_supplier (ctype, proxy_id ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -321,27 +318,27 @@ NotifyLogFactory_i::obtain_notification_push_supplier (
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr 
 NotifyLogFactory_i::obtain_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  return consumer_admin_->obtain_push_supplier();
+  return consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr 
 NotifyLogFactory_i::obtain_pull_supplier (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 
 {
-  return consumer_admin_->obtain_pull_supplier();
+  return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -363,7 +360,7 @@ NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq& ad
       CORBA::SystemException
     ))
 {
-  consumer_admin_->subscription_change(added, removed);
+  consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties* 
@@ -372,7 +369,7 @@ NotifyLogFactory_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
           CORBA::SystemException
         ))
 {
-  return consumer_admin_->get_qos();
+  return consumer_admin_->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
@@ -382,7 +379,7 @@ NotifyLogFactory_i::set_qos (const CosNotification::QoSProperties& qos ACE_ENV_A
       CORBA::SystemException
     ))
 {
-  consumer_admin_->set_qos(qos);
+  consumer_admin_->set_qos (qos ACE_ENV_ARG_PARAMETER);
 }
 
 void 
@@ -394,7 +391,7 @@ NotifyLogFactory_i::validate_qos (const CosNotification::QoSProperties& required
       CORBA::SystemException
     ))
 {
-  consumer_admin_->validate_qos(required_qos, available_qos);
+  consumer_admin_->validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterID 
@@ -403,7 +400,7 @@ NotifyLogFactory_i::add_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_D
           CORBA::SystemException
         ))
 {
-  return consumer_admin_->add_filter(filter);
+  return consumer_admin_->add_filter (filter ACE_ENV_ARG_PARAMETER);
 }
 
 void 
@@ -412,7 +409,7 @@ NotifyLogFactory_i::remove_filter (CosNotifyFilter::FilterID id ACE_ENV_ARG_DECL
           CORBA::SystemException
         ))
 {
-  consumer_admin_->remove_filter(id);
+  consumer_admin_->remove_filter (id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::Filter_ptr 
@@ -422,7 +419,7 @@ NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id ACE_ENV_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->get_filter(id);
+  return consumer_admin_->get_filter (id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterIDSeq* 
@@ -431,7 +428,7 @@ NotifyLogFactory_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
           CORBA::SystemException
         ))
 {
-  return consumer_admin_->get_all_filters();
+  return consumer_admin_->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
@@ -440,7 +437,7 @@ NotifyLogFactory_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
           CORBA::SystemException
         ))
 {
-  consumer_admin_->remove_all_filters();
+  consumer_admin_->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index 5789ea42d86..0dc66acbdb9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -1,20 +1,17 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   NotifyLogFactory_i.h
-//
-// = DESCRIPTION
-//   Implements the Factory for NotifyLog Objects.
-//
-// = AUTHOR
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   NotifyLogFactory_i.h
+ *
+ *  $Id$
+ *
+ *  Implements the Factory for NotifyLog Objects.
+ *  
+ *
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
 
 #ifndef TLS_NOTIFYLOGFACTORY_I_H
 #define TLS_NOTIFYLOGFACTORY_I_H
@@ -53,7 +50,7 @@ public:
   NotifyLogFactory_i (void);
   // Ctor
 
-  NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf ACE_ENV_ARG_DECL);
+  NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf);
 
   ~NotifyLogFactory_i ();
   // Dtor
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index 5092f791477..a591946e816 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -1,14 +1,18 @@
-/* -*- C++ -*- $Id$ */
-
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/NotifyLogNotification.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
+ACE_RCSID (Log,
+           NotifyLogNotification,
+           "$Id$")
+
+
 NotifyLogNotification::NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr ec)
 : LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
 {
-
+  ACE_DECLARE_NEW_CORBA_ENV;
+  
   CosNotifyComm::PushSupplier_var objref =
     this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -67,7 +71,7 @@ NotifyLogNotification::subscription_change
 
 void
 NotifyLogNotification::disconnect_push_supplier
-   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
index 4f18e3125df..797edf90760 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -1,20 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   NotifyLogNotification_i.h
-//
-// = DESCRIPTION
-//   Implementation of Log generated events for NotifyLog.
-//
-// = AUTHOR
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   NotifyLogNotification.h
+ *
+ *  $Id$
+ *
+ *  Methods to enable log-generated events.
+ *
+ *
+ *  @author D A Hanvey <d.hanvey@qub.ac.uk>
+ *   
+ *  
+ */
+//=============================================================================
 
 #ifndef TLS_NOTIFY_LOG_NOTIFICATION_H
 #define TLS_NOTIFY_LOG_NOTIFICATION_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index b325a37ec8f..4a3ec86fd6b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -1,9 +1,12 @@
-/* -*- C++ -*- $Id$ */
-
 #include "orbsvcs/Log/NotifyLog_i.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 
+ACE_RCSID (Log,
+           NotifyLog_i,
+           "$Id$")
+
+
 #define CA_FILTER "threshold > 10"
 #define TCL_GRAMMAR "TCL"
 
@@ -19,7 +22,7 @@ LogConsumer::~LogConsumer (void)
 }
 
 void
-LogConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
+LogConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
@@ -70,7 +73,7 @@ LogConsumer::offer_change
 void
 LogConsumer::push_structured_event
    (const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -116,9 +119,9 @@ NotifyLog_i::NotifyLog_i (LogMgr_i &logmgr_i,
   : Log_i (factory, id, log_notifier, log_full_action, max_size, reactor),
   logmgr_i_(logmgr_i), notify_factory_ (CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf))
 {
- ACE_UNUSED_ARG (notify_log_factory);
+  ACE_UNUSED_ARG (notify_log_factory);
 
-  ACE_ENV_SINGLE_ARG_DECL
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   CosNotifyChannelAdmin::ChannelID channel_id;
 
@@ -141,43 +144,47 @@ NotifyLog_i::~NotifyLog_i ()
 }
 
 DsLogAdmin::Log_ptr 
-NotifyLog_i::copy (DsLogAdmin::LogId &id)
+NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
-    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ());
+    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
-  CosNotification::QoSProperties* qos = get_qos ();
-  CosNotification::AdminProperties* admin = get_admin ();
+  CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   DsNotifyLogAdmin::NotifyLog_var log = 
     notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, ACE_static_cast(const CosNotification::QoSProperties, *qos),
 			       ACE_static_cast(const CosNotification::AdminProperties, *admin), id);
 
-  copy_attributes (log.in ());
+  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   return log._retn ();
 }
 
 DsLogAdmin::Log_ptr 
-NotifyLog_i::copy_with_id (DsLogAdmin::LogId id)
+NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
-    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ());
+    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
-  CosNotification::QoSProperties* qos = get_qos ();
-  CosNotification::AdminProperties* admin = get_admin ();
+  CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   DsNotifyLogAdmin::NotifyLog_var log = 
     notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, ACE_static_cast(const CosNotification::QoSProperties, *qos),
 			       ACE_static_cast(const CosNotification::AdminProperties, *admin));
 
-  copy_attributes (log.in ());
+  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   return log._retn ();
 }
@@ -187,7 +194,7 @@ void
 NotifyLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  notifier_->object_deletion (logid_);
+  notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
   // Remove ourselves from the list of logs.
   this->logmgr_i_.remove (this->logid_); // check for error?
 
@@ -207,9 +214,8 @@ NotifyLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-NotifyLog_i::activate (void)
+NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_ENV_SINGLE_ARG_DECL
 
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = 
@@ -258,7 +264,7 @@ NotifyLog_i::activate (void)
                     LogConsumer (this),
                     CORBA::NO_MEMORY ()); 
 
-  this->my_log_consumer_->connect (this->consumer_admin_.in ());         
+  this->my_log_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);         
 }
 
 //IDL to C++
@@ -269,9 +275,7 @@ NotifyLog_i::get_filter (ACE_ENV_SINGLE_ARG_DECL)
     ))
 {  
   //TODO: need to add impl
-  //dummy impl to get it to compile
-  CosNotifyFilter::Filter_ptr filter;
-  return filter;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 void
@@ -282,6 +286,8 @@ NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL)
 {
   ACE_UNUSED_ARG (filter);
 
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
+
   //TODO: need to add impl
 }
 
@@ -292,9 +298,7 @@ NotifyLog_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
     ))
 {
   //TODO: need to add impl
-  //dummy impl to compile
-  CosNotifyChannelAdmin::EventChannelFactory_ptr ecf;
-  return ecf;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
@@ -303,7 +307,7 @@ NotifyLog_i::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->default_consumer_admin();
+  return this->event_channel_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
@@ -312,7 +316,7 @@ NotifyLog_i::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->default_supplier_admin();
+  return this->event_channel_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterFactory_ptr
@@ -321,7 +325,7 @@ NotifyLog_i::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->default_filter_factory();
+  return this->event_channel_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
@@ -331,7 +335,7 @@ NotifyLog_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->new_for_consumers(op,id);
+  return this->event_channel_->new_for_consumers (op,id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
@@ -341,7 +345,7 @@ NotifyLog_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator
       CORBA::SystemException
     ))
 {  
-  return this->event_channel_->new_for_suppliers(op,id);
+  return this->event_channel_->new_for_suppliers (op,id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
@@ -351,7 +355,7 @@ NotifyLog_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DE
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_consumeradmin(id);
+  return this->event_channel_->get_consumeradmin (id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
@@ -361,7 +365,7 @@ NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DE
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_supplieradmin(id);
+  return this->event_channel_->get_supplieradmin (id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
@@ -369,8 +373,8 @@ NotifyLog_i::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
-{
-  return this->event_channel_->get_all_consumeradmins();
+{ 
+  return this->event_channel_->get_all_consumeradmins (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
@@ -379,7 +383,7 @@ NotifyLog_i::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_all_supplieradmins();
+  return this->event_channel_->get_all_supplieradmins (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotification::AdminProperties*
@@ -388,7 +392,7 @@ NotifyLog_i::get_admin (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_admin();
+  return this->event_channel_->get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -398,7 +402,7 @@ NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin ACE_ENV_AR
       CORBA::SystemException
     ))
 {
-  this->event_channel_->set_admin(admin);
+  this->event_channel_->set_admin (admin ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties*
@@ -408,8 +412,7 @@ NotifyLog_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
     ))
 {
   //need to add merging of QoS from Log_i and EventChannel_i
-  CosNotification::QoSProperties* temp;
-  return temp;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 void
@@ -421,6 +424,7 @@ NotifyLog_i::set_qos (const CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL
 {
   ACE_UNUSED_ARG (qos);
 
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
   //TODO: need to add later
 }
 
@@ -436,6 +440,8 @@ NotifyLog_i::validate_qos (const CosNotification::QoSProperties& required_qos,
  
   ACE_UNUSED_ARG (available_qos);
 
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
+
   //TODO: need to add later
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 5491849c90d..98b32b57eb2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -1,20 +1,17 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   NotifyLog_i.h
-//
-// = DESCRIPTION
-//   Implementation of the DsNotifyLogAdmin::NotifyLog interface.
-//
-// = AUTHOR
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   NotifyLog_i.h
+ *
+ *  $Id$
+ *
+ *  Implementation of the DsNotifyLogAdmin::NotifyLog interface.
+ *  
+ *
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
 
 #ifndef TLS_NOTIFYLOG_I_H
 #define TLS_NOTIFYLOG_I_H
@@ -119,12 +116,12 @@ public:
   ~NotifyLog_i ();
   // Destructor.
 
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -135,7 +132,7 @@ public:
   // Destroy the log object and all contained records.
 
   void
-  activate (void);
+  activate (ACE_ENV_SINGLE_ARG_DECL);
 
   //IDL to C++
   CosNotifyFilter::Filter_ptr
@@ -144,7 +141,7 @@ public:
       CORBA::SystemException
     ));
 
-  void set_filter (CosNotifyFilter::Filter_ptr filter)
+  void set_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
index 59c48843da4..2a27f32b64b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
@@ -1,7 +1,10 @@
-/* -*- C++ -*- $Id$ */
-
-#include "orbsvcs/Time_Utilities.h"
 #include "PersistStore.h"
+#include "orbsvcs/Time_Utilities.h"
+
+ACE_RCSID (Log,
+           PersistStore,
+           "$Id$")
+
 
 PersistStore::PersistStore (CORBA::ULongLong max_size,
                                 CORBA::ULong max_rec_list_len)
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
index eee4a06b1bd..9acd4342203 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
@@ -1,23 +1,17 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   PersistStore.h
-//
-// = DESCRIPTION
-//    This flat file demonstrates basic persistence.
-//    
-//
-// = AUTHORS
-//   Rob Ruff <rruff@scires.com>
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   PersistStore.h
+ *
+ *  $Id$
+ *
+ *  This flat file demonstrates basic persistence.
+ *  
+ *  @author Rob Ruff <rruff@scires.com>
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
 
 #ifndef PERSIST_STORE_H
 #define PERSIST_STORE_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index 921f338b032..feac2831cc1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -1,7 +1,4 @@
-/* -*- C++ -*- $Id$ */
-
 #include "orbsvcs/Log/RTEventLogFactory_i.h"
-#include "ace/Auto_Ptr.h"
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/RTEventLogNotification.h"
 #include "orbsvcs/Event/EC_ConsumerAdmin.h"
@@ -23,6 +20,12 @@
 #include "orbsvcs/Event/EC_ConsumerAdmin.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID (Log,
+           RTEventLogFactory_i,
+           "$Id$")
+
+
+
 RTEventLogFactory_i::RTEventLogFactory_i (void)
 : poa_ (PortableServer::POA::_nil ()),
 naming_ (CosNaming::NamingContext::_nil ())
@@ -91,7 +94,7 @@ RTEventLogFactory_i::init (PortableServer::POA_ptr poa,
   // uncomment this if we want to use the parent poa for some reason.
 
   PortableServer::POA_var defPOA = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  ACE_CHECK_RETURN (-1);
 
   TAO_EC_Event_Channel_Attributes attr (defPOA.in (), defPOA.in ());
 
@@ -99,22 +102,22 @@ RTEventLogFactory_i::init (PortableServer::POA_ptr poa,
   ACE_NEW_THROW_EX (impl,
                     TAO_EC_Event_Channel (attr),
                     CORBA::NO_MEMORY ());
-  ACE_TRY_CHECK;
+  ACE_CHECK_RETURN (-1);
 
   auto_ptr <TAO_EC_Event_Channel> ec (impl);
 
   impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  ACE_CHECK_RETURN (-1);
 
   PortableServer::ObjectId_var oidec = poa_->activate_object (ec.get ()
                                        ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  ACE_CHECK_RETURN (-1);
 
   ec.release ();
 
   CORBA::Object_var objec =
     poa_->id_to_reference (oidec.in () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  ACE_CHECK_RETURN (-1);
 
   this->event_channel_ = RtecEventChannelAdmin::EventChannel::_narrow (objec.in ());
 
@@ -128,29 +131,29 @@ RTEventLogFactory_i::init (PortableServer::POA_ptr poa,
 }
 
 RTEventLogAdmin::EventLogFactory_ptr
-RTEventLogFactory_i::activate (PortableServer::POA_ptr poa//,
+RTEventLogFactory_i::activate (PortableServer::POA_ptr poa
                            ACE_ENV_ARG_DECL)
 {
   RTEventLogAdmin::EventLogFactory_var v_return;
 
   PortableServer::ObjectId_var oid =
-    poa->activate_object (this//,
+    poa->activate_object (this
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (v_return._retn ());
 
   CORBA::Object_var obj =
-    poa->id_to_reference (oid.in ()//,
+    poa->id_to_reference (oid.in ()
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (v_return._retn ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in ()//,
+    DsLogAdmin::LogMgr::_narrow (obj.in ()
                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (v_return._retn ());
 
   v_return =
-    RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()//,
+    RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (RTEventLogAdmin::EventLogFactory::_nil ());
 
@@ -162,7 +165,7 @@ RTEventLogFactory_i::create (
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_rec_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
-        DsLogAdmin::LogId_out id//,
+        DsLogAdmin::LogId_out id
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
@@ -178,7 +181,7 @@ RTEventLogFactory_i::create (
     this->create_with_id (this->max_id_,
                           full_action,
                           max_rec_size,
-                          thresholds//,
+                          thresholds
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
 
@@ -198,7 +201,7 @@ RTEventLogFactory_i::create_with_id (
         DsLogAdmin::LogId id,
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_size,
-        const DsLogAdmin::CapacityAlarmThresholdList & thresholds//,
+        const DsLogAdmin::CapacityAlarmThresholdList & thresholds
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
@@ -233,34 +236,27 @@ RTEventLogFactory_i::create_with_id (
 
   ACE_CHECK_RETURN (event_log._retn ());
 
-  auto_ptr<RTEventLog_i> event_log_auto (event_log_i);
-  // just in case the activation fails.
+  PortableServer::ServantBase_var safe_event_log_i = event_log_i;
+  // Transfer ownership to POA.  
 
   event_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (event_log._retn ());
 
   //initialise the LogConsumer object
-  event_log_i->activate();
+  event_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   // Register with the poa
   event_log = event_log_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (event_log._retn ());
 
-  event_log_i->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
-
-  // widening a BasicLog_var to a Log_var.
-  DsLogAdmin::Log_var log = RTEventLogAdmin::EventLog::_duplicate(event_log.in ());
-
   // Add to the Hash table..
-  if (hash_map_.bind (id, log) == -1)
+  if (hash_map_.bind (id, event_log.in ()) == -1)
     ACE_THROW_RETURN (CORBA::INTERNAL (),
                       RTEventLogAdmin::EventLog::_nil ());
 
-  // All is well, release the reference.
-  event_log_auto.release ();
-
-  notifier_->object_creation (ACE_static_cast(DsLogAdmin::Log*, log.in ()), id);
+  notifier_->object_creation (event_log.in (),
+                              id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
 
   return event_log._retn ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index 511d7a956a6..28258d45d7d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -1,20 +1,17 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   RTEventLogFactory_i.h
-//
-// = DESCRIPTION
-//   Implements the Factory for RTEventLog Objects.
-//
-// = AUTHOR
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   RTEventLogFactory_i.h
+ *
+ *  $Id$
+ *
+ *  Implements the Factory for NotifyLog Objects.
+ *  
+ *
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
 
 #ifndef TLS_RTEVENTLOGFACTORY_I_H
 #define TLS_RTEVENTLOGFACTORY_I_H
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index aea7510defe..765aff04015 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- $Id$ */
-
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/RTEventLogNotification.h"
 #include "orbsvcs/Time_Utilities.h"
@@ -20,10 +18,17 @@
 #include "orbsvcs/ESF/ESF_RefCount_Guard.h"
 #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
+ACE_RCSID (Log,
+           RTEventLogNotification,
+           "$Id$")
+
+
 RTEventLogNotification::RTEventLogNotification (RtecEventChannelAdmin::EventChannel_ptr ec)
 : LogNotification (), event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
 {
-  obtainProxyConsumer ();
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  obtainProxyConsumer (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 RTEventLogNotification::~RTEventLogNotification (void)
@@ -39,7 +44,7 @@ RTEventLogNotification::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_US
 }
 
 void
-RTEventLogNotification::obtainProxyConsumer()
+RTEventLogNotification::obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL)
 {  
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = 
     event_channel_->for_suppliers();
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
index c895eaeef0c..bbee6238439 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -1,20 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   RTEventLogNotification_i.h
-//
-// = DESCRIPTION
-//   Implementation of Log generated events for RTEventLog.
-//
-// = AUTHOR
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   RTEventLogNotification.h
+ *
+ *  $Id$
+ *
+ *  Methods to enable log-generated events.
+ *
+ *
+ *  @author D A Hanvey <d.hanvey@qub.ac.uk>
+ *   
+ *  
+ */
+//=============================================================================
 
 #ifndef TLS_RTEVENT_LOG_NOTIFICATION_H
 #define TLS_RTEVENT_LOG_NOTIFICATION_H
@@ -60,7 +59,7 @@ public:
 protected:
   // = Helper methods
 
-  void obtainProxyConsumer ();
+  void obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL);
 
   virtual void send_notification (const CORBA::Any& any)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index b91be58a68f..27e550e7dd0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -1,10 +1,7 @@
-/* -*- C++ -*- $Id$ */
-
 #include "orbsvcs/Log/RTEventLog_i.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/orbsvcs/Event_Utilities.h"
-
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "orbsvcs/Event/EC_Dispatching.h"
@@ -16,6 +13,11 @@
 #include "orbsvcs/Event/EC_SupplierControl.h"
 #include "ace/Dynamic_Service.h"
 
+ACE_RCSID (Log,
+           RTEventLog_i,
+           "$Id$")
+
+
 LogConsumer::LogConsumer (RTEventLog_i *log)
 : log_ (log)
 {
@@ -76,7 +78,7 @@ RTEventLog_i::RTEventLog_i (LogMgr_i &logmgr_i,
 {
   ACE_UNUSED_ARG (event_log_factory);
 
-  ACE_ENV_SINGLE_ARG_DECL
+  ACE_DECLARE_NEW_CORBA_ENV;
   
   PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 
@@ -94,32 +96,40 @@ RTEventLog_i::~RTEventLog_i ()
 
 
 DsLogAdmin::Log_ptr 
-RTEventLog_i::copy (DsLogAdmin::LogId &id)
+RTEventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTEventLogAdmin::EventLogFactory_var eventLogFactory =
-    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
+    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   RTEventLogAdmin::EventLog_var log = 
-    eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id);
+    eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_,
+                             id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
-  copy_attributes (log.in ());
+  copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   return log._retn ();
 
 }
 
 DsLogAdmin::Log_ptr 
-RTEventLog_i::copy_with_id (DsLogAdmin::LogId id)
+RTEventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException))
 {
   RTEventLogAdmin::EventLogFactory_var eventLogFactory =
-    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
+    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   RTEventLogAdmin::EventLog_var log = 
-    eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_);
+    eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0,
+                                     thresholds_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
-  copy_attributes (log.in ());
+  copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   return log._retn ();
 }
@@ -129,7 +139,7 @@ RTEventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  notifier_->object_deletion (logid_);
+  notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
 
   // Remove ourselves from the list of logs.
   this->logmgr_i_.remove (this->logid_); // check for error?
@@ -150,10 +160,8 @@ RTEventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-RTEventLog_i::activate (void)
+RTEventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_ENV_SINGLE_ARG_DECL
-
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index 0900ed0d573..7167eda7743 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -1,20 +1,17 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   RTEventLog_i.h
-//
-// = DESCRIPTION
-//   Implementation of the RTLogAdmin::EventLog interface.
-//
-// = AUTHOR
-//   D A Hanvey <d.hanvey@qub.ac.uk>
-//
-// ============================================================================
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   RTEventLog_i.h
+ *
+ *  $Id$
+ *
+ *  Implementation of the RTEventLogAdmin::NotifyLog interface.
+ *  
+ *
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ */
+//=============================================================================
 
 #ifndef TLS_RTEVENTLOG_I_H
 #define TLS_RTEVENTLOG_I_H
@@ -92,10 +89,10 @@ public:
   ~RTEventLog_i ();
   // Destructor.
 
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException));
 
   void
@@ -104,7 +101,7 @@ public:
   // Destroy the log object and all contained records.
 
   void
-  activate (void);
+  activate (ACE_ENV_SINGLE_ARG_DECL);
 
   RtecEventChannelAdmin::ConsumerAdmin_ptr 
   for_consumers (ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 69a080b3f56..f85e36e5cc9 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- $Id$ */
-
 #include "Basic_Log_Test.h"
 
 #include "orbsvcs/Time_Utilities.h"
@@ -12,7 +10,9 @@
 
 #include <assert.h>
 
-ACE_RCSID(Logger, BasicLog_Test, "BasicLog_Test.cpp,v 1.10 2001/06/25 19:54:32 oci Exp")
+ACE_RCSID (Basic_Log_Test,
+           Basic_Log_Test,
+           "$Id$")
 
 const char* BasicLog_Test::basic_log_factory_name_="BasicLogFactory";
 const char* BasicLog_Test::naming_sevice_name_="NameService";
@@ -273,7 +273,7 @@ int BasicLog_Test::display_records ()
 
 }
 */
-int BasicLog_Test::write_records(CORBA::ULongLong numberOfRecords ACE_ENV_ARG_DECL)
+int BasicLog_Test::write_records(CORBA::ULongLong numberOfRecords ACE_ENV_ARG_DECL_NOT_USED)
 {
   CORBA::ULongLong numOfRecs = numberOfRecords;
   if (numOfRecs == 0)
@@ -638,6 +638,8 @@ int BasicLog_Test::delete_records (CORBA::ULongLong numberOfRecords)
 {
   ACE_UNUSED_ARG (numberOfRecords);
 
+  ACE_DECLARE_NEW_CORBA_ENV;
+
 #ifndef ACE_LACKS_LONGLONG_T
   ACE_DEBUG((LM_INFO," before delete -- curr size %Q, max %Q\n",
              basicLog_->get_current_size(), basicLog_->get_max_size()));
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index e803879881e..f7784de2754 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-//
+
 // ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Telecom Log Service tests
-//
-// = FILENAME
-//   Basic_Log_Test
-//
-// = AUTHOR
-//   D A Hanvey (d.hanvey@qub.ac.uk)
-//
+/**
+ *  @file   Basic_Log_Test.h
+ *
+ *  $Id$
+ *
+ *  An test of using the Basic_Logging_Service
+ *
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
 // ============================================================================
 
 #ifndef _BASILOG_TEST_H
@@ -118,7 +118,7 @@ private:
     parse_args();
   // command line argument parser
 
-  int write_records(CORBA::ULongLong numberOfRecordsToWrite ACE_ENV_ARG_DECL);
+  int write_records(CORBA::ULongLong numberOfRecordsToWrite ACE_ENV_ARG_DECL_NOT_USED);
   // writes enough records to fill the log. Default write enough to fill log. Hopefully, not infinite.
 
   void
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
index 8e43cf7f64c..b4e502e7820 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
@@ -1,7 +1,9 @@
-/* -*- C++ -*- $Id$ */
-
 #include "Basic_Log_Test.h"
 
+ACE_RCSID (Basic_Log_Test,
+           client,
+           "$Id$")
+
 int
 main(int argc, char *argv[])
 {