ChangeLogTag: Mon Jun 13 18:00:05 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>

962 files changed, 6136 insertions, 25183 deletions

diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index c0e7641448b..a4b5d883089 100644
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -1,22 +1,19 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage
-//
-// = FILENAME
-//    Connection_Manager.h
-//
-// = DESCRIPTION
-//    This is a helper class that allows the senders bind to multiple
-//    receivers and receivers to bind to senders. It also lets the
-//    senders and receivers disconnect streams.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Connection_Manager.h
+ *
+ *  $Id$
+ *
+ *  This is a helper class that allows the senders bind to multiple
+ *  receivers and receivers to bind to senders. It also lets the
+ *  senders and receivers disconnect streams.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -30,51 +27,53 @@ class Endpoint_Addresses
   ACE_CString receiver_addr;
 };
 
+/**
+ * @class Connection_Manager
+ *
+ * @brief Defines the Connection Manager.
+ *
+ * This is a helper class that allows the senders bind to
+ * multiple receivers and receivers to bind to senders. It also
+ * lets the senders and receivers disconnect streams.
+ */
 class Connection_Manager
 {
-  // = TITLE
-  //    Defines the Connection Manager.
-  //
-  // = DESCRIPTION
-  //    This is a helper class that allows the senders bind to
-  //    multiple receivers and receivers to bind to senders. It also
-  //    lets the senders and receivers disconnect streams.
 public:
 
+  /// Constructor
   Connection_Manager (void);
-  // Constructor
 
+  /// Destructor
   ~Connection_Manager (void);
-  // Destructor
 
+  /// Initialize this class.
   int init (CORBA::ORB_ptr orb);
-  // Initialize this class.
 
+  /// Method that binds the sender to the Naming Service and retreives
+  /// the references of any registered receivers.
   void bind_to_receivers (const ACE_CString &sender_name,
                           AVStreams::MMDevice_ptr sender);
-  // Method that binds the sender to the Naming Service and retreives
-  // the references of any registered receivers.
 
+  /// Connect to the receivers that we found.
   void connect_to_receivers (AVStreams::MMDevice_ptr sender);
-  // Connect to the receivers that we found.
 
+  /// Bind receiver to the sender.
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
                        AVStreams::MMDevice_ptr receiver);
-  // Bind receiver to the sender.
 
+  /// Connect to the sender that we found.
   void connect_to_sender (void);
-  // Connect to the sender that we found.
 
+  /// Destroy all streams.
   void destroy (void);
-  // Destroy all streams.
 
+  /// Destroy streams associated with <flowname>.
   void destroy (const ACE_CString &flowname);
-  // Destroy streams associated with <flowname>.
 
+  /// Add new streamctrl.
   void add_streamctrl (const ACE_CString &flowname,
                        TAO_StreamEndPoint *endpoint);
-  // Add new streamctrl.
 
   // Map of receivers.
   typedef ACE_Hash_Map_Manager<ACE_CString,
@@ -117,8 +116,8 @@ protected:
 
   void add_to_receivers (CosNaming::BindingList &binding_list);
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
   // The maps.
   Receivers receivers_;
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
deleted file mode 100644
index 0bfe196d9ba..00000000000
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
+++ /dev/null
@@ -1,129 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Asynch_Three_Stage_Dist.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += distributer
-
-distributer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-distributer_SOURCES = \
-  Connection_Manager.cpp \
-  distributer.cpp \
-  Connection_Manager.h \
-  distributer.h
-
-distributer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Asynch_Three_Stage_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  Connection_Manager.cpp \
-  receiver.cpp \
-  Connection_Manager.h \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Asynch_Three_Stage_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  Connection_Manager.cpp \
-  sender.cpp \
-  Connection_Manager.h \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 0c87366090b..2f175688b15 100644
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage
-//
-// = FILENAME
-//    distributer.h
-//
-// = DESCRIPTION
-//    Process to receive data from the sender and send it to the
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    distributer.h
+ *
+ *  $Id$
+ *
+ *  Process to receive data from the sender and send it to the
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Distributer_Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Distributer_Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,45 +45,50 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Count of the frames passing through us.
   int frame_count_;
-  // Count of the frames passing through us.
 };
 
+/**
+ * @class Distributer_Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Distributer_Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Distributer_Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Distributer_Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Distributer_Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -99,58 +103,60 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_B
            AV_Null_MediaCtrl>
         RECEIVER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Distributer
+ *
+ * @brief Distributer Application.
+ *
+ * The distributer is the intermediate receiver that receives
+ * data from the sender and forwards to a receiver.
+ */
 class Distributer
 {
-  // = TITLE
-  //    Distributer Application.
-  //
-  // = DESCRIPTION
-  //    The distributer is the intermediate receiver that receives
-  //    data from the sender and forwards to a receiver.
 public:
+  /// Constructor
   Distributer (void);
-  // Constructor
 
+  /// Destructor.
   ~Distributer (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Parse args.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parse args.
 
   // Flag to know when we are done.
   int done (void) const;
   void done (int);
 
+  /// Accessor to connection manager.
   Connection_Manager &connection_manager (void);
-  // Accessor to connection manager.
 
 protected:
+  /// Connection manager.
   Connection_Manager connection_manager_;
-  // Connection manager.
 
+  /// The sender endpoint strategy.
   SENDER_ENDPOINT_STRATEGY sender_endpoint_strategy_;
-  // The sender endpoint strategy.
 
+  /// The receiver endpoint strategy.
   RECEIVER_ENDPOINT_STRATEGY receiver_endpoint_strategy_;
-  // The receiver endpoint strategy.
 
+  /// The distributer receiver multimedia device
   TAO_MMDevice* distributer_receiver_mmdevice_;
-  // The distributer receiver multimedia device
 
+  /// The distributer receiver multimedia device
   TAO_MMDevice* distributer_sender_mmdevice_;
-  // The distributer receiver multimedia device
 
+  /// The name of the sender to connect to.
   ACE_CString sender_name_;
-  // The name of the sender to connect to.
 
+  /// Our name.
   ACE_CString distributer_name_;
-  // Our name.
 
+  /// Flag to know when we are done.
   int done_;
-  // Flag to know when we are done.
 
   ACE_TString addr_file_;
 };
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index c19fc47ea40..9b0d3bca61d 100644
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,76 +45,80 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Parse args.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parse args.
 
+  /// Name of the output file.
   ACE_TString output_file_name (void);
-  // Name of the output file.
 
 protected:
+  /// Connection manager.
   Connection_Manager connection_manager_;
-  // Connection manager.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// The receiver MMDevice.
   AVStreams::MMDevice_var mmdevice_obj_;
-  // The receiver MMDevice.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 
+  /// The sender MMDevice
   AVStreams::MMDevice_var sender_mmdevice_;
-  // The sender MMDevice
 
+  /// File name of the file into which received data is written.
   ACE_TString output_file_name_;
-  // File name of the file into which received data is written.
 
   ACE_TString addr_file_;
 
+  /// Sender name.
   ACE_CString sender_name_;
-  // Sender name.
 
+  /// Receiver name.
   ACE_CString receiver_name_;
-  // Receiver name.
 };
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
index 7b620447411..2969753c16c 100755
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
@@ -66,25 +66,25 @@ if ($sv1->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("sender", 
+$SV = $sv->CreateProcess ("sender",
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-s sender -r 10 ".
                           "-f $sv_inputfile");
-$SV1 = $sv1->CreateProcess ("sender", 
+$SV1 = $sv1->CreateProcess ("sender",
                             " -ORBInitRef NameService=file://$sv1_nsiorfile ".
                             "-s sender -r 10 ".
                             "-f $sv1_inputfile");
-$RE1 = $re1->CreateProcess ("receiver", 
+$RE1 = $re1->CreateProcess ("receiver",
                             " -ORBInitRef NameService=file://$re1_nsiorfile ".
                             "-s distributer -r receiver1 ".
                             "-f $re1_outputfile1");
-$RE2 = $re2->CreateProcess ("receiver", 
+$RE2 = $re2->CreateProcess ("receiver",
                             " -ORBInitRef NameService=file://$re2_nsiorfile ".
                             "-s distributer -r receiver2 ".
                             "-f $re2_outputfile2");
-$DI = $di->CreateProcess ("distributer", 
+$DI = $di->CreateProcess ("distributer",
                           " -ORBInitRef NameService=file://$di_nsiorfile ".
                           "-s sender -r distributer ");
 
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index 979a4f00fd1..9e439b9736d 100644
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -1,46 +1,46 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -49,58 +49,60 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR **argv);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Accessor to the connection manager.
   Connection_Manager &connection_manager (void);
-  // Accessor to the connection manager.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR **argv);
-  // Method to parse the command line arguments.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_TString filename_;
-  // File from which data is read.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// File from which data is read.
   ACE_TString addr_file_;
-  // File from which data is read.
 
+  /// Rate at which the data will be sent.
   double frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Name of this sender.
   ACE_TString sender_name_;
-  // Name of this sender.
 
   // Connection manager.
   Connection_Manager connection_manager_;
diff --git a/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
deleted file mode 100644
index 4478a21beba..00000000000
--- a/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Bidirectional_Flows_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Bidirectional_Flows_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index 93444f3f843..bf4b9a7f835 100644
--- a/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -24,17 +21,19 @@
 #include "orbsvcs/AV/Policy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -47,93 +46,97 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   TAO_AV_Protocol_Object * protocol_object (void);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
   FILE * input_file (void);
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
 };
diff --git a/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
index bd50addba68..fc3027f3164 100755
--- a/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
@@ -48,13 +48,13 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("receiver", 
+$SV = $sv->CreateProcess ("receiver",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_outputfile");
-$CL = $cl->CreateProcess ("sender", 
+$CL = $cl->CreateProcess ("sender",
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile -r 2");
 
diff --git a/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index f520f67548e..b15329a5f1d 100644
--- a/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Sender_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Sender_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,28 +45,31 @@ public:
   //  int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   Sender_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -76,74 +78,76 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
   int eof (void);
 
   void shutdown (void);
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
   int eof_;
 };
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 0e0547a14b4..d4ea1ef6e15 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -1,22 +1,19 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Component_Switching
-//
-// = FILENAME
-//    Connection_Manager.h
-//
-// = DESCRIPTION
-//    This is a helper class that allows the senders bind to multiple
-//    receivers and receivers to bind to senders. It also lets the
-//    senders and receivers disconnect streams.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Connection_Manager.h
+ *
+ *  $Id$
+ *
+ *  This is a helper class that allows the senders bind to multiple
+ *  receivers and receivers to bind to senders. It also lets the
+ *  senders and receivers disconnect streams.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CONNECTION_MANAGER_H
 #define CONNECTION_MANAGER_H
@@ -26,57 +23,59 @@
 #include "orbsvcs/AV/Protocol_Factory.h"
 #include "tao/PortableServer/PortableServer.h"
 
+/**
+ * @class Connection_Manager
+ *
+ * @brief Defines the Connection Manager.
+ *
+ * This is a helper class that allows the senders bind to
+ * multiple receivers and receivers to bind to senders. It also
+ * lets the senders and receivers disconnect streams.
+ */
 class Connection_Manager
 {
-  // = TITLE
-  //    Defines the Connection Manager.
-  //
-  // = DESCRIPTION
-  //    This is a helper class that allows the senders bind to
-  //    multiple receivers and receivers to bind to senders. It also
-  //    lets the senders and receivers disconnect streams.
 public:
 
+  /// Constructor
   Connection_Manager (void);
-  // Constructor
 
+  /// Destructor
   ~Connection_Manager (void);
-  // Destructor
 
+  /// Initialize this class.
   int init (CORBA::ORB_ptr orb);
-  // Initialize this class.
 
+  /// Method that binds the sender to the Naming Service and retreives
+  /// the references of any registered receivers.
   void bind_to_receivers (const ACE_CString &sender_name,
                           AVStreams::MMDevice_ptr sender);
-  // Method that binds the sender to the Naming Service and retreives
-  // the references of any registered receivers.
 
+  /// Connect to the receivers that we found.
   void connect_to_receivers (void);
-  // Connect to the receivers that we found.
 
+  /// Bind receiver to the sender.
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
                        AVStreams::MMDevice_ptr receiver);
-  // Bind receiver to the sender.
 
+  /// Connect to the sender that we found.
   void connect_to_sender (void);
-  // Connect to the sender that we found.
 
+  /// Destroy streams associated with <flowname>.
   void destroy (const ACE_CString &flowname);
-  // Destroy streams associated with <flowname>.
 
+  /// Unbind the sender from the Naming Service
   void unbind_sender (const ACE_CString &sender_name,
                       AVStreams::MMDevice_ptr sender_mmdevice) ;
-  // Unbind the sender from the Naming Service
 
+  /// Unbind the Receiver from the Naming Service
   void unbind_receiver (const ACE_CString &sender_name,
                         const ACE_CString &receiver_name,
                         AVStreams::MMDevice_ptr receiver_mmdevice);
-  // Unbind the Receiver from the Naming Service
 
+  /// Add new streamctrl.
   void add_streamctrl (const ACE_CString &flowname,
                        TAO_StreamEndPoint *endpoint);
-  // Add new streamctrl.
 
   // Map of receivers.
   typedef ACE_Hash_Map_Manager<ACE_CString,
@@ -107,8 +106,8 @@ protected:
 
   void add_to_receivers (CosNaming::BindingList &binding_list);
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
   // The maps.
   Receivers receivers_;
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
deleted file mode 100644
index cfd81793eb9..00000000000
--- a/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
+++ /dev/null
@@ -1,138 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Component_Switching_Dist.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += distributer
-
-distributer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-distributer_SOURCES = \
-  Connection_Manager.cpp \
-  distributer.cpp \
-  Connection_Manager.h \
-  distributer.h
-
-distributer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Component_Switching_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  Connection_Manager.cpp \
-  receiver.cpp \
-  Connection_Manager.h \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Component_Switching_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  Connection_Manager.cpp \
-  sender.cpp \
-  Connection_Manager.h \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf b/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf
index 05579a12523..3384dd0187e 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf
+++ b/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf
@@ -2,7 +2,7 @@
 #
 
 # This configuration file is used to use only the default TAO
-# strategies 
+# strategies
 
 static Advanced_Resource_Factory "-ORBReactorType select_mt"
 
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index 92e253a219e..42b4a0e1719 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -1,55 +1,57 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Component_Switching
-//
-// = FILENAME
-//    distributer.h
-//
-// = DESCRIPTION
-//    Process to receive data from the sender and send it to the
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    distributer.h
+ *
+ *  $Id$
+ *
+ *  Process to receive data from the sender and send it to the
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Signal_Handler
+ TITLE
+ * This class Handles the SIGINT signal through the Reactor.
+ * Useful to gracefully release the process
+ */
 class Signal_Handler : public ACE_Event_Handler
 {
-  // TITLE
-  //   This class Handles the SIGINT signal through the Reactor.
-  //   Useful to gracefully release the process
 
 public:
 
   Signal_Handler (void);
 
+  /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
-  // Override this method to implement graceful shutdown.
 
 };
 
 
+/**
+ * @class Distributer_Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  //// Constructor.
   Distributer_Receiver_Callback (void);
-  /// Constructor.
 
   /// Method that is called when there is data to be received from a
   /// sender.
@@ -66,28 +68,30 @@ public:
   void flowname (const ACE_CString &flowname);
 
 private:
+  //// Count of the frames passing through us.
   int frame_count_;
-  /// Count of the frames passing through us.
 
+  //// Flowname of the flow.
   ACE_CString flowname_;
-  /// Flowname of the flow.
 };
 
+/**
+ * @class Distributer_Sender_Callback
+ *
+ * @brief Defines a class for the distributer application callback
+ * for receiving data.
+ *
+ * This class overides the methods of the TAO_AV_Callback so the
+ * AVStreams can make upcalls to the application.
+ */
 class Distributer_Sender_Callback : public TAO_AV_Callback
 {
-  /// = TITLE
-  //    Defines a class for the distributer application callback
-  //    for receiving data.
-  //
-  // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the
-  //    AVStreams can make upcalls to the application.
 
 public:
 
+  //// Called when the sender has finished reading the file and wants
+  //// to close down the connection.
   int handle_destroy (void);
-  /// Called when the sender has finished reading the file and wants
-  /// to close down the connection.
 
   /// Accessor methods for the flowname of the callback.
   ACE_CString &flowname (void);
@@ -99,49 +103,54 @@ private:
 
 };
 
+/**
+ * @class Distributer_Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Distributer_Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   /// Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
+  //// Store the reference to the protocol object corresponding
+  //// to the transport
   int set_protocol_object (const char *,
                            TAO_AV_Protocol_Object *object);
-  /// Store the reference to the protocol object corresponding
-  /// to the transport
 
+  //// Called when a sender makes a connection request.
   virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
-  /// Called when a sender makes a connection request.
 
 private:
+  //// Receiver application callback.
   Distributer_Receiver_Callback callback_;
-  /// Receiver application callback.
 };
 
+/**
+ * @class Distributer_Sender_StreamEndPoint
+ *
+ * @brief /    Defines a sender stream endpoint.
+ */
 class Distributer_Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  /// = TITLE
-  ///    Defines a sender stream endpoint.
 public:
+  //// Create the application callback and return its handle to
+  //// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  /// Create the application callback and return its handle to
-  /// AVStreams for further application callbacks.
 
+  //// Set protocol object corresponding to the transport protocol
+  //// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  /// Set protocol object corresponding to the transport protocol
-  /// chosen.
 
 protected:
+  //// Application callback.
   Distributer_Sender_Callback callback_;
-  /// Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -156,74 +165,76 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_B
            AV_Null_MediaCtrl>
         RECEIVER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Distributer
+ *
+ * @brief Distributer Application.
+ *
+ * The distributer is the intermediate receiver that receives
+ * data from the sender and forwards to a receiver.
+ */
 class Distributer
 {
-  // = TITLE
-  //    Distributer Application.
-  //
-  // = DESCRIPTION
-  //    The distributer is the intermediate receiver that receives
-  //    data from the sender and forwards to a receiver.
 public:
+  //// Constructor
   Distributer (void);
-  /// Constructor
 
+  //// Destructor.
   ~Distributer (void);
-  /// Destructor.
 
+  //// Initialize data components.
   int init (int argc,
             ACE_TCHAR **argv);
-  /// Initialize data components.
 
+  //// Parse args.
   int parse_args (int argc,
                   ACE_TCHAR **argv);
-  /// Parse args.
 
   /// Flag to know when we are done.
   bool done (void) const;
   void done (bool);
 
+  //// Accessor to connection manager.
   Connection_Manager &connection_manager (void);
-  /// Accessor to connection manager.
 
+  //// Called when stream created
   void stream_created (void);
-  /// Called when stream created
 
+  //// Called when stream destroyed
   void stream_destroyed (void);
-  /// Called when stream destroyed
 
+  ////Unbind the sender and receiver from the Naming Service
   void shut_down (void);
-  ///Unbind the sender and receiver from the Naming Service
 
 protected:
+  //// Connection manager.
   Connection_Manager connection_manager_;
-  /// Connection manager.
 
+  //// The sender endpoint strategy.
   SENDER_ENDPOINT_STRATEGY sender_endpoint_strategy_;
-  /// The sender endpoint strategy.
 
+  //// The receiver endpoint strategy.
   RECEIVER_ENDPOINT_STRATEGY receiver_endpoint_strategy_;
-  /// The receiver endpoint strategy.
 
+  //// The distributer receiver multimedia device
   TAO_MMDevice* distributer_receiver_mmdevice_;
-  /// The distributer receiver multimedia device
 
+  //// The distributer receiver multimedia device
   TAO_MMDevice* distributer_sender_mmdevice_;
-  /// The distributer receiver multimedia device
 
+  //// The name of the sender to connect to.
   ACE_CString sender_name_;
-  /// The name of the sender to connect to.
 
+  //// Our name.
   ACE_CString distributer_name_;
-  /// Our name.
 
+  //// Flag to know when we are done.
   bool done_;
-  /// Flag to know when we are done.
 
+  //// Number of active streams. When a stream is disconnected this
+  //// count is decremented.
   int stream_count_;
-  /// Number of active streams. When a stream is disconnected this
-  /// count is decremented.
 
+  //// Reference to the signal handler.
   Signal_Handler signal_handler_;
-  /// Reference to the signal handler.
 };
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index f7bc3b61361..c911c6d4fb3 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -1,54 +1,56 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Component_Switching
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Signal_Handler
+ TITLE
+ * This class Handles the SIGINT signal through the Reactor.
+ * Useful to gracefully release the process
+ */
 class Signal_Handler : public ACE_Event_Handler
 {
-  // TITLE
-  //   This class Handles the SIGINT signal through the Reactor.
-  //   Useful to gracefully release the process
 
 public:
 
   Signal_Handler (void);
 
+  /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
-  // Override this method to implement graceful shutdown.
 
 };
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  //// Constructor.
   Receiver_Callback (void);
-  /// Constructor.
 
   /// Method that is called when there is data to be received from a
   /// sender.
@@ -63,58 +65,62 @@ public:
   void flowname (const ACE_CString &flowname);
 
 private:
+  //// Keeping a count of the incoming frames.
   int frame_count_;
-  /// Keeping a count of the incoming frames.
 
+  //// Flowname of the flow.
   ACE_CString flowname_;
-  /// Flowname of the flow.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   /// Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
+  //// Called when a distributor tries to connect to the receiver
   virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
-  /// Called when a distributor tries to connect to the receiver
 
 private:
+  //// Receiver application callback.
   Receiver_Callback callback_;
-  /// Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  //// Constructor
   Receiver (void);
-  /// Constructor
 
+  //// Destructor.
   virtual ~Receiver (void);
-  /// Destructor.
 
+  //// Initialize data components.
   int init (int argc,
             ACE_TCHAR **argv);
-  /// Initialize data components.
 
+  //// Parse args.
   int parse_args (int argc,
                   ACE_TCHAR **argv);
-  /// Parse args.
 
+  //// Name of the output file.
   ACE_CString output_file_name (void);
-  /// Name of the output file.
 
   ACE_CString sender_name (void);
   ACE_CString receiver_name (void);
@@ -122,31 +128,31 @@ public:
   void shut_down (void);
 
 protected:
+  //// Connection manager.
   Connection_Manager connection_manager_;
-  /// Connection manager.
 
+  //// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  /// The endpoint reactive strategy.
 
+  //// The receiver MMDevice.
   AVStreams::MMDevice_var mmdevice_obj_;
-  /// The receiver MMDevice.
 
+  //// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  /// Receiver MMDevice.
 
+  //// The sender MMDevice
   AVStreams::MMDevice_var sender_mmdevice_;
-  /// The sender MMDevice
 
+  //// File name of the file into which received data is written.
   ACE_CString output_file_name_;
-  /// File name of the file into which received data is written.
 
+  //// Sender name.
   ACE_CString sender_name_;
-  /// Sender name.
 
+  //// Receiver name.
   ACE_CString receiver_name_;
-  /// Receiver name.
 
+  //// Reference to the signal handler.
   Signal_Handler signal_handler_;
-  /// Reference to the signal handler.
 };
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
index 1a778d7edd4..6ba74fc7770 100755
--- a/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
@@ -96,58 +96,58 @@ if ($sv3->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -o $ns_nsiorfile");
-$SV1 = $sv1->CreateProcess ("sender", 
+$SV1 = $sv1->CreateProcess ("sender",
                           " -ORBDebugLevel $debug_level ".
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $sv1_conffile ".
                           "-ORBInitRef NameService=file://$sv1_nsiorfile ".
                           "-s sender -r 30 ".
                           "-f $sv1_inputfile");
-$SV2 = $sv2->CreateProcess ("sender", 
+$SV2 = $sv2->CreateProcess ("sender",
                           " -ORBDebugLevel $debug_level ".
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $sv2_conffile ".
                           "-ORBInitRef NameService=file://$sv2_nsiorfile ".
                           "-s sender -r 30 ".
                           "-f $sv2_inputfile");
-$SV3 = $sv3->CreateProcess ("sender", 
+$SV3 = $sv3->CreateProcess ("sender",
                           " -ORBDebugLevel $debug_level ".
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $sv3_conffile ".
                           "-ORBInitRef NameService=file://$sv3_nsiorfile ".
                           "-s sender -r 30 ".
                           "-f $sv3_inputfile");
-$RE1 = $re1->CreateProcess ("receiver", 
+$RE1 = $re1->CreateProcess ("receiver",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $re1_conffile ".
                           "-ORBInitRef NameService=file://$re1_nsiorfile ".
                           "-s distributer -r receiver1 ".
                           "-f $re1_outputfile1");
-$RE2 = $re2->CreateProcess ("receiver", 
+$RE2 = $re2->CreateProcess ("receiver",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $re2_conffile ".
                           "-ORBInitRef NameService=file://$re2_nsiorfile ".
                           "-s distributer -r receiver2 ".
                           "-f $re2_outputfile2");
-$DI1 = $di1->CreateProcess ("distributer", 
+$DI1 = $di1->CreateProcess ("distributer",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $di1_conffile ".
                           "-ORBInitRef NameService=file://$di1_nsiorfile ".
                           "-s sender -r distributer ");
-$DI2 = $di2->CreateProcess ("distributer", 
+$DI2 = $di2->CreateProcess ("distributer",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $di2_conffile ".
                           "-ORBInitRef NameService=file://$di2_nsiorfile ".
                           "-s sender -r distributer ");
-$DI3 = $di3->CreateProcess ("distributer", 
+$DI3 = $di3->CreateProcess ("distributer",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $di3_conffile ".
                           "-ORBInitRef NameService=file://$di3_nsiorfile ".
                           "-s sender -r distributer ");
-$DI4 = $di4->CreateProcess ("distributer", 
+$DI4 = $di4->CreateProcess ("distributer",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $di4_conffile ".
                           "-ORBInitRef NameService=file://$di4_nsiorfile ".
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index f5a14c6e06e..ec43f3e526e 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -1,91 +1,98 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Component_Switching
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Signal_Handler
+ *
+ * This class Handles the SIGINT signal through the Reactor.
+ * Useful to gracefully release the process
+ */
 class Signal_Handler : public ACE_Event_Handler
 {
-  // TITLE
-  //   This class Handles the SIGINT signal through the Reactor.
-  //   Useful to gracefully release the process
 
 public:
 
   Signal_Handler (void);
 
+  /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
-  // Override this method to implement graceful shutdown.
 
 };
 
 
+/**
+ * @class Sender_Callback
+ *
+ * @brief Defines a class for the sender application callback.
+ *
+ * This class overides the methods of the TAO_AV_Callback so the
+ * AVStreams can make upcalls to the application.
+ */
 class Sender_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Defines a class for the sender application callback.
-  //
-  // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the
-  //    AVStreams can make upcalls to the application.
 
 public:
 
+  /**
+   * Called when the sender has finished reading the file and wants
+   * to close down the connection. Also called when the distributer
+   * tears down the connection when it switches to a new sender.
+   */
   int handle_destroy (void);
-  /// Called when the sender has finished reading the file and wants
-  /// to close down the connection. Also called when the distributer
-  /// tears down the connection when it switches to a new sender.
 
+  /// Accessor methods for the flowname of the callback
   ACE_CString &flowname (void);
   void flowname (const ACE_CString &flowname);
-  /// Accessor methods for the flowname of the callback
 
 private:
+  //// Flowname of the callback.
   ACE_CString flowname_;
-  /// Flowname of the callback.
 };
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  //// Create the application callback and return its handle to
+  //// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  /// Create the application callback and return its handle to
-  /// AVStreams for further application callbacks.
 
+  //// Set protocol object corresponding to the transport protocol
+  //// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  /// Set protocol object corresponding to the transport protocol
-  /// chosen.
 
+  //// Perform application specific actions before accepting new
+  //// connections.
   CORBA::Boolean handle_preconnect (AVStreams::flowSpec &flowspec);
-  /// Perform application specific actions before accepting new
-  /// connections.
 
 protected:
+  //// Application callback.
   Sender_Callback callback_;
-  /// Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -94,64 +101,66 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  /// = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  //// Constructor
   Sender (void);
-  /// Constructor
 
+  //// Destructor
   ~Sender (void);
-  /// Destructor
 
   void shut_down (void);
 
+  //// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  /// Method to initialize the various data components.
 
+  //// Method to pace and send data from a file.
   int pace_data (void);
-  /// Method to pace and send data from a file.
 
+  //// Accessor to the connection manager.
   Connection_Manager &connection_manager (void);
-  /// Accessor to the connection manager.
 
 private:
+  //// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  /// Method to parse the command line arguments.
 
+  //// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  /// The endpoint strategy used by the sender.
 
+  //// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  /// The sender MMDevice.
 
+  //// Number of frames sent.
   int frame_count_;
-  /// Number of frames sent.
 
+  //// File from which data is read.
   ACE_CString filename_;
-  /// File from which data is read.
 
+  //// File handle of the file read from.
   FILE *input_file_;
-  /// File handle of the file read from.
 
+  //// Rate at which the data will be sent.
   double frame_rate_;
-  /// Rate at which the data will be sent.
 
+  //// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  /// Message block into which data is read from a file and then sent.
 
+  //// Name of this sender.
   ACE_CString sender_name_;
-  /// Name of this sender.
 
+  //// Connection manager.
   Connection_Manager connection_manager_;
-  /// Connection manager.
 
+  //// Reference to the signal handler.
   Signal_Handler signal_handler_;
-  /// Reference to the signal handler.
 };
diff --git a/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
deleted file mode 100644
index 5f011923973..00000000000
--- a/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Full_Profile_Ftp.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
-
-ftp_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ftp_SOURCES = \
-  ftp.cpp \
-  ftp.h
-
-ftp_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Full_Profile_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
index 152b75c34c7..4c48c39bccf 100755
--- a/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
@@ -63,7 +63,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -106,16 +106,16 @@ for $protocol (@protocols) {
     else {
         $outputfile = $protocol."_output";
     }
-    
+
     my $sv_outputfile = $sv->LocalFile ($outputfile);
     $ns->DeleteFile ($outputfile);
 
-    $SV = $sv->CreateProcess ("server", 
+    $SV = $sv->CreateProcess ("server",
                               "-ORBInitRef NameService=file://$sv_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $sv_outputfile");
 
-    $CL = $cl->CreateProcess ("ftp", 
+    $CL = $cl->CreateProcess ("ftp",
                               "-ORBInitRef NameService=file://$cl_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $cl_inputfile");
diff --git a/orbsvcs/tests/AVStreams/Latency/Makefile.am b/orbsvcs/tests/AVStreams/Latency/Makefile.am
deleted file mode 100644
index c1854631a69..00000000000
--- a/orbsvcs/tests/AVStreams/Latency/Makefile.am
+++ /dev/null
@@ -1,133 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Latency_Cntl.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += control
-
-control_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-control_SOURCES = \
-  control.cpp \
-  ping.h \
-  pong.h
-
-control_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Latency_Ping.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ping
-
-ping_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ping_SOURCES = \
-  ping.cpp \
-  ping.h
-
-ping_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Latency_Pong.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += pong
-
-pong_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-pong_SOURCES = \
-  pong.cpp \
-  pong.h
-
-pong_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Latency/control.cpp b/orbsvcs/tests/AVStreams/Latency/control.cpp
index 11e43114d84..a1b75c9e6f7 100644
--- a/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -8,10 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/INET_Addr.h"
 
-ACE_RCSID (Latency,
-           ping,
-           "$Id$")
-
 const ACE_TCHAR *ping_ior = ACE_TEXT ("file://ping.ior");
 const ACE_TCHAR *pong_ior = ACE_TEXT ("file://pong.ior");
 const ACE_TCHAR *ping_address = ACE_TEXT ("localhost:12345");
@@ -73,7 +69,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       }
 
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/AVStreams/Latency/ping.cpp b/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 2f339f6f4f8..ea93745ba03 100644
--- a/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -9,10 +9,6 @@
 #include "ace/Stats.h"
 #include "ace/Throughput_Stats.h"
 
-ACE_RCSID (Latency,
-           ping,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("ping.ior");
 const char *protocol = "RTP/UDP";
 int milliseconds = 100;
@@ -89,7 +85,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       pong_protocols[0] = CORBA::string_dup ("UDP=localhost:23456");
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/AVStreams/Latency/ping.h b/orbsvcs/tests/AVStreams/Latency/ping.h
index 88e6fc31b97..da4a6975074 100644
--- a/orbsvcs/tests/AVStreams/Latency/ping.h
+++ b/orbsvcs/tests/AVStreams/Latency/ping.h
@@ -1,17 +1,14 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/AVStreams/Latency
-//
-// = FILENAME
-//   ping.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   ping.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_PING_H
 #define TAO_PING_H
@@ -43,17 +40,17 @@ public:
                             TAO_AV_Callback *&callback);
 
 private:
+  /// The callback object...
   Ping_Recv_Callback callback_;
-  // The callback object...
 };
 
 class Pong_Send_Callback : public TAO_AV_Callback
 {
 public:
 
+  /// Ad-hoc method to send a response outside the context of a
+  /// handle_timeout.
   int send_response (ACE_hrtime_t stamp);
-  // Ad-hoc method to send a response outside the context of a
-  // handle_timeout.
 
   virtual int handle_timeout (void *arg);
   virtual int handle_end_stream (void);
diff --git a/orbsvcs/tests/AVStreams/Latency/pong.cpp b/orbsvcs/tests/AVStreams/Latency/pong.cpp
index d029d1648bb..8a074684bdc 100644
--- a/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -11,10 +11,6 @@
 #include "ace/Stats.h"
 #include "ace/Throughput_Stats.h"
 
-ACE_RCSID (Latency,
-           ping,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("pong.ior");
 const char *protocol = "RTP/UDP";
 int milliseconds = 100;
@@ -106,7 +102,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       ping_protocols[0] = CORBA::string_dup ("UDP=localhost:12345");
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/AVStreams/Latency/pong.h b/orbsvcs/tests/AVStreams/Latency/pong.h
index 92d90adaad4..2a03d29116d 100644
--- a/orbsvcs/tests/AVStreams/Latency/pong.h
+++ b/orbsvcs/tests/AVStreams/Latency/pong.h
@@ -1,17 +1,13 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/AVStreams/Latency
-//
-// = FILENAME
-//   ping.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   pong.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
 
 #ifndef TAO_PONG_H
 #define TAO_PONG_H
@@ -39,8 +35,8 @@ public:
                             TAO_AV_Callback *&callback);
 
 private:
+  /// The callback object...
   Pong_Recv_Callback callback_;
-  // The callback object...
 };
 
 class Ping_Send_Callback : public TAO_AV_Callback
@@ -54,11 +50,11 @@ public:
                             void *&arg);
 
 private:
+  /// the timeout value
   ACE_Time_Value timeout_;
-  // the timeout value
 
+  /// Pre-allocate the message block to send...
   ACE_Message_Block frame_;
-  // Pre-allocate the message block to send...
   int count_;
 
 };
@@ -71,8 +67,8 @@ public:
                             TAO_AV_Callback *&callback);
 
 private:
+  /// The callback object...
   Ping_Send_Callback callback_;
-  // The callback object...
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A <TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl> Reactive_Strategy;
diff --git a/orbsvcs/tests/AVStreams/Latency/run_test.pl b/orbsvcs/tests/AVStreams/Latency/run_test.pl
index fc02f4b2fd8..b2158898318 100755
--- a/orbsvcs/tests/AVStreams/Latency/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Latency/run_test.pl
@@ -34,11 +34,11 @@ $pong->DeleteFile ($pongiorfile);
 $ctrl->DeleteFile ($pingiorfile);
 $ctrl->DeleteFile ($pongiorfile);
 
-$PING = $ping->CreateProcess ("ping", 
+$PING = $ping->CreateProcess ("ping",
                               " -o $ping_pingiorfile");
-$PONG = $pong->CreateProcess ("pong", 
+$PONG = $pong->CreateProcess ("pong",
                               " -o $pong_pongiorfile");
-$CTRL = $ctrl->CreateProcess ("control", 
+$CTRL = $ctrl->CreateProcess ("control",
                               " -ORBDebugLevel $debug_level ".
                               " -f file://$ctrl_pingiorfile ".
                               " -g file://$ctrl_pongiorfile");
diff --git a/orbsvcs/tests/AVStreams/Latency/svc.conf b/orbsvcs/tests/AVStreams/Latency/svc.conf
index 55dab11ac36..580f3233481 100644
--- a/orbsvcs/tests/AVStreams/Latency/svc.conf
+++ b/orbsvcs/tests/AVStreams/Latency/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler ST"
diff --git a/orbsvcs/tests/AVStreams/Latency/svc.conf.xml b/orbsvcs/tests/AVStreams/Latency/svc.conf.xml
index 5f7c667443f..0f0e38f5e02 100644
--- a/orbsvcs/tests/AVStreams/Latency/svc.conf.xml
+++ b/orbsvcs/tests/AVStreams/Latency/svc.conf.xml
@@ -4,6 +4,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler ST"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler ST"/>
 </ACE_Svc_Conf>
diff --git a/orbsvcs/tests/AVStreams/Makefile.am b/orbsvcs/tests/AVStreams/Makefile.am
deleted file mode 100644
index 6f3ac2f1651..00000000000
--- a/orbsvcs/tests/AVStreams/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Asynch_Three_Stage \
-        Bidirectional_Flows \
-        Component_Switching \
-        Full_Profile \
-        Latency \
-        Modify_QoS \
-        Multicast \
-        Multicast_Full_Profile \
-        Multiple_Flows \
-        Pluggable \
-        Pluggable_Flow_Protocol \
-        Simple_Three_Stage \
-        Simple_Two_Stage \
-        Simple_Two_Stage_With_QoS
-
diff --git a/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
deleted file mode 100644
index 99b358a677f..00000000000
--- a/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Modify_QoS_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Modify_QoS_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl b/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
index 1fbf0f3461f..78128ef34fc 100755
--- a/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
@@ -47,13 +47,13 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("receiver", 
+$SV = $sv->CreateProcess ("receiver",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_outputfile");
-$CL = $cl->CreateProcess ("sender", 
+$CL = $cl->CreateProcess ("sender",
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile");
 
diff --git a/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/orbsvcs/tests/AVStreams/Multicast/Makefile.am
deleted file mode 100644
index df58023ae4a..00000000000
--- a/orbsvcs/tests/AVStreams/Multicast/Makefile.am
+++ /dev/null
@@ -1,96 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Multicast_Ftp.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
-
-ftp_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ftp_SOURCES = \
-  ftp.cpp \
-  ftp.h
-
-ftp_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Multicast_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Multicast/components_svc.conf b/orbsvcs/tests/AVStreams/Multicast/components_svc.conf
index 4c6d9054999..fd70a6b6c7b 100644
--- a/orbsvcs/tests/AVStreams/Multicast/components_svc.conf
+++ b/orbsvcs/tests/AVStreams/Multicast/components_svc.conf
@@ -1,8 +1,8 @@
 # $Id$
 #
 #static Advanced_Resource_Factory "-ORBresources global -ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
-#static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-#static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
+#static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+#static Client_Strategy_Factory "-ORBClientConnectionHandler ST"
 
 static Advanced_Resource_Factory "-ORBReactorType select_mt"
 
diff --git a/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml b/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
index 4ddaaf0c147..705c51a7f77 100644
--- a/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
+++ b/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  $Id$ -->
  <!--  -->
  <!-- static Advanced_Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null" -->
- <!-- static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" -->
- <!-- static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST" -->
+ <!-- static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0" -->
+ <!-- static Client_Strategy_Factory "-ORBClientConnectionHandler ST" -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
 </ACE_Svc_Conf>
diff --git a/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/orbsvcs/tests/AVStreams/Multicast/run_test.pl
index 94d4db635e8..0ad321e25b7 100755
--- a/orbsvcs/tests/AVStreams/Multicast/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Multicast/run_test.pl
@@ -57,17 +57,17 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV1 = $sv1->CreateProcess ("server", 
+$SV1 = $sv1->CreateProcess ("server",
                             " -ORBDebugLevel $debug_level ".
                             " -ORBInitRef NameService=file://$sv1_nsiorfile ".
                             "-f $sv1_test1file");
-$SV2 = $sv2->CreateProcess ("server", 
+$SV2 = $sv2->CreateProcess ("server",
                             " -ORBDebugLevel $debug_level ".
                             " -ORBInitRef NameService=file://$sv2_nsiorfile ".
                             "-f $sv2_test2file");
-$CL = $cl->CreateProcess ("ftp", 
+$CL = $cl->CreateProcess ("ftp",
                           "-ORBSvcConf $cl_conffile ".
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile");
diff --git a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
deleted file mode 100644
index 27b52a09998..00000000000
--- a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Multicast_Full_Profile_Ftp.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
-
-ftp_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ftp_SOURCES = \
-  ftp.cpp \
-  ftp.h
-
-ftp_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Multicast_Full_Profile_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 2659afd4333..a92bef825b8 100644
--- a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -357,10 +357,10 @@ Client::run (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
   try
     {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA");
 
diff --git a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
index 0d9682f3dea..ff8ed76bf9c 100755
--- a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
@@ -53,17 +53,17 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV1 = $sv1->CreateProcess ("server", 
+$SV1 = $sv1->CreateProcess ("server",
                             " -ORBDebugLevel $debug_level ".
                             " -ORBInitRef NameService=file://$sv1_nsiorfile ".
                             "-f $sv1_test1file");
-$SV2 = $sv2->CreateProcess ("server", 
+$SV2 = $sv2->CreateProcess ("server",
                             " -ORBDebugLevel $debug_level ".
                             " -ORBInitRef NameService=file://$sv2_nsiorfile ".
                             "-f $sv2_test2file");
-$CL = $cl->CreateProcess ("ftp", 
+$CL = $cl->CreateProcess ("ftp",
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile");
 
diff --git a/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
deleted file mode 100644
index 606125b7ed3..00000000000
--- a/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Multiple_Flows_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Multiple_Flows_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index 0de06e4e856..8499a0c0b01 100644
--- a/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -24,17 +21,19 @@
 #include "orbsvcs/AV/Policy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -49,89 +48,93 @@ public:
   void flowname (const char*);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
   ACE_CString flowname_;
 
+  /// File handle of the file into which received data is written.
   FILE *output_file_;
-  // File handle of the file into which received data is written.
 
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   TAO_AV_Protocol_Object * protocol_object (void);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
 };
diff --git a/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl b/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
index 2bb6b037ceb..7e3996c2608 100755
--- a/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
@@ -47,13 +47,13 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("receiver", 
+$SV = $sv->CreateProcess ("receiver",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_outputfile");
-$CL = $cl->CreateProcess ("sender", 
+$CL = $cl->CreateProcess ("sender",
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile -r 2");
 
diff --git a/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index eaf1e328782..9b63e818546 100644
--- a/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -26,24 +23,27 @@
 typedef ACE_Unbounded_Set<TAO_AV_Protocol_Object*> ProtocolObject_Set;
 typedef ACE_Unbounded_Set_Iterator<TAO_AV_Protocol_Object*> ProtocolObject_SetItor;
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -52,71 +52,73 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
   void shutdown (void);
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   ProtocolObject_Set protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
 };
diff --git a/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
deleted file mode 100644
index d6a771ebaaf..00000000000
--- a/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Pluggable_Ftp.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
-
-ftp_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ftp_SOURCES = \
-  ftp.cpp \
-  ftp.h
-
-ftp_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Pluggable_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 50ae2bb556c..b658ce53e2f 100644
--- a/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Pluggable
-//
-// = FILENAME
-//    ftp.h
-//
-// = DESCRIPTION
-//    Ftp client to send data
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ftp.h
+ *
+ *  $Id$
+ *
+ *  Ftp client to send data
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 #ifndef TAO_AV_FTP_H
@@ -29,140 +26,146 @@
 #include "orbsvcs/AV/Protocol_Factory.h"
 
 
+/**
+ * @class FTP_Client_Callback
+ *
+ * @brief Defines the client applcation callback.
+ *
+ * This class can override the methods of
+ * the TAO_AV_Callback to do application
+ * specific processing.
+ */
 class FTP_Client_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Defines the client applcation callback.
-  //
-  // = DESCRIPTION
-  //    This class can override the methods of
-  //    the TAO_AV_Callback to do application
-  //    specific processing.
 public:
+  ///Constructor
   FTP_Client_Callback (void);
-  //Constructor
 };
 
 
+/**
+ * @class FTP_Client_StreamEndPoint
+ *
+ * @brief Defines the client stream endpoint.
+ *
+ * This class overrides the methods of TAO_ClientStreamendpoint
+ * so the application can perform its processing during post and pre
+ * connection set up.
+ */
 class FTP_Client_StreamEndPoint  : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines the client stream endpoint.
-  //
-  // = DESCRIPTION
-  //    This class overrides the methods of TAO_ClientStreamendpoint
-  //    so the application can perform its processing during post and pre
-  //    connection set up.
 
 public:
+  ///Contructor
   FTP_Client_StreamEndPoint (void);
-  //Contructor
 
+  /// Create the application client callback and return its handle to the
+  /// AVSTreams for further application callbacks
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
-  // Create the application client callback and return its handle to the
-  // AVSTreams for further application callbacks
 
+  /// Set protocol object corresponding to the transport protocol chosen.
   virtual int set_protocol_object (const char *flowname,
                                    TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol chosen.
 
 protected:
+  /// reference to the cllient application callback.
   FTP_Client_Callback callback_;
-  // reference to the cllient application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A <FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> ENDPOINT_STRATEGY;
 
 
+/**
+ * @class Client
+ *
+ * @brief Defines the Client Application
+ *
+ * The actual client program that acts as the ftp client that streams data
+ * to the ftp servers that are waiting for data.
+ */
 class Client
 {
-  // = TITLE
-  //    Defines the Client Application
-  //
-  // = DESCRIPTION
-  //    The actual client program that acts as the ftp client that streams data
-  //    to the ftp servers that are waiting for data.
 public:
+  /// Constructor
   Client (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// File handle from which data is read to be sent.
   FILE *file (void);
-  // File handle from which data is read to be sent.
 
+  /// The stream control interface that manages the stream set up
   TAO_StreamCtrl* streamctrl (void);
-  // The stream control interface that manages the stream set up
 
+  /// name of the flow set up.
   char *flowname (void);
-  // name of the flow set up.
 
+  /// The requested frame rate for sending each frame of data read from the file.
   int frame_rate (void);
-  // The requested frame rate for sending each frame of data read from the file.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the ftp client to the server
   int bind_to_server (void);
-  // Method that binds the ftp client to the server
 
+  /// The reacfive strategy of the client.
   ENDPOINT_STRATEGY endpoint_strategy_;
-  // The reacfive strategy of the client.
 
+  /// The server MMDevice that the ftpo client connects to
   AVStreams::MMDevice_var server_mmdevice_;
-  // The server MMDevice that the ftpo client connects to
 
+  /// The ftp client MMDevice.
   TAO_MMDevice client_mmdevice_;
-  // The ftp client MMDevice.
 
+  /// Video stream controller
   TAO_StreamCtrl streamctrl_;
-  // Video stream controller
 
+  /// Number of frames sent.
   int count_;
-  // Number of frames sent.
 
   int argc_;
   ACE_TCHAR **argv_;
 
+  /// File from which data is read.
   const char *filename_;
-  // File from which data is read.
 
+  /// Address of the ftp client host machine or a multicast address - Default is
+  /// UDP multicast addess
   const char *address_;
-  // Address of the ftp client host machine or a multicast address - Default is
-  // UDP multicast addess
   const char *peer_addr_str_;
 
+  /// The Naming Service client.
   TAO_Naming_Client my_naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *fp_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   char *protocol_;
-  // Selected protocol - default is UDP
 
   char *flowname_;
 
+  /// If set to 1 then use sfp as the flow carrier protocol.
   int use_sfp_;
-  // If set to 1 then use sfp as the flow carrier protocol.
 
   int frame_rate_;
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object* protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
 };
 
diff --git a/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
index 1591969296e..4f128a1530f 100755
--- a/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
@@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -112,12 +112,12 @@ for $protocol (@protocols) {
     my $sv_outputfile = $sv->LocalFile ($outputfile);
     $ns->DeleteFile ($outputfile);
 
-    $SV = $sv->CreateProcess ("server", 
+    $SV = $sv->CreateProcess ("server",
                               "-ORBInitRef NameService=file://$sv_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $sv_outputfile");
 
-    $CL = $cl->CreateProcess ("ftp", 
+    $CL = $cl->CreateProcess ("ftp",
                               "-ORBInitRef NameService=file://$cl_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-p $protocol ".
diff --git a/orbsvcs/tests/AVStreams/Pluggable/server.h b/orbsvcs/tests/AVStreams/Pluggable/server.h
index bdb3544c767..7982865da72 100644
--- a/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Pluggable
-//
-// = FILENAME
-//    ftp.h
-//
-// = DESCRIPTION
-//    Ftp server to receive data
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  Ftp server to receive data
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -22,14 +19,16 @@
 #include "orbsvcs/AV/Policy.h"
 
 
+/**
+ * @class FTP_Server_Callback
+ *
+ * @brief Defines a class for the server application callback.
+ *
+ * This class overides the methods of the TAO_AV_Callback so the
+ * AVStreams can make upcalls to the application.
+ */
 class FTP_Server_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Defines a class for the server application callback.
-  //
-  // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the
-  //    AVStreams can make upcalls to the application.
 
 public:
 
@@ -43,51 +42,55 @@ public:
   int handle_destroy (void);
 };
 
+/**
+ * @class FTP_Server_StreamEndPoint
+ *
+ * @brief Defines the aplication stream endpoint
+ *
+ * This is the class that overrides the tao_server_enpodint to handle
+ * pre and post connect processing.
+ */
 class FTP_Server_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Defines the aplication stream endpoint
-  //
-  // = DESCRIPTION
-  //    This is the class that overrides the tao_server_enpodint to handle
-  //    pre and post connect processing.
 public:
   // Create the server application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// reference to the server application callback.
   FTP_Server_Callback callback_;
-  // reference to the server application callback.
 };
 
+/**
+ * @class Server
+ *
+ * @brief Defines the server application class.
+ * = DESCRIPOTION
+ * The actual server progarm that acts as the ftp server that receives data
+ * sent by the ftp client.
+ */
 class Server
 {
-  // = TITLE
-  //    Defines the server application class.
-  //
-  // = DESCRIPOTION
-  //    The actual server progarm that acts as the ftp server that receives data
-  //    sent by the ftp client.
 public:
+  /// Constructor
   Server (void);
-  // Constructor
 
+  /// Deestructor.
   ~Server (void);
-  // Deestructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client my_naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reacxtive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reacxtive strategy.
 
+  /// The server MMDevice.
   TAO_MMDevice *mmdevice_;
-  // The server MMDevice.
 };
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
deleted file mode 100644
index aded0981dda..00000000000
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Pluggable_Flow_Protocol_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Pluggable_Flow_Protocol_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Pluggable_Flow_Protocol_Ts.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES = libTAO_TS.la
-
-libTAO_TS_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TS_BUILD_DLL
-
-libTAO_TS_la_SOURCES = \
-  TimeStamp.cpp
-
-noinst_HEADERS = \
-  TimeStamp.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index 59cfb9a300b..9f6c885497e 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -1,6 +1,7 @@
 #include "TimeStamp.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/OS_NS_strings.h"
 
 // $Id$
 //TimeStamp Protocol Object
@@ -51,7 +52,7 @@ TimeStamp_Protocol_Object::handle_input (void)
 //                n,
 //                frame_size));
 
-//        ACE_Message_Block* mb;
+//        ACE_Message_Block* mb = 0;
 //        ACE_NEW_RETURN (mb,
 //                    ACE_Message_Block(frame_size),
 //                    -1);
@@ -93,7 +94,7 @@ TimeStamp_Protocol_Object::handle_input (void)
 //                  "(%N|%l) Frame Size %d\n",
 //                  n));
 
-//      ACE_Message_Block* mb;
+//      ACE_Message_Block* mb = 0;
 //      ACE_NEW_RETURN (mb,
 //                      ACE_Message_Block (frame_size),
 //                      -1);
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index b74633ec3ea..e4c9cb5470e 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -2,7 +2,6 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS_String.h"
 #include "ace/High_Res_Timer.h"
 
 static FILE *output_file = 0;
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 5e813d38c08..d976fce3eef 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,54 +45,58 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 };
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
index 2f91b783982..fe3aa213aac 100755
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
@@ -47,13 +47,13 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("receiver", 
+$SV = $sv->CreateProcess ("receiver",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_outputfile");
-$CL = $cl->CreateProcess ("sender", 
+$CL = $cl->CreateProcess ("sender",
                           "-ORBDebugLevel 2 ".
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile -r 2");
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index 687bdfec133..0eb3343f85e 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -1,46 +1,46 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -49,68 +49,70 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 };
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf
index d4f2cd01350..befaf7cda62 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 dynamic AV_Default_Resource_Factory Service_Object * TAO_AV:_make_TAO_AV_Default_Resource_Factory() ""
 dynamic TimeStamp_Protocol_Factory Service_Object * TAO_TS:_make_TimeStamp_Protocol_Factory() ""
-static AV_Default_Resource_Factory "-AVFlowProtocolFactory TimeStamp_Protocol_Factory" 
+static AV_Default_Resource_Factory "-AVFlowProtocolFactory TimeStamp_Protocol_Factory"
 dynamic UDP_Factory Service_Object * TAO_AV:_make_TAO_AV_UDP_Factory() ""
-static AV_Default_Resource_Factory "-AVTransportFactory UDP_Factory" 
+static AV_Default_Resource_Factory "-AVTransportFactory UDP_Factory"
diff --git a/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
deleted file mode 100644
index ec0501a9959..00000000000
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Simple_Three_Stage_Dist.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += distributer
-
-distributer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-distributer_SOURCES = \
-  distributer.cpp \
-  distributer.h
-
-distributer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Simple_Three_Stage_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Simple_Three_Stage_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index a403d445404..d89a33a5d12 100644
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage
-//
-// = FILENAME
-//    distributer.h
-//
-// = DESCRIPTION
-//    Process to receive data from the sender and send it to the
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    distributer.h
+ *
+ *  $Id$
+ *
+ *  Process to receive data from the sender and send it to the
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Distributer_Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Distributer_Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,45 +45,50 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Count of the frames passing through us.
   int frame_count_;
-  // Count of the frames passing through us.
 };
 
+/**
+ * @class Distributer_Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Distributer_Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Distributer_Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Distributer_Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Distributer_Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -99,71 +103,73 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_B
            AV_Null_MediaCtrl>
         RECEIVER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Distributer
+ *
+ * @brief Distributer Application.
+ *
+ * The distributer is the intermediate receiver that receives
+ * data from the sender and forwards to a receiver.
+ */
 class Distributer
 {
-  // = TITLE
-  //    Distributer Application.
-  //
-  // = DESCRIPTION
-  //    The distributer is the intermediate receiver that receives
-  //    data from the sender and forwards to a receiver.
 public:
+  /// Constructor
   Distributer (void);
-  // Constructor
 
+  /// Destructor.
   ~Distributer (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Resolve the reference of the mmdevice from the naming service.
   void bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
                          const ACE_CString &mmdevice_name);
-  // Resolve the reference of the mmdevice from the naming service.
 
+  /// Get the stream control of the receiver
   TAO_StreamCtrl *receiver_streamctrl (void);
-  // Get the stream control of the receiver
 
+  /// Accessor methods to set/get our sender protocol object
   int sender_protocol_object  (TAO_AV_Protocol_Object *object);
   TAO_AV_Protocol_Object *sender_protocol_object (void);
-  // Accessor methods to set/get our sender protocol object
 
   // Flag to know when we are done.
   int done (void) const;
   void done (int);
 
 protected:
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// The sender endpoint strategy.
   SENDER_ENDPOINT_STRATEGY sender_endpoint_strategy_;
-  // The sender endpoint strategy.
 
+  /// The receiver endpoint strategy.
   RECEIVER_ENDPOINT_STRATEGY receiver_endpoint_strategy_;
-  // The receiver endpoint strategy.
 
+  /// The distributer receiver multimedia device
   TAO_MMDevice* distributer_receiver_mmdevice_;
-  // The distributer receiver multimedia device
 
+  /// The distributer receiver multimedia device
   TAO_MMDevice* distributer_sender_mmdevice_;
-  // The distributer receiver multimedia device
 
+  /// The receiver MMDevice.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice.
 
+  /// The sender MMDevice.
   AVStreams::MMDevice_var sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// The sender protocol object
   TAO_AV_Protocol_Object *sender_protocol_object_;
-  // The sender protocol object
 
+  /// Stream controller for the receivers
   TAO_StreamCtrl* receiver_streamctrl_;
-  // Stream controller for the receivers
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Flag to know when we are done.
   int done_;
-  // Flag to know when we are done.
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index e7076f5686e..d976fce3eef 100644
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,54 +45,58 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl b/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
index 759584647d6..0dd3f388e65 100755
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
@@ -50,16 +50,16 @@ if ($sv->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("sender", 
+$SV = $sv->CreateProcess ("sender",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_inputfile");
-$RE = $re->CreateProcess ("receiver", 
+$RE = $re->CreateProcess ("receiver",
                           " -ORBInitRef NameService=file://$re_nsiorfile ".
                           "-f $re_outputfile");
-$DI = $di->CreateProcess ("distributer", 
+$DI = $di->CreateProcess ("distributer",
                           " -ORBInitRef NameService=file://$di_nsiorfile ");
 
 print STDERR "Starting Naming Service\n";
diff --git a/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index 0bcd944b1e8..b0e4269dc09 100644
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -1,46 +1,46 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -49,64 +49,66 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
   void streamctrl (AVStreams::StreamCtrl_ptr streamctrl);
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   AVStreams::StreamCtrl_ptr streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Rate at which the data will be sent.
   double frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
deleted file mode 100644
index 2df05d9674f..00000000000
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
+++ /dev/null
@@ -1,94 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Simple_Two_Stage_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  Receiver_Stats.cpp \
-  receiver.cpp \
-  Receiver_Stats.h \
-  Receiver_Stats.inl \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Simple_Two_Stage_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  Receiver_Stats.inl \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
index 3ea29febda8..5f85dccebff 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
@@ -8,7 +8,7 @@
 #include "Receiver_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Receiver_Stats, "$Id$")
+
 
 void
 Receiver_Stats::accumulate (const Receiver_Stats &rhs)
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 3c00059838b..b5288300a36 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -24,17 +21,19 @@
 #include "orbsvcs/AV/Policy.h"
 #include "Receiver_Stats.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -49,61 +48,65 @@ public:
   void dump_samples (const char* file);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 
   Receiver_Stats stats_;
 
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 
 
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
index 3d26e83d6a4..6b822f19ce1 100755
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
@@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -111,12 +111,12 @@ for $protocol (@protocols) {
     my $sv_outputfile = $sv->LocalFile ($outputfile);
     $ns->DeleteFile ($outputfile);
 
-    $SV = $sv->CreateProcess ("receiver", 
+    $SV = $sv->CreateProcess ("receiver",
                               "-ORBInitRef NameService=file://$sv_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $sv_outputfile");
 
-    $CL = $cl->CreateProcess ("sender", 
+    $CL = $cl->CreateProcess ("sender",
                               "-ORBInitRef NameService=file://$cl_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-p $protocol ".
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index a64de401230..d10071d5561 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -1,46 +1,46 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -49,82 +49,84 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_TString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_TString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   double frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
+  /// Destination Address.
   char* address_;
-  // Destination Address.
 
+  /// Destination Address.
   char* peer_address_;
-  // Destination Address.
 
+  /// Local secondary addresses
   char** local_sec_addrs_;
-  // Local secondary addresses
 
+  /// Peer secondary addresses
   char** peer_sec_addrs_;
-  // Peer secondary addresses
 
   int num_local_sec_addrs_;
   int num_peer_sec_addrs_;
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
deleted file mode 100644
index 8c5fb6f43a2..00000000000
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AVS_Simple_Two_Stage_With_QoS_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 3b94e1d1e42..fb5d11e2cdb 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -24,17 +21,19 @@
 #include "orbsvcs/AV/Policy.h"
 
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -47,54 +46,58 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
index 3d26e83d6a4..6b822f19ce1 100755
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
@@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -111,12 +111,12 @@ for $protocol (@protocols) {
     my $sv_outputfile = $sv->LocalFile ($outputfile);
     $ns->DeleteFile ($outputfile);
 
-    $SV = $sv->CreateProcess ("receiver", 
+    $SV = $sv->CreateProcess ("receiver",
                               "-ORBInitRef NameService=file://$sv_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $sv_outputfile");
 
-    $CL = $cl->CreateProcess ("sender", 
+    $CL = $cl->CreateProcess ("sender",
                               "-ORBInitRef NameService=file://$cl_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-p $protocol ".
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index 49e6dffa56d..3ee93e5654f 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -1,49 +1,49 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver through an RSVP enabled stream.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver through an RSVP enabled stream.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                              const AVStreams::flowSpec &/* the_flows */
                              );
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -52,79 +52,81 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
+  /// Method to populate the required qos.
   void fill_qos (AVStreams::streamQoS &);
-  // Method to populate the required qos.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   double frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
+  /// Destination Address.
   ACE_TCHAR *address_;
-  // Destination Address.
 
+  /// Destination Address.
   ACE_TCHAR *peer_addr_;
-  // Destination Address.
 
   ACE_CString flowname_;
 };
diff --git a/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
deleted file mode 100644
index 229d00ecf2c..00000000000
--- a/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.BiDirCORBALOC_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TimeModuleC.cpp \
-  TimeModuleC.h \
-  TimeModuleC.inl \
-  TimeModuleS.cpp \
-  TimeModuleS.h \
-  TimeModuleS.inl
-
-CLEANFILES = \
-  TimeModule-stamp \
-  TimeModuleC.cpp \
-  TimeModuleC.h \
-  TimeModuleC.inl \
-  TimeModuleS.cpp \
-  TimeModuleS.h \
-  TimeModuleS.inl
-
-TimeModuleC.cpp TimeModuleC.h TimeModuleC.inl TimeModuleS.cpp TimeModuleS.h TimeModuleS.inl: TimeModule-stamp
-
-TimeModule-stamp: $(srcdir)/TimeModule.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/TimeModule.idl
-	@touch $@
-
-noinst_PROGRAMS = TimeServer
-
-TimeServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-TimeServer_SOURCES = \
-  TimeModuleC.cpp \
-  TimeModuleS.cpp \
-  TimeServer.cpp \
-  TimeModuleC.h \
-  TimeModuleC.inl \
-  TimeModuleS.h \
-  TimeModuleS.inl
-
-TimeServer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/BiDir_CORBALOC/run_test.pl b/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
index aca5e9267b2..959027251ff 100755
--- a/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
+++ b/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
@@ -30,7 +30,7 @@ my $iorbase = "test.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../Naming_Service/Naming_Service",
+$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming",
                               "-ORBEndpoint iiop://$host:$orb_port -o $server_iorfile");
 $CL = $client->CreateProcess ("TimeServer",
                               "-ORBInitRef NameService=corbaloc:iiop:$host:$orb_port/NameService");
diff --git a/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/orbsvcs/tests/Bug_1334_Regression/Makefile.am
deleted file mode 100644
index f467720c66e..00000000000
--- a/orbsvcs/tests/Bug_1334_Regression/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1334_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_1334_Regression/run_test.pl b/orbsvcs/tests/Bug_1334_Regression/run_test.pl
index b56a844d301..a32c695222c 100755
--- a/orbsvcs/tests/Bug_1334_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1334_Regression/run_test.pl
@@ -34,7 +34,7 @@ $CLI = $ns->CreateProcess ("client");
 
 # Fire up the Name Service
 #
-$NS = $ns->CreateProcess ("../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming",
                           "-ORBDebugLevel $debug_level ".
                           "-o $ns_nsiorfile");
 $NS_status = $NS->Spawn ();
@@ -64,7 +64,7 @@ if ($CLI_status != 0) {
         print STDERR "ERROR: Closing Name Service returned $NS_status\n";
     }
     $ns->DeleteFile ($nsiorfile);
-    exit 1;    
+    exit 1;
 }
 
 # Now try it with a duff ior in the environment variable.
@@ -80,7 +80,7 @@ if ($CLI_status != 1) {
         print STDERR "ERROR: Closing Name Service returned $NS_status\n";
     }
     $ns->DeleteFile ($nsiorfile);
-    exit 1;    
+    exit 1;
 }
 
 # Now try with a duff ior in the environment variable but overridden by
@@ -97,7 +97,7 @@ if ($CLI_status != 0) {
         print STDERR "ERROR: Closing Name Service returned $NS_status\n";
     }
     $ns->DeleteFile ($nsiorfile);
-    exit 1;    
+    exit 1;
 }
 
 # Clean up and return
diff --git a/orbsvcs/tests/Bug_1393_Regression/Makefile.am b/orbsvcs/tests/Bug_1393_Regression/Makefile.am
deleted file mode 100644
index 4e42c806b57..00000000000
--- a/orbsvcs/tests/Bug_1393_Regression/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1393_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/orbsvcs/tests/Bug_1393_Regression/run_test.pl
index a8832ba2f0a..ddfff9c21e6 100755
--- a/orbsvcs/tests/Bug_1393_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1393_Regression/run_test.pl
@@ -24,7 +24,7 @@ my $tao_idl_bin = "$ENV{ACE_ROOT}/bin";
 my $service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $client  = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 my $taoifr  = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
- 
+
 # The idl file to be used for the test
 my $test_idl = "test.idl";
 my $ifr_ior  = "ifr.ior";
@@ -38,7 +38,7 @@ $client->DeleteFile ($ifr_ior);
 $taoifr->DeleteFile ($ifr_ior);
 
 $TAO_IDL     = $service->CreateProcess("$tao_idl_bin/tao_idl", "$service_test_idl");
-$IFR_SERVICE = $service->CreateProcess("$ifr_service_bin/IFR_Service", "-o $service_ifr_ior");
+$IFR_SERVICE = $service->CreateProcess("$ifr_service_bin/tao_ifr_service", "-o $service_ifr_ior");
 $TAO_IFR     = $service->CreateProcess("$tao_ifr_bin/tao_ifr",
                                        "-ORBInitRef InterfaceRepository=file://$taoifr_ifr_ior ".
                                        "$taoifr_test_idl");
@@ -65,7 +65,7 @@ if ($result == 0) {
             last;
         }
     }
-    close (HANDLE);  
+    close (HANDLE);
 }
 
 # Check result of idl compiler test
@@ -90,7 +90,7 @@ if ($result != 0) {
 if ($service->WaitForFileTimed ($ifr_ior, $service->ProcessStartWaitInterval()) == -1) {
     print STDERR "ERROR: cannot find $service_ifr_ior\n";
     $IFR_SERVICE->Kill (); $IFR_SERVICE->TimedWait (1);
-    $status = 1; 
+    $status = 1;
 }
 
 if ($service->GetFile ($test_idl) == -1) {
@@ -123,7 +123,7 @@ if ($client->PutFile ($ifr_ior) == -1) {
     exit 1;
 }
 
-# Use the iao_ifr utility to add our test IDL 
+# Use the iao_ifr utility to add our test IDL
 $result = $TAO_IFR->SpawnWaitKill ($taoifr->ProcessStartWaitInterval() + 15);
 
 if ($result != 0) {
@@ -131,7 +131,7 @@ if ($result != 0) {
    $status = 1;
 }
 
-# Invoke the client code that retrieves the interface and checks it's not munged   
+# Invoke the client code that retrieves the interface and checks it's not munged
 $result = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 15);
 
 if ($result != 0) {
diff --git a/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/orbsvcs/tests/Bug_1395_Regression/Makefile.am
deleted file mode 100644
index 81c1b21dd82..00000000000
--- a/orbsvcs/tests/Bug_1395_Regression/Makefile.am
+++ /dev/null
@@ -1,110 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1395_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1395_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1395_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_1395_Regression/client.cpp b/orbsvcs/tests/Bug_1395_Regression/client.cpp
index 5b159a6fc72..506f0220319 100644
--- a/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_1395_Regression/run_test.pl b/orbsvcs/tests/Bug_1395_Regression/run_test.pl
index a6ec278de0b..0e7cb9f2f87 100755
--- a/orbsvcs/tests/Bug_1395_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1395_Regression/run_test.pl
@@ -54,9 +54,9 @@ $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_
                                         "-ORBInitRef ImplRepoService=file://$server_imr_ior ".
                                         "-ORBUseIMR 1");
 $CL = $client->CreateProcess ("client", "-k file://$client_srv_ior");
-$LC = $locator->CreateProcess ("$imr_bin_path/ImplRepo_Service", "-o $locator_imr_ior ".
+$LC = $locator->CreateProcess ("$imr_bin_path/tao_imr_locator", "-o $locator_imr_ior ".
                                                                  "-ORBEndpoint iiop://:$port");
-$AC = $activator->CreateProcess ("$imr_bin_path/ImR_Activator", 
+$AC = $activator->CreateProcess ("$imr_bin_path/tao_imr_activator",
                                  "-o $activator_actv_ior ".
                                  "-ORBInitRef ImplRepoService=file://$activator_imr_ior");
 
diff --git a/orbsvcs/tests/Bug_1395_Regression/server.cpp b/orbsvcs/tests/Bug_1395_Regression/server.cpp
index 3ace4f1a72d..383d446bfcf 100644
--- a/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -47,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_1436_Regression/run_test.pl b/orbsvcs/tests/Bug_1436_Regression/run_test.pl
index eed9ffff0cc..5e399f43fdb 100755
--- a/orbsvcs/tests/Bug_1436_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1436_Regression/run_test.pl
@@ -52,7 +52,7 @@ $tao_ifr_result_file     = $ifr_service->LocalFile ($result_files[1]);
 $ifr_service->DeleteFile ($result_files[0]);
 $tao_ifr->DeleteFile ($result_files[1]);
 
-$IFRSERVICE = $ifr_service->CreateProcess("$ifr_bin_path/IFR_Service", "-ORBdebuglevel $debug_level ".
+$IFRSERVICE = $ifr_service->CreateProcess("$ifr_bin_path/tao_ifr_service", "-ORBdebuglevel $debug_level ".
                                          "-ORBLogFile $ifr_service_result_file ".
                                          "-o $ifr_service_iorfile");
 $TAOIFR = $tao_ifr->CreateProcess("$tao_ifr_bin_path/tao_ifr", "-ORBLogFile $tao_ifr_result_file ".
diff --git a/orbsvcs/tests/Bug_1437_Regression/run_test.pl b/orbsvcs/tests/Bug_1437_Regression/run_test.pl
index 8c87f4bac7f..d0d1f3be8bc 100755
--- a/orbsvcs/tests/Bug_1437_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1437_Regression/run_test.pl
@@ -39,11 +39,11 @@ $tao_imr->DeleteFile ($imr_ior);
 # Run the IMR locator on a fixed port
 my $locator_port = $locator->RandomPort();
 
-$LC = $locator->CreateProcess ("../../ImplRepo_Service/ImplRepo_Service",
+$LC = $locator->CreateProcess ("../../ImplRepo_Service/tao_imr_locator",
                                "-ORBdebuglevel $debug_level -o $locator_imr_iorfile ".
                                "-ORBEndpoint iiop://:$locator_port");
 
-$AC = $activator->CreateProcess ("../../ImplRepo_Service/ImR_Activator",
+$AC = $activator->CreateProcess ("../../ImplRepo_Service/tao_imr_activator",
                                  "-ORBdebuglevel $debug_level -o $activator_iorfile ".
                                  "-ORBInitRef ImplRepoService=file://$activator_imr_iorfile");
 
diff --git a/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/orbsvcs/tests/Bug_1630_Regression/Makefile.am
deleted file mode 100644
index cbbfd8ad9c7..00000000000
--- a/orbsvcs/tests/Bug_1630_Regression/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1630_testclient.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = testclient
-
-testclient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-testclient_SOURCES = \
-  testclient.cpp
-
-testclient_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_1630_Regression/run_test.pl b/orbsvcs/tests/Bug_1630_Regression/run_test.pl
index 13b337b9020..492320b2a85 100755
--- a/orbsvcs/tests/Bug_1630_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1630_Regression/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level -o $server_iorfile");
 $CL = $client->CreateProcess ("testclient", "-ORBInitRef InterfaceRepository=file://$client_iorfile");
 
diff --git a/orbsvcs/tests/Bug_2074_Regression/Makefile.am b/orbsvcs/tests/Bug_2074_Regression/Makefile.am
deleted file mode 100644
index 72b36c37461..00000000000
--- a/orbsvcs/tests/Bug_2074_Regression/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2074_Regression_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-test_SOURCES = \
-  ORB_Task.cpp \
-  test.cpp \
-  ORB_Task.h
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
index 8b28339da93..43136853f36 100644
--- a/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ b/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
@@ -10,7 +10,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "orbsvcs/CosNamingC.h"
 
-ACE_RCSID(Bug_2074_Regression, ORB_Task, "$Id$")
+
 
 ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc b/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
new file mode 100644
index 00000000000..73eec09226d
--- /dev/null
+++ b/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project(*Client) : namingexe, portableserver, messaging {
+  exename  = client
+}
+
diff --git a/orbsvcs/tests/Bug_2112_Regression/client.cpp b/orbsvcs/tests/Bug_2112_Regression/client.cpp
new file mode 100644
index 00000000000..64b1aa5d13f
--- /dev/null
+++ b/orbsvcs/tests/Bug_2112_Regression/client.cpp
@@ -0,0 +1,63 @@
+// $Id$
+
+#include "ace/Log_Msg.h"
+#include "tao/corba.h"
+#include "tao/TimeBaseC.h"
+#include "tao/Messaging/Messaging.h"
+#include "orbsvcs/CosNamingC.h"
+
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  int retval = 0;
+  // Initialise ORB
+  CORBA::ORB_var Orb = CORBA::ORB_init(argc, argv);
+
+  // Set round-trip timeout
+  const int timeout_secs = 5;
+
+  CORBA::Object_var obj = Orb->resolve_initial_references ("ORBPolicyManager");
+  CORBA::PolicyManager_var policy_manager =
+    CORBA::PolicyManager::_narrow (obj.in());
+
+  CORBA::PolicyList policy_list;
+  policy_list.length(0);
+  policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
+
+  TimeBase::TimeT timeout = timeout_secs * 10000000;
+  CORBA::Any orb_timeout;
+  orb_timeout <<= timeout;
+  policy_list.length(1);
+  policy_list[0] = Orb->create_policy(
+    Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, orb_timeout);
+
+  policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
+
+  // Now try to contact a server.
+  // Use a remote machine that is unreachable on the network.
+  const char * obj_ref = "corbaloc:iiop:1.0@123.123.123.123:4567/NameService";
+
+  obj = Orb->string_to_object(obj_ref);
+
+  CosNaming::NamingContext_var inc;
+  if(!CORBA::is_nil(obj.in ()))
+    {
+      ACE_DEBUG(( LM_INFO, "Attempting to contact %C\n", obj_ref ));
+      try
+        {
+          inc = CosNaming::NamingContext::_narrow(obj.in());
+          ACE_DEBUG(( LM_INFO, "OK\n" ));
+        }
+      catch(const CORBA::TRANSIENT &)
+        {
+          ACE_ERROR ((LM_ERROR, "Error, caught transient exception\n"));
+          retval = 1;
+        }
+      catch(const CORBA::TIMEOUT &)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Caught correct timeout\n"));
+        }
+    }
+
+  return retval;
+}
+
diff --git a/orbsvcs/tests/Bug_2112_Regression/run_test.pl b/orbsvcs/tests/Bug_2112_Regression/run_test.pl
new file mode 100755
index 00000000000..b625ebe7487
--- /dev/null
+++ b/orbsvcs/tests/Bug_2112_Regression/run_test.pl
@@ -0,0 +1,22 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+
+$SV = $server->CreateProcess ("client", "");
+
+$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
+
+if ($test != 0) {
+    print STDERR "ERROR: test returned $test\n";
+    exit 1;
+}
+
+exit 0;
diff --git a/orbsvcs/tests/Bug_2137_Regression/Makefile.am b/orbsvcs/tests/Bug_2137_Regression/Makefile.am
deleted file mode 100644
index 13c4b1693c1..00000000000
--- a/orbsvcs/tests/Bug_2137_Regression/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2137_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2137_Regression/client.cpp b/orbsvcs/tests/Bug_2137_Regression/client.cpp
index cfcd3ec5afc..1d3c0dac05e 100644
--- a/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -26,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/orbsvcs/tests/Bug_2247_Regression/Makefile.am
deleted file mode 100644
index d94e337933d..00000000000
--- a/orbsvcs/tests/Bug_2247_Regression/Makefile.am
+++ /dev/null
@@ -1,135 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2247_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2247_Regression_Manager.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Manager
-
-Manager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Manager_SOURCES = \
-  Manager.cpp \
-  testC.cpp \
-  Manager.h
-
-Manager_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2247_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index cd38accf129..3b87dbd6560 100644
--- a/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -71,7 +71,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2247_Regression/server.cpp b/orbsvcs/tests/Bug_2247_Regression/server.cpp
index 0e6e4335996..95d4bc297a8 100644
--- a/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/orbsvcs/tests/Bug_2248_Regression/Client_i.h
index e85d58ef471..402529f99c6 100644
--- a/orbsvcs/tests/Bug_2248_Regression/Client_i.h
+++ b/orbsvcs/tests/Bug_2248_Regression/Client_i.h
@@ -1,15 +1,17 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    A helper class for the client
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.h
+ *
+ *  $Id$
+ *
+ *  A helper class for the client
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef BUG_2248_REGRESSION_CLIENT_I_H
 #define BUG_2248_REGRESSION_CLIENT_I_H
@@ -24,11 +26,11 @@
 class Client_i
 {
 public:
+  /// Our constructor
   Client_i (CORBA::ORB_ptr orb);
-  // Our constructor
 
+  /// Initialize the ORB etc.
   int init (void);
-  // Initialize the ORB etc.
 
 private:
   CORBA::ORB_var orb_;
diff --git a/orbsvcs/tests/Bug_2248_Regression/Makefile.am b/orbsvcs/tests/Bug_2248_Regression/Makefile.am
deleted file mode 100644
index b42d58a398e..00000000000
--- a/orbsvcs/tests/Bug_2248_Regression/Makefile.am
+++ /dev/null
@@ -1,179 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2248_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  testsC.cpp \
-  testsC.h \
-  testsC.inl \
-  testsS.cpp \
-  testsS.h \
-  testsS.inl
-
-CLEANFILES += \
-  tests-stamp \
-  testsC.cpp \
-  testsC.h \
-  testsC.inl \
-  testsS.cpp \
-  testsS.h \
-  testsS.inl
-
-testsC.cpp testsC.h testsC.inl testsS.cpp testsS.h testsS.inl: tests-stamp
-
-tests-stamp: $(srcdir)/tests.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/tests.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl \
-  tests.idl
-
-## Makefile.Bug_2248_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2248_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  testsC.cpp \
-  testsS.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2248_Regression/client.cpp b/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 9cc9cdb2f6e..c45ace22ae6 100644
--- a/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -11,7 +11,7 @@
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
-#include "ace/OS.h"
+#include "ace/OS_NS_unistd.h"
 
 // Files which have the IOR
 const ACE_TCHAR *first_ior = 0;
@@ -71,7 +71,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2248_Regression/server.cpp b/orbsvcs/tests/Bug_2248_Regression/server.cpp
index 59feb7de5cb..cabcf8fbc13 100644
--- a/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -42,7 +42,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index ce5558c04f2..8814ead3a6c 100644
--- a/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 CORBA::Boolean
 Hello::ids_differ_ = 1;
diff --git a/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/orbsvcs/tests/Bug_2285_Regression/Makefile.am
deleted file mode 100644
index 15f7ed015e1..00000000000
--- a/orbsvcs/tests/Bug_2285_Regression/Makefile.am
+++ /dev/null
@@ -1,251 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2285_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2285_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2285_Regression_Client2.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client2
-
-client2_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client2_SOURCES = \
-  TestC.cpp \
-  client2.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor.h \
-  ServerRequest_Interceptor2.h
-
-client2_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2285_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer.cpp \
-  ServerRequest_Interceptor.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerRequest_Interceptor.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2285_Regression_Server2.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server2
-
-server2_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server2_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server2.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server2_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index b4bcbcaeda5..b5d5b8e6d6e 100644
--- a/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -1,3 +1,4 @@
+// $Id$
 // -*- C++ -*-
 
 #include "ServerRequest_Interceptor.h"
@@ -11,10 +12,6 @@
 #include "ace/OS_NS_string.h"
 #include "Hello.h"
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void)
 : orb_ (0),
   client_id_ (0)
diff --git a/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index a98700b1e51..655ddbf58fb 100644
--- a/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -14,10 +15,6 @@
 #include "Hello.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
 : orb_ (0),
   client_id_ (0)
diff --git a/orbsvcs/tests/Bug_2285_Regression/Test.idl b/orbsvcs/tests/Bug_2285_Regression/Test.idl
index 00cc73c174e..1b66c41a709 100644
--- a/orbsvcs/tests/Bug_2285_Regression/Test.idl
+++ b/orbsvcs/tests/Bug_2285_Regression/Test.idl
@@ -16,18 +16,18 @@ module Test
     oneway void shutdown ();
 
     // Methods for first test
-    
+
     // The client first calls this to generate a (user) exception
     // which is handled in the application code
     void throw_exception () raises (MyException);
-    
+
     // Starts the nested sequence - client calls...
     boolean call_me_back (in Hello me);
-    
+
     // ... then the server calls this back onto the client,
     // which prompts the client to call...
     boolean call_back ();
-    
+
     // ... this ! The server interceptor will have been recording
     // if any retention ID has been reused in the sequence of invocations
     // @return true for all different, false otherwise.
diff --git a/orbsvcs/tests/Bug_2285_Regression/client.cpp b/orbsvcs/tests/Bug_2285_Regression/client.cpp
index 97f77e1ffaa..0ae6bcb47a9 100644
--- a/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 9b9e21b6bec..8f46138e1ef 100644
--- a/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -9,7 +9,7 @@
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 //const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2285_Regression/run_test2.pl b/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
index 8fd2f4fe3f6..b13c3915082 100755
--- a/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
+++ b/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
@@ -83,7 +83,7 @@ for($i = 0; $i < $number_of_servers; $i++) {
 # Loops are cheap.
 for ($i = 0; $i < $number_of_servers; $i++) {
     $result = wait_get_send_ior($i);
- 
+
     if ($result != 0) {
         for ($j = 0; $j < $i + 1; $j++) {
             $SV[$j]->Kill (); $SV[$j]->TimedWait (1);
diff --git a/orbsvcs/tests/Bug_2285_Regression/server.cpp b/orbsvcs/tests/Bug_2285_Regression/server.cpp
index 8c84289abfd..1dae1234895 100644
--- a/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -11,10 +11,6 @@
 #include "tao/PI/PI.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
@@ -40,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index 55ce7d5c579..b29fc630c62 100644
--- a/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -9,10 +9,6 @@
 #include "tao/PI/PI.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("");
 
 CORBA::ULong my_id_number = 0;
@@ -45,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index c20b692c4af..1c7d9ff5608 100644
--- a/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/orbsvcs/tests/Bug_2287_Regression/Makefile.am
deleted file mode 100644
index 4050cbe0fde..00000000000
--- a/orbsvcs/tests/Bug_2287_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2287_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2287_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2287_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index d009ae9a5ab..eacb684044c 100644
--- a/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -15,10 +16,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "tao/PI/PIForwardRequestC.h"
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
 : orb_ (0),
   expired_ (0)
diff --git a/orbsvcs/tests/Bug_2287_Regression/client.cpp b/orbsvcs/tests/Bug_2287_Regression/client.cpp
index da8bd5258d7..894f0b52923 100644
--- a/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2287_Regression/run_test.pl b/orbsvcs/tests/Bug_2287_Regression/run_test.pl
index b1492af15f9..018f2f5eac3 100755
--- a/orbsvcs/tests/Bug_2287_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2287_Regression/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
diff --git a/orbsvcs/tests/Bug_2287_Regression/server.cpp b/orbsvcs/tests/Bug_2287_Regression/server.cpp
index 6b6bf38037b..58a197d2436 100644
--- a/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -13,10 +13,6 @@
 // Make sure this file is included to avoid permanent forward problems in win32.
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
@@ -42,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2316_Regression/Makefile.am b/orbsvcs/tests/Bug_2316_Regression/Makefile.am
deleted file mode 100644
index 5fcd376fff9..00000000000
--- a/orbsvcs/tests/Bug_2316_Regression/Makefile.am
+++ /dev/null
@@ -1,129 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2316_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2316_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2316_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_impl.cpp \
-  server.cpp \
-  Test_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2316_Regression/Test.idl b/orbsvcs/tests/Bug_2316_Regression/Test.idl
index 36820e2b6d1..e79f3b87281 100644
--- a/orbsvcs/tests/Bug_2316_Regression/Test.idl
+++ b/orbsvcs/tests/Bug_2316_Regression/Test.idl
@@ -1,7 +1,7 @@
 // $Id$
 
 #ifndef _TEST_IDL_
-#define _TEST_IDL_ 
+#define _TEST_IDL_
 
 interface server
 {
diff --git a/orbsvcs/tests/Bug_2316_Regression/Test_impl.h b/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
index 5ecc2954d86..cf80fb9115d 100644
--- a/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
+++ b/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
@@ -4,7 +4,7 @@
 #define TEST_IMPL_HPP
 
 #include "TestS.h"
-    
+
 class Server_impl   : public virtual POA_server
 {
 public:
@@ -13,7 +13,7 @@ public:
   virtual void shutdown ();
 
 private:
-  CORBA::ORB_var orb_;    
+  CORBA::ORB_var orb_;
 };
 
 #endif /* TEST_IMPL_HPP */
diff --git a/orbsvcs/tests/Bug_2316_Regression/server.cpp b/orbsvcs/tests/Bug_2316_Regression/server.cpp
index 8901b60621d..5f02be738fa 100644
--- a/orbsvcs/tests/Bug_2316_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2316_Regression/server.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2316_Regression/svc.conf b/orbsvcs/tests/Bug_2316_Regression/svc.conf
index 65508eb6d59..5099f572598 100644
--- a/orbsvcs/tests/Bug_2316_Regression/svc.conf
+++ b/orbsvcs/tests/Bug_2316_Regression/svc.conf
@@ -1,4 +1,5 @@
 # $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
diff --git a/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp b/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
index cd1f6e360cf..23e2e601a64 100644
--- a/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
+++ b/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
@@ -57,7 +57,7 @@ MessageLog::~MessageLog ()
 void
 MessageLog::register_message_send (int message_num)
 {
-  ACE_Guard<ACE_Mutex> guard(this->mutex_);
+  ACE_GUARD (ACE_Mutex, ace_mon, this->mutex_);
   if (0 <= message_num && message_num < this->expected_)
     {
       this->sent_[message_num]++;
@@ -66,7 +66,7 @@ MessageLog::register_message_send (int message_num)
     {
       this->overdoseS_++;
     }
-  
+
   if (!this->supress_)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -78,7 +78,7 @@ MessageLog::register_message_send (int message_num)
 void
 MessageLog::register_message_recv (int message_num)
 {
-  ACE_Guard<ACE_Mutex> guard(this->mutex_);
+  ACE_GUARD (ACE_Mutex, ace_mon, this->mutex_);
   if (0 <= message_num && message_num < this->expected_)
     {
       this->rcvd_[message_num]++;
diff --git a/orbsvcs/tests/Bug_2377_Regression/Makefile.am b/orbsvcs/tests/Bug_2377_Regression/Makefile.am
deleted file mode 100644
index 226d1539305..00000000000
--- a/orbsvcs/tests/Bug_2377_Regression/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2377_Regression_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_PROGRAMS = uipmc_test
-
-uipmc_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-uipmc_test_SOURCES = \
-  HelloC.cpp \
-  HelloS.cpp \
-  Hello_Impl.cpp \
-  uipmc_test.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl \
-  Hello_Impl.h
-
-uipmc_test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2377_Regression/svc.conf b/orbsvcs/tests/Bug_2377_Regression/svc.conf
index 1510ade0e8f..9fa10a35d9f 100644
--- a/orbsvcs/tests/Bug_2377_Regression/svc.conf
+++ b/orbsvcs/tests/Bug_2377_Regression/svc.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread -ORBAllowReactivationOfSystemids 1"
-static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandler MT"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBAllowReactivationOfSystemids 1"
+static Client_Strategy_Factory "-ORBClientConnectionHandler MT"
diff --git a/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp b/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
index 09e8e6aad40..f6e0c0122e1 100644
--- a/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
+++ b/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
@@ -61,7 +61,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
     }
   while (true);
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -121,7 +121,7 @@ public:
           {
             int c = 0;
             {
-              ACE_Guard<ACE_Mutex> guard (this->mutex_);
+              ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->mutex_, 0);
               c = this->count_++;
             }
 
diff --git a/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index 81115492175..dfa637f9960 100644
--- a/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -5,7 +5,7 @@
 #include "ServerRequest_Interceptor2.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2615_Regression/Makefile.am b/orbsvcs/tests/Bug_2615_Regression/Makefile.am
deleted file mode 100644
index 35af4cabe88..00000000000
--- a/orbsvcs/tests/Bug_2615_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2615_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2615_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2615_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 7dd4cec52fe..74d342ba8ab 100644
--- a/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -15,10 +16,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "tao/PI/PIForwardRequestC.h"
 
-ACE_RCSID (FaultTolerance,
-           ServerRequest_Interceptor2,
-           "$Id$")
-
 CORBA::Boolean
 ServerRequest_Interceptor2::has_ft_request_sc_ = false;
 
diff --git a/orbsvcs/tests/Bug_2615_Regression/Test.idl b/orbsvcs/tests/Bug_2615_Regression/Test.idl
index 13acc187276..dc6d9c82e4e 100644
--- a/orbsvcs/tests/Bug_2615_Regression/Test.idl
+++ b/orbsvcs/tests/Bug_2615_Regression/Test.idl
@@ -13,11 +13,11 @@ module Test
      */
     oneway void shutdown ();
 
-    // Lets make sure things are working
+    /// Lets make sure things are working
     void ping ();
 
-    // Calling this method returns true iff a FT request
-    // service context was received in the server
+    /// Calling this method returns true if a FT request
+    /// service context was received in the server
     boolean has_ft_request_service_context ();
   };
 };
diff --git a/orbsvcs/tests/Bug_2615_Regression/client.cpp b/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 8de294f3253..2632105c7f5 100644
--- a/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://ior.ior");
 const ACE_TCHAR *iogr = ACE_TEXT("file://iogr.ior");
@@ -37,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2615_Regression/run_test.pl b/orbsvcs/tests/Bug_2615_Regression/run_test.pl
index ee23d89724a..10e7d173aa4 100755
--- a/orbsvcs/tests/Bug_2615_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2615_Regression/run_test.pl
@@ -33,7 +33,7 @@ my $client_iogrfile = $client->LocalFile ($iogrbase);
 $server->DeleteFile($iogrbase);
 $client->DeleteFile($iogrbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile " .
                               "-p $server_iogrfile");
diff --git a/orbsvcs/tests/Bug_2615_Regression/server.cpp b/orbsvcs/tests/Bug_2615_Regression/server.cpp
index a1206b32b29..7da2b3117cf 100644
--- a/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -11,10 +11,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "Hello.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior.ior");
 const ACE_TCHAR *iogr_output_file = ACE_TEXT("iogr.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
@@ -44,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2709_Regression/Makefile.am b/orbsvcs/tests/Bug_2709_Regression/Makefile.am
deleted file mode 100644
index b89cb7be2c6..00000000000
--- a/orbsvcs/tests/Bug_2709_Regression/Makefile.am
+++ /dev/null
@@ -1,179 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2709_Regression_Idl.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2709_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestImpl.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Server_Task.h \
-  TestImpl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2709_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestImpl.cpp \
-  TestS.cpp \
-  server.cpp \
-  Server_Task.h \
-  TestImpl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2709_Regression/run_test.pl b/orbsvcs/tests/Bug_2709_Regression/run_test.pl
index 7200081f22a..953172a670c 100755
--- a/orbsvcs/tests/Bug_2709_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2709_Regression/run_test.pl
@@ -32,7 +32,7 @@ $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 $client->DeleteFile($colloc_iorfile);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
diff --git a/orbsvcs/tests/Bug_2709_Regression/server.cpp b/orbsvcs/tests/Bug_2709_Regression/server.cpp
index 7d862a52fd9..d5170de178d 100644
--- a/orbsvcs/tests/Bug_2709_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2709_Regression/server.cpp
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 #include "TestImpl.h"
 #include "ace/Get_Opt.h"
@@ -9,10 +7,6 @@
 #include "tao/IORTable/IORTable.h"
 #include "Server_Task.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
diff --git a/orbsvcs/tests/Bug_2777_Regression/run_test.pl b/orbsvcs/tests/Bug_2777_Regression/run_test.pl
index 37848fcc6ec..60fbbfbcf21 100755
--- a/orbsvcs/tests/Bug_2777_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2777_Regression/run_test.pl
@@ -37,8 +37,8 @@ for my $p (@nslist_paths) {
     $nslist_path = $use_path . '/tao_nslist';
     last;
   }
-  if ($exec_extn ne "" && -e $p . '/tao_nslist' . $exec_extn) {
-    $nslist_path = $use_path . '/tao_nslist' . $exec_extn;
+  if ($exec_extn ne "" && -e $p->[0] . '/tao_nslist' . $exec_extn) {
+    $nslist_path = $use_path . '/tao_nslist';
     last;
   }
 }
@@ -48,8 +48,16 @@ if ($nslist_path eq "") {
     exit 1;
 }
 
+## The two test targets will communicate over shared memory (SHMIOP) so they
+## can't be 32-bit and 64-bit executables on the same host.
+my $target_ns_list = 2;
+if (exists $ENV{'DOC_TEST_2_EXE_SUBDIR'} && $ENV{'DOC_TEST_2_OS'} eq 'local' &&
+    $ENV{'DOC_TEST_2_EXE_SUBDIR'} ne $PerlACE::Process::ExeSubDir) {
+  $target_ns_list = 1;
+}
+
 my $ns_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-my $ns_list = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+my $ns_list = PerlACE::TestTarget::create_target ($target_ns_list) || die "Create target $target_ns_list failed\n";
 
 my $iorbase = "ns.ior";
 my $ns_service_iorfile = $ns_service->LocalFile ($iorbase);
@@ -57,7 +65,7 @@ my $ns_list_iorfile = $ns_list->LocalFile ($iorbase);
 $ns_service->DeleteFile($iorbase);
 $ns_list->DeleteFile($iorbase);
 
-$NS = $ns_service->CreateProcess ("../../../../TAO/orbsvcs/Naming_Service/Naming_Service",
+$NS = $ns_service->CreateProcess ("../../../../TAO/orbsvcs/Naming_Service/tao_cosnaming",
                                   "-ORBdebuglevel $debug_level -o $ns_service_iorfile ".
                                   "-ORBObjRefStyle URL -ORBEndpoint shmiop:// -ORBSvcConfDirective ".
                                   "\"dynamic SHMIOP_Factory Service_Object ".
diff --git a/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
index df5dc90d3d9..752bb07aa19 100644
--- a/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2800_Regression/Makefile.am b/orbsvcs/tests/Bug_2800_Regression/Makefile.am
deleted file mode 100644
index 15321a05bce..00000000000
--- a/orbsvcs/tests/Bug_2800_Regression/Makefile.am
+++ /dev/null
@@ -1,156 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2800_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2800_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h \
-  NamingTask.h \
-  NsShutdown.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2800_Regression_NsMain.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += nsmain
-
-nsmain_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-nsmain_SOURCES = \
-  Hello.cpp \
-  NamingTask.cpp \
-  NsShutdown.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  nsmain.cpp \
-  Hello.h \
-  NamingTask.h \
-  NsShutdown.h
-
-nsmain_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2800_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
index ae73a73eefd..567d1fd0e70 100644
--- a/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
@@ -1,11 +1,6 @@
-//
 // $Id$
-//
-#include "NsShutdown.h"
 
-ACE_RCSID(Hello,
-          NsShutdown,
-          "$Id$")
+#include "NsShutdown.h"
 
 NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2800_Regression/client.cpp b/orbsvcs/tests/Bug_2800_Regression/client.cpp
index 17f6fe73f85..d3f2259fc2f 100644
--- a/orbsvcs/tests/Bug_2800_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/client.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior");
 bool shutdown_nsmain = false;
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
index abced085c27..abbfd795475 100644
--- a/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -4,7 +4,6 @@
 #include "Hello.h"
 #include "NsShutdown.h"
 #include "orbsvcs/CosNamingC.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ns.ior");
@@ -58,7 +57,7 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
         shutdown_ns_ = true;
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -80,7 +79,7 @@ int TestTask::svc()
       ACE_ERROR_RETURN ((LM_ERROR,
                           "Cannot open output file for writing IOR: ns.ior\n"),
                           1);
-    ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (namingServiceA_.ior ()));
+    ACE_OS::fprintf (output_file, "%s", namingServiceA_.ior ());
     ACE_OS::fclose (output_file);
 
     // Get reference to Root POA
diff --git a/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl b/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
index de736f305a2..dcfb93f9dc7 100755
--- a/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
+++ b/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
@@ -50,9 +50,9 @@ $ns2->DeleteFile ($ns2_ior);
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
 $CL = $client->CreateProcess ("client", "");
 
-$NS1 = $ns1->CreateProcess("../../Naming_Service/Naming_Service",
+$NS1 = $ns1->CreateProcess("../../Naming_Service/tao_cosnaming",
                            "-ORBEndPoint $ns_endpoint1 -o $ns1_iorfile -m 0");
-$NS2 = $ns2->CreateProcess("../../Naming_Service/Naming_Service",
+$NS2 = $ns2->CreateProcess("../../Naming_Service/tao_cosnaming",
                            "-ORBEndPoint $ns_endpoint2 -o $ns2_iorfile -m 0");
 
 # Run two Naming Servers
diff --git a/orbsvcs/tests/Bug_2800_Regression/server.cpp b/orbsvcs/tests/Bug_2800_Regression/server.cpp
index 9dd4570db86..128d429cd5a 100644
--- a/orbsvcs/tests/Bug_2800_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/server.cpp
@@ -50,7 +50,7 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
         ior_output_file = get_opts.opt_arg ();
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2925_Regression/Makefile.am b/orbsvcs/tests/Bug_2925_Regression/Makefile.am
deleted file mode 100644
index a3a747f9c7c..00000000000
--- a/orbsvcs/tests/Bug_2925_Regression/Makefile.am
+++ /dev/null
@@ -1,137 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2925_Regression_IDL.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Hello.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2925_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  HelloC.cpp \
-  client.cpp \
-  Hello_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2925_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  HelloC.cpp \
-  HelloS.cpp \
-  Hello_Impl.cpp \
-  server.cpp \
-  Hello_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2925_Regression/client.cpp b/orbsvcs/tests/Bug_2925_Regression/client.cpp
index 22f428a8c99..bd6e67c94b9 100644
--- a/orbsvcs/tests/Bug_2925_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2925_Regression/client.cpp
@@ -105,7 +105,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
     }
   while (true);
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -130,7 +130,7 @@ public:
           {
             CORBA::Short c = 0;
             {
-              ACE_Guard<ACE_Mutex> guard (this->mutex_);
+              ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->mutex_, 0);
               c = this->count_++;
             }
 
diff --git a/orbsvcs/tests/Bug_2925_Regression/run_test.pl b/orbsvcs/tests/Bug_2925_Regression/run_test.pl
index 595d9064fd1..5a906d21c11 100755
--- a/orbsvcs/tests/Bug_2925_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2925_Regression/run_test.pl
@@ -11,7 +11,7 @@ use PerlACE::TestTarget;
 $status = 0;
 $debug_level = '0';
 $miop_address = '230.255.255.33';
-$port = '7394'; 
+$port = '7394';
 
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
@@ -28,7 +28,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/$miop_address:$port " .
                               "-o $server_iorfile");
diff --git a/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl b/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl
index faceeae6586..7f548cc0884 100755
--- a/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl
+++ b/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl
@@ -11,7 +11,7 @@ use PerlACE::TestTarget;
 $status = 0;
 $debug_level = '0';
 $miop_address = '[FF01:0:0:0:0:0:BEBE:75]';
-$port = '5555'; 
+$port = '5555';
 
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
@@ -28,7 +28,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/$miop_address:$port " .
                               "-o $server_iorfile");
diff --git a/orbsvcs/tests/Bug_2925_Regression/server.cpp b/orbsvcs/tests/Bug_2925_Regression/server.cpp
index 5bfada12cd4..56129a8e434 100644
--- a/orbsvcs/tests/Bug_2925_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2925_Regression/server.cpp
@@ -48,7 +48,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
     }
   while (true);
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2925_Regression/svc.conf b/orbsvcs/tests/Bug_2925_Regression/svc.conf
index 1510ade0e8f..9fa10a35d9f 100644
--- a/orbsvcs/tests/Bug_2925_Regression/svc.conf
+++ b/orbsvcs/tests/Bug_2925_Regression/svc.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread -ORBAllowReactivationOfSystemids 1"
-static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandler MT"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBAllowReactivationOfSystemids 1"
+static Client_Strategy_Factory "-ORBClientConnectionHandler MT"
diff --git a/orbsvcs/tests/Bug_3215_Regression/Hello.cpp b/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
index b838677dfdc..185704c073d 100644
--- a/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3215_Regression/Makefile.am b/orbsvcs/tests/Bug_3215_Regression/Makefile.am
deleted file mode 100644
index aa52b9bff6c..00000000000
--- a/orbsvcs/tests/Bug_3215_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3215_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_3215_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_3215_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
index 4306f129fe2..6f9554e3515 100644
--- a/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
+++ b/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -17,10 +18,6 @@
 
 int invocation_count = 0;
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
 : orb_ (0),
   expired_ (0)
diff --git a/orbsvcs/tests/Bug_3215_Regression/client.cpp b/orbsvcs/tests/Bug_3215_Regression/client.cpp
index f026595737b..76d5260263b 100644
--- a/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3215_Regression/run_test.pl b/orbsvcs/tests/Bug_3215_Regression/run_test.pl
index 33d5a50cb28..9d5b15d0ea3 100755
--- a/orbsvcs/tests/Bug_3215_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_3215_Regression/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
diff --git a/orbsvcs/tests/Bug_3215_Regression/server.cpp b/orbsvcs/tests/Bug_3215_Regression/server.cpp
index a321f4d6d21..db81c1d7630 100644
--- a/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -13,10 +13,6 @@
 // Make sure this file is included to avoid permanent forward problems in win32.
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
@@ -42,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -54,7 +50,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
   iors.length(1);
   iors [0] = CORBA::Object::_duplicate (ref);
-    
+
   CORBA::Object_var new_ref =
     iorm->merge_iors (iors );
 
@@ -130,34 +126,34 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
-      
-      
+
+
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
                                                );
-      
+
 
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT
                                           );
-      
+
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
                               policies
                               );
-      
+
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
           policy->destroy ();
-          
+
         }
 
 
@@ -169,29 +165,29 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                       Hello (orb.in (), Test::Hello::_nil ()),
                       1);
       PortableServer::ServantBase_var holder (hello_impl);
-                      
+
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
                                        hello_impl
                                        );
-      
+
 
       CORBA::Object_var hello =
         my_poa->id_to_reference (server_id.in () );
-      
-      
+
+
       CORBA::String_var ior =
         orb->object_to_string (hello.in () );
-      
-      
+
+
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
                                          0
                                          );
-      
+
 
       // Narrow
       iorm =
@@ -199,14 +195,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::Object_var iortmp =
         orb->string_to_object (ior.in ());
-      
+
       CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, iortmp.in ());
-      
-      
+
+
       CORBA::String_var iorgr_string =
         orb->object_to_string (iogr.in () );
-      
-      
+
+
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -218,17 +214,17 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_OS::fclose (output_file);
 
       temp_initializer->set_server_iogr (iogr.in ());
-          
+
       poa_manager->activate ();
-      
+
 
       orb->run ();
-      
+
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1, 1 );
-      
+
 
       orb->destroy ();
     }
@@ -238,7 +234,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "Exception caught:");
       return 1;
     }
-  
+
 
   return 0;
 }
diff --git a/orbsvcs/tests/Bug_3216_Regression/Hello.cpp b/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
index 73c4c9fe95e..c5463121e4f 100644
--- a/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 CORBA::Boolean
 Hello::normal_context_ok_ = 0;
diff --git a/orbsvcs/tests/Bug_3216_Regression/Makefile.am b/orbsvcs/tests/Bug_3216_Regression/Makefile.am
deleted file mode 100644
index 43079feed0d..00000000000
--- a/orbsvcs/tests/Bug_3216_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3216_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_3216_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerRequest_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_3216_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer.cpp \
-  ServerRequest_Interceptor.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerRequest_Interceptor.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
index 62d2fa1b2ec..e4bc728b877 100644
--- a/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
+++ b/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -11,10 +12,6 @@
 #include "ace/OS_NS_string.h"
 #include "Hello.h"
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void)
 : orb_ (0),
   client_id_ (0)
diff --git a/orbsvcs/tests/Bug_3216_Regression/client.cpp b/orbsvcs/tests/Bug_3216_Regression/client.cpp
index 280732d27b9..d29d8ce1854 100644
--- a/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3216_Regression/run_test.pl b/orbsvcs/tests/Bug_3216_Regression/run_test.pl
index b1492af15f9..018f2f5eac3 100755
--- a/orbsvcs/tests/Bug_3216_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_3216_Regression/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
diff --git a/orbsvcs/tests/Bug_3216_Regression/server.cpp b/orbsvcs/tests/Bug_3216_Regression/server.cpp
index cb35a50ec49..6aa822e5431 100644
--- a/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -11,10 +11,6 @@
 #include "tao/PI/PI.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
@@ -40,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp b/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
index 899ea6a9869..74f821455e5 100644
--- a/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
+++ b/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 
-int 
+int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
@@ -50,53 +50,53 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService");
-     
+
       CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow(naming_obj.in());
-     
+
       CosNaming::Name name;
       name.length (1);
       name[0].id = CORBA::string_dup("MyEventChannel");
       CORBA::Object_var ecObj = naming_context->resolve(name);
-           
-      CosNotifyChannelAdmin::EventChannel_var ec = 
+
+      CosNotifyChannelAdmin::EventChannel_var ec =
         CosNotifyChannelAdmin::EventChannel::_narrow(ecObj.in());
-     
+
       CosNotifyChannelAdmin::AdminID adminid;
       CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
         CosNotifyChannelAdmin::OR_OP;
-      
-      CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = 
-        ec->new_for_consumers(ifgop, 
+
+      CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
+        ec->new_for_consumers(ifgop,
                               adminid);
-      
+
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
-                  
-      PortableServer::POA_var poa = 
+
+      PortableServer::POA_var poa =
         PortableServer::POA::_narrow (poa_object.in());
-      
+
       StructuredEventConsumer_i  servant (orb);
 
       PortableServer::ObjectId_var objectId = poa->activate_object (&servant);
-      
+
       CORBA::Object_var consumer_obj = poa->id_to_reference (objectId.in ());
 
-      CosNotifyComm::StructuredPushConsumer_var consumer = 
+      CosNotifyComm::StructuredPushConsumer_var consumer =
         CosNotifyComm::StructuredPushConsumer::_narrow (consumer_obj.in ());
-      
-      CosNotifyChannelAdmin::ProxyID consumeradmin_proxy_id; 
-      
+
+      CosNotifyChannelAdmin::ProxyID consumeradmin_proxy_id;
+
       CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
         consumer_admin->obtain_notification_push_supplier(
                                   CosNotifyChannelAdmin::STRUCTURED_EVENT,
                                   consumeradmin_proxy_id);
-      
+
       supplier_proxy = CosNotifyChannelAdmin::StructuredProxyPushSupplier::
         _narrow(proxy_supplier.in());
-      
+
       supplier_proxy->connect_structured_push_consumer(consumer.in());
-           
+
 
 
 
@@ -117,14 +117,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
 
-      PortableServer::POAManager_var poa_manager = poa->the_POAManager(); 
-      
+      PortableServer::POAManager_var poa_manager = poa->the_POAManager();
+
       poa_manager->activate();
-        
+
       ACE_Time_Value run_time(12);
       orb->run(&run_time);
 
-      if ( servant.nummsgs() > 0 ) 
+      if ( servant.nummsgs() > 0 )
       {
         std::cout << "Success pass " << pass << ": events received " << std::endl;
       }
@@ -132,7 +132,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       {
         std::cout << "ERROR pass " << pass << ": no events received " << std::endl;
       }
-  
+
   }
   catch(const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
index 8d6d23b5a00..ceb378aefae 100644
--- a/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
+++ b/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "orbsvcs/CosNotifyCommC.h"
@@ -13,51 +13,51 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 
-  CORBA::Object_var naming_obj = 
+  CORBA::Object_var naming_obj =
     orb_->resolve_initial_references ("NameService");
-      
+
   CosNaming::NamingContext_var naming_context =
     CosNaming::NamingContext::_narrow (naming_obj.in());
 
   CosNaming::Name name;
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
-  
+
   CORBA::Object_var obj = naming_context->resolve (name);
 
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
-      
+
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
   CosNotification::AdminProperties initial_admin;
-  
+
   CosNotifyChannelAdmin::EventChannel_var ec =
     notify_factory->create_channel (initial_qos,
                                     initial_admin,
                                     id);
 
   name[0].id = CORBA::string_dup ("MyEventChannel");
-  
+
   naming_context->rebind (name, ec.in());
-  
-  CosNotifyChannelAdmin::AdminID adminid; 
-  CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = 
-    CosNotifyChannelAdmin::OR_OP;  
-  
+
+  CosNotifyChannelAdmin::AdminID adminid;
+  CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
+    CosNotifyChannelAdmin::OR_OP;
+
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
     ec->new_for_suppliers (ifgop, adminid);
-  
+
   CosNotifyChannelAdmin::ProxyID supplieradmin_proxy_id;
-  
+
   CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
     supplier_admin->obtain_notification_push_consumer(
                                  CosNotifyChannelAdmin::STRUCTURED_EVENT,
                                  supplieradmin_proxy_id);
-  
-  StructuredEventSupplier_i *servant = 
+
+  StructuredEventSupplier_i *servant =
     new StructuredEventSupplier_i(orb_.in());
-  
+
   CORBA::Object_var poa_obj = orb_->resolve_initial_references ("RootPOA");
   PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_obj.in ());
   PortableServer::POAManager_var mgr = poa->the_POAManager ();
@@ -67,12 +67,12 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 
   CORBA::Object_var supplier_obj = poa->id_to_reference (objectId.in ());
 
-  CosNotifyComm::StructuredPushSupplier_var supplier = 
+  CosNotifyComm::StructuredPushSupplier_var supplier =
     CosNotifyComm::StructuredPushSupplier::_narrow (supplier_obj.in ());
-  
-  consumer_proxy_ = 
+
+  consumer_proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxy_consumer.in());
-  
+
   consumer_proxy_->
     connect_structured_push_supplier (supplier.in());
 }
@@ -87,29 +87,29 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message)
 {
-  
+
   ACE_OS::printf("Message from: %s\nSubject:      %s\nMessage:      %s\n",
                  user_name, subject, message);
   //cout << "Message from: " << user_name << endl;
   //cout << "Subject:      " << subject << endl;
   //cout << "Message:      " << message << endl;
-  
- 
+
+
   // Event Definition
-  CosNotification::StructuredEvent event; 
-  
-  event.header.fixed_header.event_type.domain_name = 
+  CosNotification::StructuredEvent event;
+
+  event.header.fixed_header.event_type.domain_name =
     CORBA::string_dup("OCI_TAO");
   // string
-  event.header.fixed_header.event_type.type_name = 
+  event.header.fixed_header.event_type.type_name =
     CORBA::string_dup("examples");
   // string
-  event.header.fixed_header.event_name = 
+  event.header.fixed_header.event_name =
     CORBA::string_dup("myevent");
-  
+
   // OptionalHeaderFields
-  // PropertySeq           
-  
+  // PropertySeq
+
   // sequence<Property>: string name, any value
   event.filterable_data.length (3);
   event.filterable_data[0].name = CORBA::string_dup("Message from:");
@@ -118,7 +118,7 @@ CORBA::Boolean Messenger_i::send_message (
   event.filterable_data[1].value <<= (const char *)subject;
   event.filterable_data[2].name = CORBA::string_dup("Message:");
   event.filterable_data[2].value <<= (const char *)message;
-  
+
   std::cout << "pushing " << std::endl;
   consumer_proxy_->push_structured_event(event);
 
diff --git a/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
index a11046ec762..4edfe313641 100644
--- a/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
+++ b/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
@@ -11,7 +11,7 @@ class  Messenger_i : public POA_Messenger
 {
  public:
   Messenger_i (CORBA::ORB_ptr orb);
-  
+
   virtual ~Messenger_i (void);
 
   CORBA::Boolean send_message (const char * user_name,
@@ -23,7 +23,7 @@ class  Messenger_i : public POA_Messenger
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var consumer_proxy_;
 };
 
-#endif 
+#endif
 
 
 
diff --git a/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf b/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf
index 1be0fc11b43..e7e13170555 100644
--- a/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf
+++ b/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-DispatchingThreads 1"
 #dynamic TAO_MonitorAndControl Service_Object * TAO_CosNotification_MC:_make_TAO_MonitorAndControl () "-ORBArg "-ORBDefaultInitRef iiop://dvlcps2a-pri:12345""
 #dynamic TAO_MC_Notify_Service Service_Object * TAO_CosNotification_MC_Ext:_make_TAO_MC_Notify_Service () "-DispatchingThreads 1"
diff --git a/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp b/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
index aabf120fa4f..df513d49278 100644
--- a/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
+++ b/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
@@ -11,7 +11,7 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb)
 {
 }
 
-void 
+void
 StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
@@ -20,10 +20,10 @@ StructuredEventConsumer_i::push_structured_event(
   std::cout << "event received " << std::endl;
 
   const char *value;
-  
+
   for (unsigned int i=0; i<event.filterable_data.length(); i++) {
     event.filterable_data[i].value >>= value;
-    std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; 
+    std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl;
   }
   count_++;
   if ( count_ >= 3 )
@@ -33,7 +33,7 @@ StructuredEventConsumer_i::push_structured_event(
 
 }
 
-void 
+void
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
 {
 
@@ -48,11 +48,11 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer()
 
 void
 StructuredEventConsumer_i::offer_change(
-        const CosNotification::EventTypeSeq &, 
+        const CosNotification::EventTypeSeq &,
         const CosNotification::EventTypeSeq &
       )
 {
-} 
+}
 
 int
 StructuredEventConsumer_i::nummsgs()
diff --git a/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h b/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
index a2b07b3fd30..9be7bc4cbdc 100644
--- a/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
+++ b/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
@@ -6,7 +6,7 @@
 
 #include "orbsvcs/CosNotifyCommS.h"
 
-class StructuredEventConsumer_i : 
+class StructuredEventConsumer_i :
   public virtual POA_CosNotifyComm::StructuredPushConsumer
 {
 public:
@@ -30,4 +30,4 @@ private:
     int count_;
 };
 
-#endif 
+#endif
diff --git a/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
index d31ac1ec23d..24a2c4424a3 100644
--- a/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
+++ b/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 #include "StructuredEventSupplier_i.h"
 #include "tao/PortableServer/PS_CurrentC.h"
 
@@ -12,7 +12,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
-   PortableServer::Current_var current = 
+   PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
@@ -22,9 +22,9 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 
 void
 StructuredEventSupplier_i::subscription_change (
-                    const CosNotification::EventTypeSeq &, 
+                    const CosNotification::EventTypeSeq &,
                     const CosNotification::EventTypeSeq &
       )
 {
-}       
+}
 
diff --git a/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h b/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
index 8a3ab506e1f..376fb3873c7 100644
--- a/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
+++ b/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
@@ -5,7 +5,7 @@
 
 #include "orbsvcs/CosNotifyCommS.h"
 
-class StructuredEventSupplier_i : 
+class StructuredEventSupplier_i :
   public virtual POA_CosNotifyComm::StructuredPushSupplier
 {
 public:
@@ -13,7 +13,7 @@ public:
     StructuredEventSupplier_i(CORBA::ORB_ptr orb);
     virtual void disconnect_structured_push_supplier ();
 
-    
+
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
@@ -23,4 +23,4 @@ private:
     CORBA::ORB_var orb_;
 };
 
-#endif 
+#endif
diff --git a/orbsvcs/tests/Bug_3387_Regression/run_test.pl b/orbsvcs/tests/Bug_3387_Regression/run_test.pl
index 90e063d85cd..d802120f688 100755
--- a/orbsvcs/tests/Bug_3387_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_3387_Regression/run_test.pl
@@ -51,9 +51,9 @@ $consumer2->DeleteFile ($ns_ior);
 $nt_service->DeleteFile ($nt_ior);
 $server->DeleteFile ($msngr_ior);
 
-$NMS = $nm_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service",
+$NMS = $nm_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                                   "-ORBdebuglevel $debug_level -o $nm_ns_ior");
-$NFS = $nt_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service",
+$NFS = $nt_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification",
                                   "-ORBdebuglevel $debug_level -ORBInitRef NameService=file://$nt_ns_ior ".
                                   "-IORoutput $nt_nt_ior -UseSeparateDispatchingORB 1 ".
                                   "-ORBSvcConf $nt_svc_conf");
diff --git a/orbsvcs/tests/Bug_3418_Regression/Test.cpp b/orbsvcs/tests/Bug_3418_Regression/Test.cpp
index 124ac3c41bb..ad01818d727 100644
--- a/orbsvcs/tests/Bug_3418_Regression/Test.cpp
+++ b/orbsvcs/tests/Bug_3418_Regression/Test.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/corba.h"
 #include "ace/ARGV.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tests,
-           server,
-           "$Id$")
-
 // SSLIOP
 const ACE_TCHAR argStrB[] = ACE_TEXT("BBB -ORBGestalt LOCAL -ORBId ORB-B -ORBSvcConf b.conf");
 
diff --git a/orbsvcs/tests/Bug_3418_Regression/b.conf b/orbsvcs/tests/Bug_3418_Regression/b.conf
index 039fbc84c51..5847fa22a03 100644
--- a/orbsvcs/tests/Bug_3418_Regression/b.conf
+++ b/orbsvcs/tests/Bug_3418_Regression/b.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/orbsvcs/tests/Bug_3418_Regression/m.conf b/orbsvcs/tests/Bug_3418_Regression/m.conf
index e69de29bb2d..02b5f165e45 100644
--- a/orbsvcs/tests/Bug_3418_Regression/m.conf
+++ b/orbsvcs/tests/Bug_3418_Regression/m.conf
@@ -0,0 +1,2 @@
+# $Id$
+
diff --git a/orbsvcs/tests/Bug_3444_Regression/Test.idl b/orbsvcs/tests/Bug_3444_Regression/Test.idl
index b471add6bec..32ec9db32c9 100644
--- a/orbsvcs/tests/Bug_3444_Regression/Test.idl
+++ b/orbsvcs/tests/Bug_3444_Regression/Test.idl
@@ -1,7 +1,7 @@
 // $Id$
 
 #ifndef _TEST_IDL_
-#define _TEST_IDL_ 
+#define _TEST_IDL_
 
 module Test
 {
diff --git a/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp b/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
index eac16dcaaf2..5773b0d7be3 100644
--- a/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
+++ b/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
@@ -2,7 +2,7 @@
 
 #include "Test_impl.h"
 
-ACE_RCSID(Bug_3444_Regression, Test_impl, "$Id$")
+
 
 Server_impl::Server_impl (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3444_Regression/Test_impl.h b/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
index 12a504f7230..2201809a698 100644
--- a/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
+++ b/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
@@ -4,7 +4,7 @@
 #define TEST_IMPL_HPP
 
 #include "TestS.h"
-    
+
 class Server_impl : public virtual POA_Test::Server
 {
 public:
@@ -13,7 +13,7 @@ public:
   virtual void shutdown ();
 
 private:
-  CORBA::ORB_var orb_;    
+  CORBA::ORB_var orb_;
 };
 
 #endif /* TEST_IMPL_HPP */
diff --git a/orbsvcs/tests/Bug_3444_Regression/client.cpp b/orbsvcs/tests/Bug_3444_Regression/client.cpp
index 3ccacdb17f2..a1017e32240 100644
--- a/orbsvcs/tests/Bug_3444_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3444_Regression/client.cpp
@@ -4,7 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "TestC.h"
 
-ACE_RCSID(Bug_3444_Regression, client, "$Id$")
+
 
 const ACE_TCHAR *ior_server = 0;
 
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf b/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf
index 214923a8c1d..a9376895eac 100644
--- a/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf
+++ b/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 dynamic DIOP_Factory Service_Object * TAO_Strategies:_make_TAO_DIOP_Protocol_Factory() ""
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory() "-ORBProtocolFactory DIOP_Factory"
diff --git a/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf b/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf
index 65508eb6d59..5099f572598 100644
--- a/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf
+++ b/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf
@@ -1,4 +1,5 @@
 # $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
diff --git a/orbsvcs/tests/Bug_3444_Regression/run_test.pl b/orbsvcs/tests/Bug_3444_Regression/run_test.pl
index db6949d6f35..51ce276ec70 100755
--- a/orbsvcs/tests/Bug_3444_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_3444_Regression/run_test.pl
@@ -40,7 +40,7 @@ sub run_test {
 
     $test->DeleteFile($iorbase);
     $test->DeleteFile($log);
-    
+
     my($svc_conf);
     if ($test_conf ne ''){
         $tmp_test_conf = $test->LocalFile ($test_conf);
diff --git a/orbsvcs/tests/Bug_3444_Regression/server.cpp b/orbsvcs/tests/Bug_3444_Regression/server.cpp
index df20af73877..7e8d81fbd08 100644
--- a/orbsvcs/tests/Bug_3444_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3444_Regression/server.cpp
@@ -5,7 +5,7 @@
 #include "ace/Get_Opt.h"
 #include "orbsvcs/PortableGroup/GOA.h"
 
-ACE_RCSID(Bug_3444_Regression, server, "$Id$")
+
 
 const ACE_TCHAR *uipmc_url = 0;
 const ACE_TCHAR *ior_output_file = 0;
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3486_Regression/Makefile.am b/orbsvcs/tests/Bug_3486_Regression/Makefile.am
deleted file mode 100644
index 7ee7f0b5e7a..00000000000
--- a/orbsvcs/tests/Bug_3486_Regression/Makefile.am
+++ /dev/null
@@ -1,97 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2926_Regression_Lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_LTLIBRARIES = libbug2926.la
-
-libbug2926_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DBUG2926_BUILD_DLL
-
-libbug2926_la_SOURCES = \
-  DllORB.cpp
-
-noinst_HEADERS = \
-  DllORB.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2926_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  server.cpp \
-  DllORB.h \
-  bug2926_export.h
-
-server_LDADD = \
-  libbug2926.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_3486_Regression/server.cpp b/orbsvcs/tests/Bug_3486_Regression/server.cpp
index bb6965a4127..3360f87fe7e 100644
--- a/orbsvcs/tests/Bug_3486_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3486_Regression/server.cpp
@@ -27,17 +27,16 @@ ACE_TCHAR const * const scpc_unloadNamingService = ACE_REMOVE_SERVICE_DIRECTIVE(
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -67,7 +66,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNamingService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_Naming_Loader * p_NamingService =
@@ -87,7 +87,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNamingService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NamingService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NamingService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -97,9 +98,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp b/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
index 7b9497529ec..04ad5ba319a 100644
--- a/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp")
+
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/orbsvcs/tests/Bug_3598b_Regression/client.cpp
index f86033651b1..fe0146360f8 100644
--- a/orbsvcs/tests/Bug_3598b_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3598b_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
-ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
+
 
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/orbsvcs/tests/Bug_3598b_Regression/server.cpp
index 95d61429e99..2017e62d471 100644
--- a/orbsvcs/tests/Bug_3598b_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3598b_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
index df5dc90d3d9..752bb07aa19 100644
--- a/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp b/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
index ae73a73eefd..567d1fd0e70 100644
--- a/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
@@ -1,11 +1,6 @@
-//
 // $Id$
-//
-#include "NsShutdown.h"
 
-ACE_RCSID(Hello,
-          NsShutdown,
-          "$Id$")
+#include "NsShutdown.h"
 
 NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3673_Regression/client.cpp b/orbsvcs/tests/Bug_3673_Regression/client.cpp
index f4a7a4a42a9..2c7da5f61d3 100644
--- a/orbsvcs/tests/Bug_3673_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/client.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior");
 bool shutdown_nsmain = false;
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
index abced085c27..abbfd795475 100644
--- a/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
@@ -4,7 +4,6 @@
 #include "Hello.h"
 #include "NsShutdown.h"
 #include "orbsvcs/CosNamingC.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ns.ior");
@@ -58,7 +57,7 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
         shutdown_ns_ = true;
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -80,7 +79,7 @@ int TestTask::svc()
       ACE_ERROR_RETURN ((LM_ERROR,
                           "Cannot open output file for writing IOR: ns.ior\n"),
                           1);
-    ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (namingServiceA_.ior ()));
+    ACE_OS::fprintf (output_file, "%s", namingServiceA_.ior ());
     ACE_OS::fclose (output_file);
 
     // Get reference to Root POA
diff --git a/orbsvcs/tests/Bug_3673_Regression/server.cpp b/orbsvcs/tests/Bug_3673_Regression/server.cpp
index 9dd4570db86..128d429cd5a 100644
--- a/orbsvcs/tests/Bug_3673_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/server.cpp
@@ -50,7 +50,7 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
         ior_output_file = get_opts.opt_arg ();
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc b/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
new file mode 100644
index 00000000000..953f52f8c53
--- /dev/null
+++ b/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
@@ -0,0 +1,5 @@
+// -*- MPC -*-
+// $Id$
+
+project: taoserver, avoids_corba_e_micro, imr_client {
+}
diff --git a/orbsvcs/tests/Bug_3891_Regression/Test.idl b/orbsvcs/tests/Bug_3891_Regression/Test.idl
new file mode 100644
index 00000000000..052df98670f
--- /dev/null
+++ b/orbsvcs/tests/Bug_3891_Regression/Test.idl
@@ -0,0 +1,10 @@
+//
+// $Id$
+//
+
+module Test
+{
+  interface Hello
+  {
+  };
+};
diff --git a/orbsvcs/tests/Bug_3891_Regression/run_test.pl b/orbsvcs/tests/Bug_3891_Regression/run_test.pl
new file mode 100755
index 00000000000..f054190c492
--- /dev/null
+++ b/orbsvcs/tests/Bug_3891_Regression/run_test.pl
@@ -0,0 +1,87 @@
+# $Id$
+
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+use strict;
+
+my $status = 0;
+my $debug_level = '0';
+
+foreach my $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+}
+
+my $imr = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $si = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator";
+
+my $implrepo_ior = "implrepo.ior";
+
+my $imr_imriorfile = $imr->LocalFile ($implrepo_ior);
+my $si_imriorfile = $si->LocalFile ($implrepo_ior);
+
+# Make sure the files are gone, so we can wait on them.
+$imr->DeleteFile ($implrepo_ior);
+$si->DeleteFile ($implrepo_ior);
+
+my $SVR = $imr->CreateProcess ("server", "-ORBDebugLevel $debug_level " .
+                               "-ORBUseImr 1 " .
+                               "-ORBInitRef ImplRepoService=file://$si_imriorfile");
+
+my $IR = $imr->CreateProcess ($implrepo_server, "-d 1 -t 5 " .
+                              "-o $imr_imriorfile");
+print ">>> " . $IR->CommandLine() . "\n";
+
+my $IR_status = $IR->Spawn ();
+
+if ($IR_status != 0) {
+    print STDERR "ERROR: ImplRepo Service returned $IR_status\n";
+    exit 1;
+}
+
+if ($imr->WaitForFileTimed ($implrepo_ior,$imr->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$imr_imriorfile>\n";
+    $IR->Kill (); $IR->TimedWait (1);
+    exit 1;
+}
+
+if ($imr->GetFile ($implrepo_ior) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$imr_imriorfile>\n";
+    $IR->Kill (); $IR->TimedWait (1);
+    exit 1;
+}
+if ($si->PutFile ($implrepo_ior) == -1) {
+    print STDERR "ERROR: cannot set file <$si_imriorfile>\n";
+    $IR->Kill (); $IR->TimedWait (1);
+    exit 1;
+}
+
+print ">>> " . $SVR->CommandLine() . "\n";
+
+my $SVR_status = $SVR->SpawnWaitKill ($si->ProcessStartWaitInterval());
+
+if ($SVR_status != 0) {
+    print STDERR "ERROR: server returned $SVR_status\n";
+    $IR->Kill (); $IR->TimedWait (1);
+    exit 1;
+}
+
+
+$IR_status = $IR->TerminateWaitKill ($imr->ProcessStopWaitInterval());
+
+if ($IR_status != 0) {
+    print STDERR "ERROR: ImplRepo Server returned $IR_status\n";
+    $status = 1;
+}
+
+$imr->DeleteFile ($implrepo_ior);
+$si->DeleteFile ($implrepo_ior);
+
+exit $status;
diff --git a/orbsvcs/tests/Bug_3891_Regression/server.cpp b/orbsvcs/tests/Bug_3891_Regression/server.cpp
new file mode 100644
index 00000000000..88736989e5d
--- /dev/null
+++ b/orbsvcs/tests/Bug_3891_Regression/server.cpp
@@ -0,0 +1,74 @@
+// $Id$
+#include "TestS.h"
+#include "tao/Stub.h"
+#include "ace/OS_NS_string.h"
+#ifdef TAO_AS_STATIC_LIBS
+# include "tao/ImR_Client/ImR_Client.h"
+#endif
+
+class Hello : public virtual POA_Test::Hello
+{
+};
+
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Panic: nil RootPOA\n"), 1);
+
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
+
+      PortableServer::LifespanPolicy_var life =
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
+
+      PortableServer::IdAssignmentPolicy_var assign =
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
+
+      CORBA::PolicyList pols;
+      pols.length (2);
+      pols[0] = PortableServer::LifespanPolicy::_duplicate (life.in ());
+      pols[1] = PortableServer::IdAssignmentPolicy::_duplicate (assign.in ());
+
+      PortableServer::POA_var poa =
+        root_poa->create_POA ("ImRified POA", poa_manager.in (), pols);
+      life->destroy ();
+      assign->destroy ();
+
+      Hello *hello_impl = 0;
+      ACE_NEW_RETURN (hello_impl, Hello, 1);
+      PortableServer::ServantBase_var owner_transfer (hello_impl);
+
+      PortableServer::ObjectId_var id =
+        PortableServer::string_to_ObjectId ("Test 3891 Object");
+
+      poa->activate_object_with_id (id.in (), hello_impl);
+
+      CORBA::Object_var obj = poa->id_to_reference (id.in ());
+
+      if (!obj->_stubobj ()->type_id.in () ||
+          ACE_OS::strcmp (obj->_stubobj ()->type_id.in (),
+                          hello_impl->_repository_id ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, "ERROR: type_id is incorrect\n"), 1);
+        }
+
+      root_poa->destroy (1, 1);
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp b/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
index c0236657c25..e4d8195ffbd 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
+++ b/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
index 5dd84ffaf9d..ff30844d186 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
+++ b/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -6,7 +6,7 @@
 #include "tao/ORB_Core.h"
 #include "TestC.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
+
 
 Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context,
                           CORBA::ORB_ptr corb,
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
index 9cfd6c265c9..3048e6f95f7 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
+++ b/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
@@ -6,7 +6,7 @@
 #include "tao/ORB_Table.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
   Hello::Hello (CORBA::ORB_ptr orb,
               ACE_thread_t thrid)
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/orbsvcs/tests/COIOP_Naming_Test/Hello.h
index 556409e5d00..1d5e27d075f 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/Hello.h
+++ b/orbsvcs/tests/COIOP_Naming_Test/Hello.h
@@ -8,8 +8,6 @@
 
 #include "TestS.h"
 
-#include "ace/OS.h"
-
 /// Implement the Test::Hello interface
 class Hello
   : public virtual POA_Test::Hello
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Makefile.am b/orbsvcs/tests/COIOP_Naming_Test/Makefile.am
deleted file mode 100644
index 21d72917248..00000000000
--- a/orbsvcs/tests/COIOP_Naming_Test/Makefile.am
+++ /dev/null
@@ -1,99 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.COIOP_Naming_Test_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.COIOP_Naming_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = COIOP_Naming_Test
-
-COIOP_Naming_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-COIOP_Naming_Test_SOURCES = \
-  COIOP_Test.cpp \
-  Client_Task.cpp \
-  Hello.cpp \
-  NamingTask.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  NamingTask.h \
-  Server_Task.h
-
-COIOP_Naming_Test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp b/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
index 768850a5536..95e4325db81 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
+++ b/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
@@ -1,17 +1,11 @@
-//
 // $Id$
-//
+
 #include "Server_Task.h"
 #include "TestS.h"
 #include "Hello.h"
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (CosNaming::NamingContext_ptr root_context,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/orbsvcs/tests/Concurrency/CC_client.cpp b/orbsvcs/tests/Concurrency/CC_client.cpp
index 4415eb811f5..cf78842e84d 100644
--- a/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -1,22 +1,19 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    CC_client.h
-//
-// = DESCRIPTION
-//      This is the test class for the concurrency service. The class
-//      implements a client to the concurrency service.
-//      This file contains the main function for the test.
-//
-// = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_client.cpp
+ *
+ *  $Id$
+ *
+ *    This is the test class for the concurrency service. The class
+ *    implements a client to the concurrency service.
+ *    This file contains the main function for the test.
+ *
+ *
+ *  @author   Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_client.h"
 
@@ -29,7 +26,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_fcntl.h"
 
-ACE_RCSID(Concurrency, CC_client, "$Id$")
+
 
 // Constructor.
 CC_Client::CC_Client (void)
diff --git a/orbsvcs/tests/Concurrency/CC_client.h b/orbsvcs/tests/Concurrency/CC_client.h
index 870459d47e6..fa7e965546b 100644
--- a/orbsvcs/tests/Concurrency/CC_client.h
+++ b/orbsvcs/tests/Concurrency/CC_client.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_client.h
-//
-// = DESCRIPTION
-//      This class implements a client used to test the CosConcurrency
-//      service.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_client.h
+ *
+ *  $Id$
+ *
+ *    This class implements a client used to test the CosConcurrency
+ *    service.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 
@@ -43,100 +39,102 @@ extern FILE *ace_cc_yyin;
 // end of parser stuff
 
 
+/**
+ * @class CC_Client
+ *
+ * @brief Defines a class that encapsulates the behaviour of a clien of
+ * the concurrency service.
+ *
+ * This class declares an interface to run the test client for
+ * the concurrency service.
+ */
 class CC_Client
 {
-  // = TITLE
-  //    Defines a class that encapsulates the behaviour of a clien of
-  //    the concurrency service.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the test client for
-  //    the concurrency service.
 public:
   // = Initialization and termination methods.
+  /// Default constructor.
   CC_Client (void);
-  // Default constructor.
 
+  /// Destructor.
   ~CC_Client (void);
-  // Destructor.
 
+  /// Run the test.
   int run (void);
-  // Run the test.
 
+  /// Initialize the test with the parameters from the command line.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the test with the parameters from the command line.
 
 private:
+  /// Function to initialize the naming service.
   int init_naming_service (void);
-  // Function to initialize the naming service.
 
+  /// Function to parse the command line arguments.
   int parse_args (void);
-  // Function to parse the command line arguments.
 
+  /// Function to read the ior from the given file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the ior from the given file.
 
+  /// Runs the basic tests (on a single lock set). Returns CC_SUCCESS
+  /// upon success CC_FAIL otherwise.
   int run_basic_tests (void);
-  // Runs the basic tests (on a single lock set). Returns CC_SUCCESS
-  // upon success CC_FAIL otherwise.
 
+  /// Runs the extended tests (on more lock sets). Returns CC_SUCCESS
+  /// upon success CC_FAIL otherwise.
   int run_extended_tests (ACE_TCHAR *params);
-  // Runs the extended tests (on more lock sets). Returns CC_SUCCESS
-  // upon success CC_FAIL otherwise.
 
+  /// Checks the parameters given to the run_extended_tests() function.
+  /// returns -1 if an error is found.
   int check_extended_test_params(ACE_TCHAR *params);
-  // Checks the parameters given to the run_extended_tests() function.
-  // returns -1 if an error is found.
 
+  /// A pointer to the naming service used for this test.
   CC_naming_service *naming_service_;
-  // A pointer to the naming service used for this test.
 
+  /// File from which to obtain the IOR.
   FILE *cc_factory_ior_file_;
-  // File from which to obtain the IOR.
 
+  /// The factory key for the lock set factory.
   char *cc_factory_key_;
-  // The factory key for the lock set factory.
 
+  /// File handle to read the IOR.
   ACE_HANDLE f_handle_;
-  // File handle to read the IOR.
 
+  /// Flag to tell server to shutdown.
   int shutdown_;
-  // Flag to tell server to shutdown.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
   //  CosConcurrencyControl::LockSetFactory_var factory_;
   // factory pointer for the lock set. @@TAO maybe to be used when naming
   // service is not used (for simple testing)
 
+  /// The number of arguments passed on the command line.
   int argc_;
-  // The number of arguments passed on the command line.
 
+  /// The arguments from the command line.
   ACE_TCHAR **argv_;
-  // The arguments from the command line.
 
+  /// Flag to tell the client whether to use the naming service or not
+  /// to find the concurrency control factory.
   int use_naming_service_;
-  // Flag to tell the client whether to use the naming service or not
-  // to find the concurrency control factory.
 
+  /// flag to tell which test should be run.
   int run_basic_tests_;
-  // flag to tell which test should be run.
 
+  /// flag to tell which test should be run.
   int run_extended_tests_;
-  // flag to tell which test should be run.
 
+  /// Parameters to the extended tests. The parameters are of the
+  /// following format: <test>:<parm1>:<parm2>...
   ACE_TCHAR *extended_tests_params_;
-  // Parameters to the extended tests. The parameters are of the
-  // following format: <test>:<parm1>:<parm2>...
 
+  /// Flag to tell whethter to use a script file to run the tests.
   int use_script_file_;
-  // Flag to tell whethter to use a script file to run the tests.
 
+  /// The script file to run
   ACE_TCHAR *script_file_;
-  // The script file to run
 
+  /// Prints out the options to the program.
   void print_usage (void);
-  // Prints out the options to the program.
 };
 #endif /* !defined (_CC_CLIENT_H_) */
diff --git a/orbsvcs/tests/Concurrency/CC_command.cpp b/orbsvcs/tests/Concurrency/CC_command.cpp
index ea8cf35a225..30b8c30e49d 100644
--- a/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -1,19 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    CC_command.cpp
-//
-// = DESCRIPTION
-//      This is the command classes for the test of the concurrency service.
-//
-// = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CC_command.cpp
+ *
+ *  $Id$
+ *
+ *    This is the command classes for the test of the concurrency service.
+ *
+ *
+ *  @author   Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_command.h"
 #include "CC_test_utils.h"
@@ -26,12 +23,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Concurrency,
-           CC_command,
-           "$Id$")
-
-
 CC_Command::~CC_Command(void)
 {
 }
diff --git a/orbsvcs/tests/Concurrency/CC_command.h b/orbsvcs/tests/Concurrency/CC_command.h
index dbd70e7ac12..fd0d1625147 100644
--- a/orbsvcs/tests/Concurrency/CC_command.h
+++ b/orbsvcs/tests/Concurrency/CC_command.h
@@ -1,474 +1,512 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_command.h
-//
-// = DESCRIPTION
-//      This file implements the command possible to execute on the
-//      concurrency service's lock set interface. The file also contains
-//      an implementation of a command list used by the command parser to
-//      store the commands to be executed.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_command.h
+ *
+ *  $Id$
+ *
+ *    This file implements the command possible to execute on the
+ *    concurrency service's lock set interface. The file also contains
+ *    an implementation of a command list used by the command parser to
+ *    store the commands to be executed.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosConcurrencyControlC.h"
 
 #ifndef _CC_COMMAND_H_
 #define _CC_COMMAND_H_
 
+/**
+ * @class CC_Command
+ *
+ * @brief Defines an abstact class for the commands towards the lock set
+ *
+ * This class declares an interface to run a test towards one or more
+ * lock sets in the concurrency service. The class provides a virtual
+ * execute method that is common for all its subclasses. It is also the
+ * the base class for the auxillary commands start, wait, and sleep.
+ */
 class CC_Command
-  // = TITLE
-  //    Defines an abstact class for the commands towards the lock set
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run a test towards one or more
-  //    lock sets in the concurrency service. The class provides a virtual
-  //    execute method that is common for all its subclasses. It is also the
-  //    the base class for the auxillary commands start, wait, and sleep.
 {
  public:
+  /// Destructor
   virtual ~CC_Command(void);
-  // Destructor
 
+  /// Abstract execute method
   virtual int execute() = 0;
-  // Abstract execute method
 
  protected:
+  /// Function to look up the lock set we are operating on, or if the
+  /// name is "" return the global lock set variable
   CosConcurrencyControl::LockSet_var
     GetLockSet (const char *lock_set_name);
-  // Function to look up the lock set we are operating on, or if the
-  // name is "" return the global lock set variable
 
+  /// Default constructor. We do not want instances of this class
   CC_Command(void);
-  // Default constructor. We do not want instances of this class
 
+  /**
+   * The last exception raised in one of the test commands. This variable
+   * is checked by all commands in order to determine if an exception has
+   * been raised. This is necessary because sometimes we want to check that
+   * an event caused an exception (done by the CC_Excep_Cmd command class)
+   * as part of the testing.
+   */
   static CORBA::Exception *excep_;
-  // The last exception raised in one of the test commands. This variable
-  // is checked by all commands in order to determine if an exception has
-  // been raised. This is necessary because sometimes we want to check that
-  // an event caused an exception (done by the CC_Excep_Cmd command class)
-  // as part of the testing.
 
+  /// This is the default lock set. The variable is either set by a create
+  /// command without name or by the lookup command.
   static CosConcurrencyControl::LockSet_var cc_lockset_;
-  // This is the default lock set. The variable is either set by a create
-  // command without name or by the lookup command.
 
  private:
 };
 
+/**
+ * @class CC_Start_Cmd
+ *
+ * @brief Defines a class for the start command
+ *
+ * This class represents the start command. The start command is used
+ * to start a new process with another script file in order to test the
+ * aspects of the concurrency service that requires several processes
+ * running at the same time.
+ */
 class CC_Start_Cmd : public CC_Command
-  // = TITLE
-  //    Defines a class for the start command
-  //
-  // = DESCRIPTION
-  //   This class represents the start command. The start command is used
-  //   to start a new process with another script file in order to test the
-  //   aspects of the concurrency service that requires several processes
-  //   running at the same time.
 {
  public:
+  /// Constructor
   CC_Start_Cmd (const char *config_file_name);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_Start_Cmd();
-  // Destructor
 
+  /// Start the child process. The current version does not wait for the
+  /// process to terminate.
   virtual int execute(void);
-  // Start the child process. The current version does not wait for the
-  // process to terminate.
 
 private:
+  /// The name of the script file
   char *cfg_name_;
-  // The name of the script file
 };
 
+/**
+ * @class CC_CreateLockSet_Cmd
+ *
+ * @brief Defines a class for the create command on the lock set factory
+ *
+ * This class represents the create command on the lock set factory.
+ * The lock set is registered in the naming service with the provided
+ * name.
+ */
 class CC_CreateLockSet_Cmd : public CC_Command
-  // = TITLE
-  //    Defines a class for the create command on the lock set factory
-  //
-  // = DESCRIPTION
-  //   This class represents the create command on the lock set factory.
-  //   The lock set is registered in the naming service with the provided
-  //   name.
 {
  public:
+  /// Constructor
   CC_CreateLockSet_Cmd (const char *lock_set_name);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_CreateLockSet_Cmd ();
-  // Destructor
 
+  /// Executes the command, i.e. creates the lock set and binds the name
+  /// in the naming service.
   virtual int execute(void);
-  // Executes the command, i.e. creates the lock set and binds the name
-  // in the naming service.
 
 private:
+  /// The name used to bind in the naming service.
   char *name_;
-  // The name used to bind in the naming service.
 };
 
+/**
+ * @class CC_Lock_Cmd:public
+ *
+ * @brief Defines a class for the lock command on the lock set
+ *
+ * This class represents the lock command on the lock set. The lock set
+ * is looked up in the naming service.
+ */
 class CC_Lock_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the lock command on the lock set
-  //
-  // = DESCRIPTION
-  //   This class represents the lock command on the lock set. The lock set
-  //   is looked up in the naming service.
 {
  public:
+  /// Constructor.
   CC_Lock_Cmd(const char *lock_set_name,
               CosConcurrencyControl::lock_mode mode);
-  // Constructor.
 
+  /// Destructor
   virtual ~CC_Lock_Cmd();
-  // Destructor
 
+  /// Executes the command, i.e. looks up the lock set with the requested
+  /// name in the naming server and executes the lock command on that lock set.
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and executes the lock command on that lock set.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
+  /// The mode of the lock.
   CosConcurrencyControl::lock_mode mode_;
-  // The mode of the lock.
 };
 
+/**
+ * @class CC_UnLock_Cmd:public
+ *
+ * @brief Defines a class for the unlock command on the lock set
+ *
+ * This class represents the unlock command on the lock set. The lock set
+ * is looked up in the naming service.
+ */
 class CC_UnLock_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the unlock command on the lock set
-  //
-  // = DESCRIPTION
-  //   This class represents the unlock command on the lock set. The lock set
-  //   is looked up in the naming service.
 {
  public:
+  /// Constructor.
   CC_UnLock_Cmd(const char *lock_set_name,
                 CosConcurrencyControl::lock_mode mode);
-  // Constructor.
 
+  /// Destructor
   virtual ~CC_UnLock_Cmd();
-  // Destructor
 
+  /**
+   * Executes the command, i.e. looks up the lock set with the requested
+   * name in the naming server and executes the unlock command on that
+   * lock set.
+   */
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and executes the unlock command on that
-  // lock set.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
+  /// The mode of the lock.
   CosConcurrencyControl::lock_mode mode_;
-  // The mode of the lock.
 };
 
+/**
+ * @class CC_TryLock_Cmd:public
+ *
+ * @brief Defines a class for the try_lock command on the lock set
+ *
+ * This class represents the try_lock command on the lock set. The lock set
+ * is looked up in the naming service.
+ */
 class CC_TryLock_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the try_lock command on the lock set
-  //
-  // = DESCRIPTION
-  //   This class represents the try_lock command on the lock set. The lock set
-  //   is looked up in the naming service.
 {
  public:
+  /// Constructor
   CC_TryLock_Cmd(const char *lock_set_name,
                  CosConcurrencyControl::lock_mode mode);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_TryLock_Cmd();
-  // Destructor
 
+  /**
+   * Executes the command, i.e. looks up the lock set with the requested
+   * name in the naming server and executes the try_lock command on that
+   * lock set.
+   */
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and executes the try_lock command on that
-  // lock set.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
+  /// The mode of the lock.
   CosConcurrencyControl::lock_mode mode_;
-  // The mode of the lock.
 };
 
+/**
+ * @class CC_ChangeMode_Cmd:public
+ *
+ * @brief Defines a class for the change_mode command on the lock set
+ *
+ * This class represents the change_mode command on the lock set.
+ * The lock set is looked up in the naming service.
+ */
 class CC_ChangeMode_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the change_mode command on the lock set
-  //
-  // = DESCRIPTION
-  //   This class represents the change_mode command on the lock set.
-  //   The lock set is looked up in the naming service.
 {
  public:
+  /// Constructor
   CC_ChangeMode_Cmd (const char *lock_set_name,
                      CosConcurrencyControl::lock_mode held_mode,
                      CosConcurrencyControl::lock_mode new_mode);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_ChangeMode_Cmd();
-  // Destructor
 
+  /**
+   * Executes the command, i.e. looks up the lock set with the requested
+   * name in the naming server and executes the change_mode command on that
+   * lock set.
+   */
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and executes the change_mode command on that
-  // lock set.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
+  /// The mode of the held lock
   CosConcurrencyControl::lock_mode held_mode_;
-  // The mode of the held lock
 
+  /// The new mode of the lock
   CosConcurrencyControl::lock_mode new_mode_;
-  // The new mode of the lock
 };
 
+/**
+ * @class CC_Sleep_Cmd:public
+ *
+ * @brief Defines a class for the sleep command
+ *
+ * This class represents the sleep command. This command is used to make
+ * the script pause for the requested number of second, e.g. to wait for
+ * another process to start.
+ */
 class CC_Sleep_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the sleep command
-  //
-  // = DESCRIPTION
-  //   This class represents the sleep command. This command is used to make
-  //   the script pause for the requested number of second, e.g. to wait for
-  //   another process to start.
 {
  public:
+  /// Constructor.
   CC_Sleep_Cmd(int seconds);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Sleep_Cmd();
-  // Destructor.
 
+  /// Executes the command.
   virtual int execute(void);
-  // Executes the command.
 
  private:
+  /// The number of seconds to sleep
   int time_;
-  // The number of seconds to sleep
 };
 
+/**
+ * @class CC_Repeat_Cmd:public
+ *
+ * @brief Defines a class for the repeat command
+ *
+ * This class represents the repeat command. This command is used to make
+ * the script repeat the test the requested number of times.
+ * The command is curently NOT implemented.
+ */
 class CC_Repeat_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the repeat command
-  //
-  // = DESCRIPTION
-  //   This class represents the repeat command. This command is used to make
-  //   the script repeat the test the requested number of times.
-  //   The command is curently NOT implemented.
 {
  public:
+  /// Constructor.
   CC_Repeat_Cmd(int times);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Repeat_Cmd();
-  // Destructor.
 
+  /// Executes the command.
   virtual int execute(void);
-  // Executes the command.
  private:
+  /// The number of times the commands should be repeated
   int times_;
-  // The number of times the commands should be repeated
 };
 
+/**
+ * @class CC_Wait_Cmd:public
+ *
+ * @brief Defines a class for the wait command
+ *
+ * This class represents the wait command. This command is used to make
+ * the script wait for the user to press return. It is possible to print
+ * different prompts, e.g. instructions.
+ */
 class CC_Wait_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the wait command
-  //
-  // = DESCRIPTION
-  //   This class represents the wait command. This command is used to make
-  //   the script wait for the user to press return. It is possible to print
-  //   different prompts, e.g. instructions.
 {
  public:
+  /// Constructor.
   CC_Wait_Cmd (const char *prompt);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Wait_Cmd();
-  // Destructor.
 
+  /// Executes the command.
   virtual int execute(void);
-  // Executes the command.
 
 private:
+  /// The prompt to print on the screen
   char *prompt_;
-  // The prompt to print on the screen
 };
 
+/**
+ * @class CC_Excep_Cmd
+ *
+ * @brief Defines a class for the excep command
+ *
+ * This class represents the excep command. This command is used to make
+ * the script capable of dealing with cases where an exception is raised
+ * as part of the testing.
+ */
 class CC_Excep_Cmd : public CC_Command
-  // = TITLE
-  //    Defines a class for the excep command
-  //
-  // = DESCRIPTION
-  //   This class represents the excep command. This command is used to make
-  //   the script capable of dealing with cases where an exception is raised
-  //   as part of the testing.
 {
  public:
+  /// Constructor.
   CC_Excep_Cmd (const char *excep);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Excep_Cmd(void);
-  // Destructor.
 
+  /**
+   * Executes the command. Checks to see if the excep_ class variable is set,
+   * and if that's the case check that it is of the expected type. If not the
+   * test fails.
+   */
   virtual int execute(void);
-  // Executes the command. Checks to see if the excep_ class variable is set,
-  // and if that's the case check that it is of the expected type. If not the
-  // test fails.
 
 private:
+  /// The string representation of the expected exception
   char *ex_;
-  // The string representation of the expected exception
 };
 
+/**
+ * @class CC_Dummy_Cmd:
+ *
+ * @brief Defines a class for the dummy command
+ *
+ * This class represents the dummy command. This command is used to
+ * put in a command in the chain that does nothing.
+ */
 class CC_Dummy_Cmd: public CC_Command
-  // = TITLE
-  //    Defines a class for the dummy command
-  //
-  // = DESCRIPTION
-  //   This class represents the dummy command. This command is used to
-  //   put in a command in the chain that does nothing.
 {
  public:
+  /// Constructor.
   CC_Dummy_Cmd(void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Dummy_Cmd(void);
-  // Destructor.
 
+  /// Executes the command, i.e. does nothing.
   virtual int execute(void);
-  // Executes the command, i.e. does nothing.
 
  private:
 };
 
+/**
+ * @class CC_Print_Cmd:
+ *
+ * @brief Defines a class for the print command
+ *
+ * This class represents the print command. This command is used to
+ * print a message on stdout
+ */
 class CC_Print_Cmd: public CC_Command
-  // = TITLE
-  //    Defines a class for the print command
-  //
-  // = DESCRIPTION
-  //   This class represents the print command. This command is used to
-  //   print a message on stdout
 {
 public:
+  /// Constructor.
   CC_Print_Cmd (const char *message);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Print_Cmd(void);
-  // Destructor.
 
+  /// Executes the command.
   virtual int execute(void);
-  // Executes the command.
 
 private:
+  /// Holds the message to print
   char *msg_;
-  // Holds the message to print
 };
 
+/**
+ * @class CC_Lookup_Cmd:public
+ *
+ * @brief Defines a class for the lookup command.
+ *
+ * This class represents the lookup command. The lock set
+ * is looked up in the naming service and the class variable
+ * cc_lockset_ is set accordingly.
+ */
 class CC_Lookup_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the lookup command.
-  //
-  // = DESCRIPTION
-  //   This class represents the lookup command. The lock set
-  //   is looked up in the naming service and the class variable
-  //   cc_lockset_ is set accordingly.
 {
 public:
+  /// Constructor
   CC_Lookup_Cmd (const char *lock_set_name);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_Lookup_Cmd();
-  // Destructor
 
+  /// Executes the command, i.e. looks up the lock set with the requested
+  /// name in the naming server and sets the cc_lockset_ variable.
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and sets the cc_lockset_ variable.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
 };
 
+/**
+ * @class CC_CommandElem
+ *
+ * @brief Defines a class for a command element
+ *
+ * This class implements a command element used in the command list
+ * below. The class is a simple tupple holding a pointer to the command
+ * and a pointer to the next element in the list.
+ */
 class CC_CommandElem
-  // = TITLE
-  //    Defines a class for a command element
-  //
-  // = DESCRIPTION
-  //    This class implements a command element used in the command list
-  //    below. The class is a simple tupple holding a pointer to the command
-  //    and a pointer to the next element in the list.
 {
  public:
+  /// Constructor.
   CC_CommandElem (CC_Command *cmd, CC_CommandElem *next);
-  // Constructor.
 
+  /// Destructor.
   ~CC_CommandElem(void);
-  // Destructor.
 
+  /// Returns a pointer to the command in this element
   CC_Command *GetCommand(void);
-  // Returns a pointer to the command in this element
 
+  /// Returns the pointer to the next element
   CC_CommandElem *GetNext(void);
-  // Returns the pointer to the next element
 
+  /// Sets the next pointer
   void SetNext(CC_CommandElem *next);
-  // Sets the next pointer
 
  private:
+  /// Pointer to the next element
   CC_CommandElem *next_;
-  // Pointer to the next element
 
+  /// Pointer to the command element
   CC_Command *cmd_;
-  // Pointer to the command element
 };
 
+/**
+ * @class CC_CommandList
+ *
+ * @brief Defines a class for a command list
+ *
+ * This class implements a command list used from the script parser
+ * to store the parsed commands The class implements a simple single
+ * linked list.
+ */
 class CC_CommandList
-  // = TITLE
-  //    Defines a class for a command list
-  //
-  // = DESCRIPTION
-  //    This class implements a command list used from the script parser
-  //    to store the parsed commands The class implements a simple single
-  //    linked list.
 {
  public:
+  /// Constructor.
   CC_CommandList(void);
-  // Constructor.
 
+  /// Destructor.
   ~CC_CommandList(void);
-  // Destructor.
 
+  /// Adds the command to the list
   int add(CC_Command *cmd);
-  // Adds the command to the list
 
+  /// Executes all the commands in the list from head to tail
   int execute(void);
-  // Executes all the commands in the list from head to tail
 
+  /// Sets the number of times to repeat the script
   void setrepeat(int times);
-  // Sets the number of times to repeat the script
 
  private:
+  ///  The head of the command list
   CC_CommandElem *head_;
-  //  The head of the command list
 
+  /// The last inserted element
   CC_CommandElem *last_;
-  // The last inserted element
 
+  /// The number of times the script should be repeated
   int times_;
-  // The number of times the script should be repeated
 };
 
 #endif /* _CC_COMMAND_H_ */
diff --git a/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index 016c8412b4f..b8156f3dba6 100644
--- a/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -239,7 +239,7 @@ static const short ace_cc_yycheck[] = {     4,
 #define ACE_CC_YYSTACK_USE_ALLOCA
 #define alloca __builtin_alloca
 #else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || (defined (__sun) && defined (__i386))
 #define ACE_CC_YYSTACK_USE_ALLOCA
 #include <alloca.h>
 #else /* not sparc */
@@ -369,7 +369,7 @@ int ace_cc_yydebug;     /*  nonzero means print parse trace */
 #ifndef ACE_CC_YYMAXDEPTH
 #define ACE_CC_YYMAXDEPTH 10000
 #endif
-
+
 /* Define __ace_cc_yy_memcpy.  Note that the size argument
    should be passed with type unsigned int, because that is what the non-GCC
    definitions require.  With GCC, __builtin_memcpy takes an arg
@@ -413,7 +413,7 @@ __ace_cc_yy_memcpy (char *to, char *from, unsigned int count)
 
 #endif
 #endif
-
+
 
 
 /* The user can define ACE_CC_YYPARSE_PARAM as the name of an argument to be passed
@@ -486,7 +486,7 @@ ace_cc_yyparse(ACE_CC_YYPARSE_PARAM_ARG)
   ACE_CC_YYSTYPE ace_cc_yyval;    /*  the variable used to return   */
         /*  semantic values from the action */
         /*  routines        */
-
+  ace_cc_yyval.id = 0;
   int ace_cc_yylen;
 
 #if ACE_CC_YYDEBUG != 0
@@ -838,7 +838,7 @@ case 30:
 }
    /* the action file gets copied in in place of this dollarsign */
 
-
+
   ace_cc_yyvsp -= ace_cc_yylen;
   ace_cc_yyssp -= ace_cc_yylen;
 #ifdef ACE_CC_YYLSP_NEEDED
diff --git a/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index 523154493e4..a274387a7af 100644
--- a/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -1,27 +1,24 @@
-// $Id
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_naming_service.cpp
-//
-// = DESCRIPTION
-//      This class implements the naming services necessary to test the
-//      concurrency service
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_naming_service.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements the naming services necessary to test the
+ *    concurrency service
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_naming_service.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
+
 
 CC_naming_service::CC_naming_service (CORBA::ORB_var orb)
   : cc_factory_key_ (0),
diff --git a/orbsvcs/tests/Concurrency/CC_naming_service.h b/orbsvcs/tests/Concurrency/CC_naming_service.h
index 9a992338ee2..b5ef3db0f05 100644
--- a/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_naming_service.h
-//
-// = DESCRIPTION
-//      This class implements the naming services necessary to test the
-//      concurrency service.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_naming_service.h
+ *
+ *  $Id$
+ *
+ *    This class implements the naming services necessary to test the
+ *    concurrency service.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -25,60 +21,62 @@
 #ifndef _CC_NAMING_SERVICE_H_
 #define _CC_NAMING_SERVICE_H_
 
+/**
+ * @class CC_naming_service
+ *
+ * @brief Defines a class that encapsulates the necessary naming service
+ * functions for the concurrency service.
+ *
+ * This class declares an interface to the naming service for the
+ * concurrency service tests.
+ */
 class CC_naming_service
 {
-  // = TITLE
-  //    Defines a class that encapsulates the necessary naming service
-  //    functions for the concurrency service.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to the naming service for the
-  //    concurrency service tests.
 public:
+  /// Default constructor
   CC_naming_service ();
-  // Default constructor
 
+  /// Constructor
   CC_naming_service (CORBA::ORB_var orb_);
-  // Constructor
 
+  /// Default destructor.
   ~CC_naming_service (void);
-  // Default destructor.
 
+  /// Initialization method must be called after first call of Instance()
+  /// in order to initialize the object correctly
   void Init (CORBA::ORB_var orb_);
-  // Initialization method must be called after first call of Instance()
-  // in order to initialize the object correctly
 
+  /// Lookup a name in the naming service (context, name)
   CORBA::Object_var get_obj_from_name (const char *c_name,
                                        const char *name);
-  // Lookup a name in the naming service (context, name)
 
+  /// Bind a name in the concurrency context.
   void bind_name (const char *n,
                   CORBA::Object_ptr obj);
-  // Bind a name in the concurrency context.
 
+  /// Gets the cc lock set factory which is common for all tests.
   CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void);
-  // Gets the cc lock set factory which is common for all tests.
 
+  /// The naming service object is a singleton
   static CC_naming_service *Instance(void);
-  // The naming service object is a singleton
 
 private:
+  /// Function to initialize the naming service.
   int init_naming_service (void);
-  // Function to initialize the naming service.
 
+  /// Key of factory obj ref.
   char *cc_factory_key_;
-  // Key of factory obj ref.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// Name service wrapper class
   TAO_Naming_Client my_name_client_;
-  // Name service wrapper class
 
+  /// factory pointer for the lock set.
   CosConcurrencyControl::LockSetFactory_var factory_;
-  // factory pointer for the lock set.
 
+  /// The instance of the naming service object
   static CC_naming_service *instance_;
-  // The instance of the naming service object
 };
 #endif /* !defined (_CC_NAMING_SERVICE_H_) */
diff --git a/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 4080b9e369f..fa812004497 100644
--- a/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -1,29 +1,23 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    CC_test_utils.cpp
-//
-// = DESCRIPTION
-//      This class provides a namespace for utility functions for the
-//      concurrency service test.
-//
-// = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CC_test_utils.cpp
+ *
+ *  $Id$
+ *
+ *    This class provides a namespace for utility functions for the
+ *    concurrency service test.
+ *
+ *
+ *  @author   Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_test_utils.h"
 #include "CC_naming_service.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Concurrency, CC_test_utils, "$Id$")
-
 char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
 {
   if (mode==CosConcurrencyControl::read)
diff --git a/orbsvcs/tests/Concurrency/CC_test_utils.h b/orbsvcs/tests/Concurrency/CC_test_utils.h
index 4c1a643f863..a9964b7fd66 100644
--- a/orbsvcs/tests/Concurrency/CC_test_utils.h
+++ b/orbsvcs/tests/Concurrency/CC_test_utils.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    CC_test_utils.h
-//
-// = DESCRIPTION
-//      This class provides a namespace for utility functions for the
-//      concurrency service test.
-//
-// = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CC_test_utils.h
+ *
+ *  $Id$
+ *
+ *    This class provides a namespace for utility functions for the
+ *    concurrency service test.
+ *
+ *
+ *  @author   Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosConcurrencyControlC.h"
 
@@ -25,12 +22,12 @@
 class CC_TestUtils
 {
  public:
+  /// Function to return a human readable string from a lock_mode enum.
   static char *get_lock_mode_name (CosConcurrencyControl::lock_mode mode);
-  // Function to return a human readable string from a lock_mode enum.
 
+  /// Creates a lock set by means of th lock set factory in the concurrency
+  /// service server.
   static CosConcurrencyControl::LockSet_ptr create_lock_set (void);
-  // Creates a lock set by means of th lock set factory in the concurrency
-  // service server.
  private:
 };
 
diff --git a/orbsvcs/tests/Concurrency/CC_tests.cpp b/orbsvcs/tests/Concurrency/CC_tests.cpp
index cda1e777953..9155a075edc 100644
--- a/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -1,28 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_tests.h
-//
-// = DESCRIPTION
-//      This class implements a number of test objects to test the
-//      concurrency service.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_tests.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements a number of test objects to test the
+ *    concurrency service.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_tests.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Concurrency, CC_tests, "$Id$")
-
 CC_Test::CC_Test (CC_naming_service *ns)
   : result (CC_FAIL),
     naming_service_ (ns)
diff --git a/orbsvcs/tests/Concurrency/CC_tests.h b/orbsvcs/tests/Concurrency/CC_tests.h
index 9f0083fd2ad..94e50852ee1 100644
--- a/orbsvcs/tests/Concurrency/CC_tests.h
+++ b/orbsvcs/tests/Concurrency/CC_tests.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_tests.h
-//
-// = DESCRIPTION
-//      This class implements a number of test objects to test the
-//      concurrency service.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_tests.h
+ *
+ *  $Id$
+ *
+ *    This class implements a number of test objects to test the
+ *    concurrency service.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -32,152 +28,177 @@ enum
   CC_SUCCESS = 1
 };
 
+/**
+ * @class CC_Test
+ *
+ * @brief Defines an abstract base class for a test
+ *
+ * This class declares an interface to run the test of the
+ * concurrency service.
+ */
 class CC_Test
 {
-  // = TITLE
-  //    Defines an abstract base class for a test
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the test of the
-  //    concurrency service.
 public:
+  /// Default constructor
   CC_Test (CC_naming_service *ns);
-  // Default constructor
 
+  /// Destructor
   virtual ~CC_Test (void);
-  // Destructor
 
+  /// Run the test times_to_run number of times. Returns CC_SUCCESS on
+  /// success CC_FAIL otherwise.
   virtual int run (int times_to_run = 1) = 0;
-  // Run the test times_to_run number of times. Returns CC_SUCCESS on
-  // success CC_FAIL otherwise.
 
+  /// Create a new lock set using the default global lock set factory
+  /// from the naming service.
   CosConcurrencyControl::LockSet_ptr create_lock_set (void);
-  // Create a new lock set using the default global lock set factory
-  // from the naming service.
 
+  /// Returns a human readable string from the lock mode enum.
   char *get_lock_mode_name (CosConcurrencyControl::lock_mode mode);
-  // Returns a human readable string from the lock mode enum.
 
 protected:
+  /// The result of the test being performed.
   int result;
-  // The result of the test being performed.
 
+  /// The naming service beeing used to register and look up locks
   CC_naming_service *naming_service_;
-  // The naming service beeing used to register and look up locks
 };
 
+/**
+ * @class Test_Single_Lock_With_Mode
+ *
+ * @brief This is a simple test that checks that it is possible to set
+ * the lock in the desired mode, try it, and release it.
+ */
 class Test_Single_Lock_With_Mode : public CC_Test
 {
-  // = TITLE
-  //   This is a simple test that checks that it is possible to set
-  //   the lock in the desired mode, try it, and release it.
 public:
+  /**
+   * Default constructor. The naming service must be initialized
+   * before calling this method. The mode is the mode of the lock to
+   * be tested.
+   */
   Test_Single_Lock_With_Mode (CC_naming_service *naming_service,
                               CosConcurrencyControl::lock_mode mode);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The mode is the mode of the lock to
-  // be tested.
 
+  /// Destructor
   virtual ~Test_Single_Lock_With_Mode (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The lock mode of the lock being tested
   CosConcurrencyControl::lock_mode mode_;
-  // The lock mode of the lock being tested
 };
 
+/**
+ * @class Test_Setup_LockSet
+ *
+ * @brief This class creates a read lock, registeres it with the naming
+ * service and locks it.
+ */
 class Test_Setup_LockSet : public CC_Test
 {
-  // = TITLE
-  //   This class creates a read lock, registeres it with the naming
-  //   service and locks it.
 public:
+  /**
+   * Default constructor. The naming service must be initialized
+   * before calling this method. The name is the name the lock will be
+   * registered under in the naming service.
+   */
   Test_Setup_LockSet (CC_naming_service *naming_service_,
                       char *name);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The name is the name the lock will be
-  // registered under in the naming service.
 
+  /// Destructor
   virtual ~Test_Setup_LockSet (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The name of the lock
   char *my_name_;
-  // The name of the lock
 };
 
+/**
+ * @class Test_Use_Already_Created_LockSet
+ *
+ * @brief This class looks up the lock in the naming service and locks
+ * it.
+ */
 class Test_Use_Already_Created_LockSet : public CC_Test
 {
-  // = TITLE
-  //   This class looks up the lock in the naming service and locks
-  //   it.
 public:
+  /**
+   * Default constructor. The naming service must be initialized
+   * before calling this method. The name is the name the lock will be
+   * looked up under in the naming service.
+   */
   Test_Use_Already_Created_LockSet (CC_naming_service *naming_service_,
                                    char *name);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The name is the name the lock will be
-  // looked up under in the naming service.
 
+  /// Destructor
   virtual ~Test_Use_Already_Created_LockSet (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The name of the lock
   char *my_name_;
-  // The name of the lock
 };
 
+/**
+ * @class Test_Unlock_Already_Created_LockSet
+ *
+ * @brief This class looks up the lock in the naming service and unlocks
+ * it.
+ */
 class Test_Unlock_Already_Created_LockSet : public CC_Test
 {
-  // = TITLE
-  //   This class looks up the lock in the naming service and unlocks
-  //   it.
 public:
+  /**
+   * Default constructor. The naming service must be initialized
+   * before calling this method. The name is the name the lock will be
+   * looked up under in the naming service.
+   */
   Test_Unlock_Already_Created_LockSet (CC_naming_service *naming_service_,
                                        char *name);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The name is the name the lock will be
-  // looked up under in the naming service.
 
+  /// Destructor
   virtual ~Test_Unlock_Already_Created_LockSet (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The name of the lock
   char *my_name_;
-  // The name of the lock
 };
 
+/**
+ * @class Test_Release_Not_Held_Lock
+ *
+ * @brief This class tests that the LockNotHeld exception is thrown if a
+ * not held lock is released.
+ */
 class Test_Release_Not_Held_Lock : public CC_Test
 {
-  // = TITLE
-  //   This class tests that the LockNotHeld exception is thrown if a
-  //   not held lock is released.
 public:
+  /// Default constructor. The naming service must be initialized
+  /// before calling this method. The mode is the mode of the lock
   Test_Release_Not_Held_Lock (CC_naming_service *naming_service_,
                                 CosConcurrencyControl::lock_mode mode_);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The mode is the mode of the lock
 
+  /// Destructor
   virtual ~Test_Release_Not_Held_Lock (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The lock mode of the lock being tested
   CosConcurrencyControl::lock_mode mode_;
-  // The lock mode of the lock being tested
 };
 
 #endif /* !defined (_CC_TESTS_H_) */
diff --git a/orbsvcs/tests/Concurrency/Makefile.am b/orbsvcs/tests/Concurrency/Makefile.am
deleted file mode 100644
index c81514493b2..00000000000
--- a/orbsvcs/tests/Concurrency/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CC_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = CC_client
-
-CC_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-CC_client_SOURCES = \
-  CC_client.cpp \
-  CC_command.cpp \
-  CC_command.tab.cpp \
-  CC_naming_service.cpp \
-  CC_test_utils.cpp \
-  CC_tests.cpp \
-  lex.CC_command.cpp \
-  CC_client.h \
-  CC_command.h \
-  CC_command.tab.h \
-  CC_naming_service.h \
-  CC_test_utils.h \
-  CC_tests.h
-
-CC_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/orbsvcs/tests/Concurrency/lex.CC_command.cpp
index b70ca157c86..136dd3e56f8 100644
--- a/orbsvcs/tests/Concurrency/lex.CC_command.cpp
+++ b/orbsvcs/tests/Concurrency/lex.CC_command.cpp
@@ -1,8 +1,7 @@
-// $Id$
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp
+ * $Id$
  */
 
 #define FLEX_SCANNER
@@ -440,23 +439,12 @@ static char *ace_cc_yy_last_accepting_cpos;
 #define ACE_CC_YY_RESTORE_ACE_CC_YY_MORE_OFFSET
 char *ace_cc_yytext;
 #define INITIAL 0
-/* $Id$
- * ============================================================================
- *
- * = LIBRARY
- *    TAO/orbsvcs/tests
- *
- * = FILENAME
- *    CC_command.l
- *
- * = DESCRIPTION
- *   This is the lex file for the concurrency service script language.
- *
- * = AUTHORS
- *  Torben Worm <tworm@cs.wustl.edu>
- *
- * ============================================================================
+//=============================================================================
+/**
+ * This is the lex file for the concurrency service script language.
  */
+//=============================================================================
+
 #define ACE_CC_YY_NO_UNPUT 1
 #define ACE_CC_YY_NO_INPUT 1
 #define ACE_CC_YY_ALWAYS_INTERACTIVE 1
diff --git a/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 4853c5b86f0..e2bde895acb 100644
--- a/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID (CEC_Tests,
-           Disconnect,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks);
 
diff --git a/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index d321d47a740..b17aca95c9e 100644
--- a/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID (CEC_Tests,
-           MT_Disconnect,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks);
 
diff --git a/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index e0799f95255..6f731c8056f 100644
--- a/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Cos Event Channel tests
-//
-// = FILENAME
-//   MT_Disconnect.h
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   MT_Disconnect.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CEC_MT_DISCONNECT_H
 #define CEC_MT_DISCONNECT_H
@@ -27,23 +23,23 @@
 class MTD_Task : public ACE_Task_Base
 {
 public:
+  /// Create the task...
   MTD_Task (CosEventChannelAdmin::EventChannel_ptr ec,
         int use_callbacks);
-  // Create the task...
 
   // = Check the ACE_Task_Base documentation.
   int svc (void);
 
+  /// Run a single iteration of the test
   void run_iteration (void);
-  // Run a single iteration of the test
 
 private:
+  /// The event channel used on the test
   CosEventChannelAdmin::EventChannel_var event_channel;
-  // The event channel used on the test
 
+  /// Does the event channel send any callback messages when a client
+  /// diconnects
   int use_callbacks;
-  // Does the event channel send any callback messages when a client
-  // diconnects
 };
 
 #endif /* EC_DISCONNECT_H */
diff --git a/orbsvcs/tests/CosEvent/Basic/Makefile.am b/orbsvcs/tests/CosEvent/Basic/Makefile.am
deleted file mode 100644
index eaef4a840af..00000000000
--- a/orbsvcs/tests/CosEvent/Basic/Makefile.am
+++ /dev/null
@@ -1,304 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CosEvent_Basic_Disconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Disconnect
-
-Disconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Disconnect_SOURCES = \
-  Disconnect.cpp \
-  MT_Disconnect.h \
-  Random.h
-
-Disconnect_LDFLAGS = \
-  -L../lib
-
-Disconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_MT_Disconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MT_Disconnect
-
-MT_Disconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-MT_Disconnect_SOURCES = \
-  MT_Disconnect.cpp \
-  MT_Disconnect.h
-
-MT_Disconnect_LDFLAGS = \
-  -L../lib
-
-MT_Disconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_Pull_Push_Event.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Pull_Push_Event
-
-Pull_Push_Event_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Pull_Push_Event_SOURCES = \
-  Pull_Push_Event.cpp \
-  MT_Disconnect.h \
-  Random.h
-
-Pull_Push_Event_LDFLAGS = \
-  -L../lib
-
-Pull_Push_Event_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_Push_Event.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Push_Event
-
-Push_Event_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Push_Event_SOURCES = \
-  Push_Event.cpp \
-  MT_Disconnect.h \
-  Random.h
-
-Push_Event_LDFLAGS = \
-  -L../lib
-
-Push_Event_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_Random.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Random
-
-Random_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Random_SOURCES = \
-  Random.cpp \
-  Random.h
-
-Random_LDFLAGS = \
-  -L../lib
-
-Random_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_Shutdown.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Shutdown
-
-Shutdown_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Shutdown_SOURCES = \
-  Shutdown.cpp \
-  MT_Disconnect.h \
-  Random.h
-
-Shutdown_LDFLAGS = \
-  -L../lib
-
-Shutdown_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index 1a73a9003b2..d3d9825a637 100644
--- a/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (CEC_Tests_Basic,
-           Pull_Push_Event,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 7e1783336a1..415f034369c 100644
--- a/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (CEC_Tests_Basic,
-           Push_Event,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/CosEvent/Basic/Random.cpp b/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 75f4e5fcd15..5f04dc9119c 100644
--- a/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -7,10 +7,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (CEC_Tests,
-           Random,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/CosEvent/Basic/Random.h b/orbsvcs/tests/CosEvent/Basic/Random.h
index 8e67e20bdcd..9ce0d4363bf 100644
--- a/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS COS Event Channel tests
-//
-// = FILENAME
-//   Random.h
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Random.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_RANDOM_H
 #define EC_RANDOM_H
@@ -41,8 +37,8 @@ class RND_Consumer
   // = DESCRIPTION
   //
 public:
+  /// Constructor
   RND_Consumer (RND_Driver *driver);
-  // Constructor
 
   void push (const CORBA::Any &event);
   void disconnect_push_consumer (void);
@@ -51,14 +47,14 @@ public:
   void disconnect (void);
 
 protected:
+  /// The driver
   RND_Driver *driver_;
-  // The driver
 
+  /// The supplier.
   CosEventChannelAdmin::ProxyPushSupplier_var proxy_;
-  // The supplier.
 
+  /// Synch
   TAO_SYNCH_MUTEX lock_;
-  // Synch
 };
 
 inline
@@ -95,27 +91,27 @@ class RND_Supplier
   // = DESCRIPTION
   //
 public:
+  /// Constructor
   RND_Supplier (void);
-  // Constructor
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin);
   void disconnect (void);
 
+  /// Push a single event...
   void push_new_event (void);
   void push (CORBA::Any &event);
-  // Push a single event...
 
   virtual void disconnect_push_supplier (void);
 
+  /// Active method
   virtual int svc (void);
-  // Active method
 
 private:
+  /// The supplier.
   CosEventChannelAdmin::ProxyPushConsumer_var proxy_;
-  // The supplier.
 
+  /// Synch
   TAO_SYNCH_MUTEX lock_;
-  // Synch
 };
 
 inline
@@ -130,37 +126,37 @@ class RND_Driver
 public:
   RND_Driver (void);
 
+  /// Run the test
   int run (int argc, ACE_TCHAR *argv[]);
-  // Run the test
 
+  /// The main timer has expired
   void timer (const CORBA::Any &e);
-  // The main timer has expired
 
+  /// One of the consumers has received an event
   void event (const CORBA::Any &e);
-  // One of the consumers has received an event
 
 private:
   RND_Driver (const RND_Driver &);
   RND_Driver& operator= (const RND_Driver &);
 
 private:
+  /// The supplier
   RND_Supplier supplier_;
-  // The supplier
 
+  /// Number of suppliers
   int nsuppliers_;
-  // Number of suppliers
 
+  /// The suppliers
   RND_Supplier **suppliers_;
-  // The suppliers
 
+  /// Number of consumers
   int nconsumers_;
-  // Number of consumers
 
+  /// The consumers
   RND_Consumer **consumers_;
-  // The consumers
 
+  /// Maximum recursion
   int max_recursion_;
-  // Maximum recursion
 
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin_;
diff --git a/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index 02f0eb83977..fa4eba583c6 100644
--- a/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID( CEC_Tests_Basic,
-           Shutdown,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int with_callbacks);
 
diff --git a/orbsvcs/tests/CosEvent/Basic/svc.pull.conf b/orbsvcs/tests/CosEvent/Basic/svc.pull.conf
index 42dae9435e6..ddc08485f9a 100644
--- a/orbsvcs/tests/CosEvent/Basic/svc.pull.conf
+++ b/orbsvcs/tests/CosEvent/Basic/svc.pull.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static CEC_Factory "-CECReactivePullingPeriod 10000"
diff --git a/orbsvcs/tests/CosEvent/Makefile.am b/orbsvcs/tests/CosEvent/Makefile.am
deleted file mode 100644
index ffb416ac4a2..00000000000
--- a/orbsvcs/tests/CosEvent/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Timeout \
-        lib \
-        Basic
-
diff --git a/orbsvcs/tests/CosEvent/Timeout/Makefile.am b/orbsvcs/tests/CosEvent/Timeout/Makefile.am
deleted file mode 100644
index 42cc127d425..00000000000
--- a/orbsvcs/tests/CosEvent/Timeout/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Timeout_Timeout.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = TimeoutTest
-
-TimeoutTest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-TimeoutTest_SOURCES = \
-  TestEventConsumer_i.cpp \
-  TimeoutTestMain.cpp \
-  TestEventConsumer_i.h
-
-TimeoutTest_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/CosEvent/Timeout/cosevent.conf b/orbsvcs/tests/CosEvent/Timeout/cosevent.conf
index 1fa9bf39317..fb4042955e1 100644
--- a/orbsvcs/tests/CosEvent/Timeout/cosevent.conf
+++ b/orbsvcs/tests/CosEvent/Timeout/cosevent.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static CEC_Factory "-CECSupplierControl reactive -CECConsumerControl reactive -CECDispatching mt -CECConsumerOperationTimeout 3000000 -CECSupplierOperationTimeout 3000000"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/orbsvcs/tests/CosEvent/Timeout/run_test.pl b/orbsvcs/tests/CosEvent/Timeout/run_test.pl
index e78f65f3ce7..76f860d3f32 100755
--- a/orbsvcs/tests/CosEvent/Timeout/run_test.pl
+++ b/orbsvcs/tests/CosEvent/Timeout/run_test.pl
@@ -39,11 +39,11 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
-$SV2 = $server2->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/CosEvent_Service/CosEvent_Service",
+$SV2 = $server2->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/CosEvent_Service/tao_cosevent",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBSvcConf cosevent.conf " .
                               "-b -o $server2_ior2file " .
@@ -104,7 +104,7 @@ if ($server2->WaitForFileTimed ($ior2file,
     exit 1;
 }
 
-sleep(10); 
+sleep(10);
 
 $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
 
diff --git a/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index d51f9d3e32b..92c6b7f9f71 100644
--- a/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -3,7 +3,7 @@
 #include "Counting_Consumer.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(CEC_Tests, CEC_Count_Consumer, "$Id$")
+
 
 CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name)
   : event_count (0),
diff --git a/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index e3d0304fc2e..39f095099e0 100644
--- a/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Cos Event Channel testsuite
-//
-// = FILENAME
-//   Counting_Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Counting_Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CEC_COUNTING_CONSUMER_H
 #define CEC_COUNTING_CONSUMER_H
@@ -27,87 +23,89 @@
 #include "orbsvcs/CosEventChannelAdminC.h"
 #include "ace/Task.h"
 
+/**
+ * @class CEC_Counting_Consumer
+ *
+ * @brief Simple consumer object to implement EC tests.
+ *
+ * This is a simple consumer that counts the events it receives.
+ */
 class CEC_Test_Export CEC_Counting_Consumer : public POA_CosEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object to implement EC tests.
-  //
-  // = DESCRIPTION
-  //   This is a simple consumer that counts the events it receives.
-  //
 public:
+  /// Constructor
   CEC_Counting_Consumer (const char* name);
-  // Constructor
 
+  /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   void disconnect (void);
-  // Simple connect/disconnect methods..
 
+  /// Print out an error message if the event count is too far from the
+  /// expected count.
   void dump_results (int expected_count, int tolerance);
-  // Print out an error message if the event count is too far from the
-  // expected count.
 
   // = The CosEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const CORBA::Any& events);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 
+  /// Keep track of the number of events received.
   CORBA::ULong event_count;
-  // Keep track of the number of events received.
 
+  /// Keep track of the number of disconnect calls received.
   CORBA::ULong disconnect_count;
-  // Keep track of the number of disconnect calls received.
 
 protected:
+  /// The proxy
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
-  // The proxy
 
+  /// The name
   const char* name_;
-  // The name
 };
 
 // ****************************************************************
 
+/**
+ * @class CEC_Pull_Counting_Consumer
+ *
+ * @brief Simple consumer object to implement EC tests.
+ *
+ * This is a simple consumer that counts the events it receives.
+ */
 class CEC_Test_Export CEC_Pull_Counting_Consumer : public POA_CosEventComm::PullConsumer
 {
-  // = TITLE
-  //   Simple consumer object to implement EC tests.
-  //
-  // = DESCRIPTION
-  //   This is a simple consumer that counts the events it receives.
-  //
 public:
+  /// Constructor
   CEC_Pull_Counting_Consumer (const char* name);
-  // Constructor
 
+  /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   void disconnect (void);
-  // Simple connect/disconnect methods..
 
+  /// Print out an error message if the event count is too far from the
+  /// expected count.
   void dump_results (int expected_count, int tolerance);
-  // Print out an error message if the event count is too far from the
-  // expected count.
 
   CORBA::Any *pull (void);
   CORBA::Any *try_pull (CORBA::Boolean_out has_event);
 
   // = The CosEventComm::PullConsumer methods
+  /// The skeleton methods.
   virtual void disconnect_pull_consumer (void);
-  // The skeleton methods.
 
+  /// Keep track of the number of events received.
   CORBA::ULong event_count;
-  // Keep track of the number of events received.
 
+  /// Keep track of the number of disconnect calls received.
   CORBA::ULong disconnect_count;
-  // Keep track of the number of disconnect calls received.
 
 protected:
+  /// The proxy
   CosEventChannelAdmin::ProxyPullSupplier_var supplier_proxy_;
-  // The proxy
 
+  /// The name
   const char* name_;
-  // The name
 };
 
 // ****************************************************************
@@ -115,9 +113,9 @@ protected:
 class CEC_Test_Export CEC_Counting_Consumer_Task : public ACE_Task_Base
 {
 public:
+  /// Create the task...
   CEC_Counting_Consumer_Task (CEC_Pull_Counting_Consumer *consumer,
                               int milliseconds = 0);
-  // Create the task...
 
   // = Check the ACE_Task_Base documentation.
   int svc (void);
@@ -125,22 +123,22 @@ public:
   void stop (void);
   CORBA::ULong pull_count (void);
 
+  /// Run a single iteration of the test
   void run (void);
-  // Run a single iteration of the test
 
 private:
+  /// The consumer we are turning into an active object
   CEC_Pull_Counting_Consumer *consumer_;
-  // The consumer we are turning into an active object
 
+  /// Set to 1 when the test must stop
   int stop_flag_;
-  // Set to 1 when the test must stop
 
+  /// Count the number of pull() calls
   CORBA::ULong pull_count_;
-  // Count the number of pull() calls
 
+  /// If not zero then pause for <milliseconds> before sending each
+  /// event.
   int milliseconds_;
-  // If not zero then pause for <milliseconds> before sending each
-  // event.
 
   TAO_SYNCH_MUTEX lock_;
 };
diff --git a/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 1fcfae99a24..841d66408af 100644
--- a/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -3,7 +3,7 @@
 #include "Counting_Supplier.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(CEC_Tests, CEC_Count_Supplier, "$Id$")
+
 
 CEC_Counting_Supplier::CEC_Counting_Supplier (void)
   :  event_count (0),
diff --git a/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 2ff59be1e18..86b6b1eaf65 100644
--- a/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Cos Event Channel testsuite
-//
-// = FILENAME
-//   Counting_Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Counting_Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CEC_COUNTING_SUPPLIER_H
 #define CEC_COUNTING_SUPPLIER_H
@@ -27,47 +23,48 @@
 #include "orbsvcs/CosEventChannelAdminC.h"
 #include "ace/Task.h"
 
+/**
+ * @class CEC_Counting_Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ */
 class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //
 public:
+  /// Constructor
   CEC_Counting_Supplier (void);
-  // Constructor
 
   // = The CosEventComm::PushSupplier methods
 
+  /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   void disconnect (void);
-  // Simple connect/disconnect methods..
 
+  /// Push an event.
   void push (const CORBA::Any& events);
-  // Push an event.
 
+  /// The skeleton methods.
   virtual void disconnect_push_supplier (void);
-  // The skeleton methods.
 
+  /// Count the number of events sent
   CORBA::ULong event_count;
-  // Count the number of events sent
 
+  /// Count the number of disconnect_push_supplier calls
   CORBA::ULong disconnect_count;
-  // Count the number of disconnect_push_supplier calls
 
 private:
+  /// Our proxy
   CosEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
-  // Our proxy
 };
 
 class CEC_Test_Export CEC_Counting_Supplier_Task : public ACE_Task_Base
 {
 public:
+  /// Create the task...
   CEC_Counting_Supplier_Task (CEC_Counting_Supplier *supplier,
                               int milliseconds = 0);
-  // Create the task...
 
   // = Check the ACE_Task_Base documentation.
   int svc (void);
@@ -75,60 +72,61 @@ public:
   void stop (void);
   CORBA::ULong push_count (void);
 
+  /// Run a single iteration of the test
   void run (void);
-  // Run a single iteration of the test
 
 private:
+  /// The supplier we are turning into an active object
   CEC_Counting_Supplier *supplier_;
-  // The supplier we are turning into an active object
 
+  /// Set to 1 when the test must stop
   int stop_flag_;
-  // Set to 1 when the test must stop
 
+  /// Count the number of push() calls
   CORBA::ULong push_count_;
-  // Count the number of push() calls
 
+  /// If not zero then pause for <milliseconds> before sending each
+  /// event.
   int milliseconds_;
-  // If not zero then pause for <milliseconds> before sending each
-  // event.
 
   TAO_SYNCH_MUTEX lock_;
 };
 
 // ****************************************************************
 
+/**
+ * @class CEC_Pull_Counting_Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ */
 class CEC_Test_Export CEC_Pull_Counting_Supplier : public POA_CosEventComm::PullSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //
 public:
+  /// Constructor
   CEC_Pull_Counting_Supplier (void);
-  // Constructor
 
   // = The CosEventComm::PullSupplier methods
 
+  /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   void disconnect (void);
-  // Simple connect/disconnect methods..
 
   // The PullSupplier methods.
   CORBA::Any* pull (void);
   CORBA::Any* try_pull (CORBA::Boolean_out has_event);
   virtual void disconnect_pull_supplier (void);
 
+  /// Count the number of events sent
   CORBA::ULong event_count;
-  // Count the number of events sent
 
+  /// Count the number of disconnect_pull_supplier calls
   CORBA::ULong disconnect_count;
-  // Count the number of disconnect_pull_supplier calls
 
 private:
+  /// Our proxy
   CosEventChannelAdmin::ProxyPullConsumer_var consumer_proxy_;
-  // Our proxy
 };
 
 #endif /* ECT_SUPPLIER_H */
diff --git a/orbsvcs/tests/CosEvent/lib/Makefile.am b/orbsvcs/tests/CosEvent/lib/Makefile.am
deleted file mode 100644
index 132f55111fc..00000000000
--- a/orbsvcs/tests/CosEvent/lib/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CosEvent_Test_Lib.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libCECTests.la
-
-libCECTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DCEC_TEST_BUILD_DLL
-
-libCECTests_la_SOURCES = \
-  Counting_Consumer.cpp \
-  Counting_Supplier.cpp
-
-noinst_HEADERS = \
-  Counting_Consumer.h \
-  Counting_Supplier.h \
-  cectest_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index e2dad9a73b6..645249e32af 100644
--- a/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -18,10 +18,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Custom_Marshal,
-           ECM_Consumer,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
@@ -250,7 +246,8 @@ Driver::push_consumer (void* /* consumer_cookie */,
       for (CORBA::ULong j = 0; j < n; ++j)
         {
           ECM_IDLData::Point& p = info.trajectory[j];
-          if (p.x != j || p.y != j*j)
+          if (static_cast<CORBA::ULong>(p.x) != j ||
+              static_cast<CORBA::ULong>(p.y) != j*j)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "invalid data in trajectory[%d] = (%f,%f)\n",
@@ -411,4 +408,3 @@ void
 Test_Consumer::disconnect_push_consumer (void)
 {
 }
-
diff --git a/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp b/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
index 6d7f7c3e48e..a6a580f0a65 100644
--- a/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
+++ b/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
@@ -3,7 +3,7 @@
 #include "ECM_Data.h"
 #include "tao/CDR.h"
 
-ACE_RCSID(EC_Custom_Marshal, ECM_Data, "$Id$")
+
 
 CORBA::Boolean
 operator<< (TAO_OutputCDR& cdr, ECM_Data& x)
diff --git a/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index bcb95d23cfb..5e85a0ee5d9 100644
--- a/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -16,7 +16,7 @@
 #include "ECM_Data.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(EC_Custom_Marshal, ECM_Supplier, "$Id$")
+
 
 ECMS_Driver::ECMS_Driver (void)
   : n_suppliers_ (1),
diff --git a/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
deleted file mode 100644
index 511657f204d..00000000000
--- a/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
+++ /dev/null
@@ -1,146 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.EC_Custom_Marshal_IDL.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  dataC.cpp \
-  dataC.h \
-  dataC.inl \
-  dataS.cpp \
-  dataS.h \
-  dataS.inl
-
-CLEANFILES = \
-  data-stamp \
-  dataC.cpp \
-  dataC.h \
-  dataC.inl \
-  dataS.cpp \
-  dataS.h \
-  dataS.inl
-
-dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl: data-stamp
-
-data-stamp: $(srcdir)/data.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl
-	@touch $@
-
-noinst_HEADERS = \
-  data.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ECM_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ECM_Consumer
-
-ECM_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECM_Consumer_SOURCES = \
-  ECM_Consumer.cpp \
-  ECM_Data.cpp \
-  dataC.cpp \
-  ECM_Consumer.h \
-  ECM_Data.h
-
-ECM_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ECM_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ECM_Supplier
-
-ECM_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECM_Supplier_SOURCES = \
-  ECM_Data.cpp \
-  ECM_Supplier.cpp \
-  dataC.cpp \
-  dataS.cpp \
-  ECM_Data.h \
-  ECM_Supplier.h
-
-ECM_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index 1337d5b8996..3134151727d 100755
--- a/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -31,11 +31,11 @@ $server3->DeleteFile ($naming_ior);
 $client->DeleteFile ($naming_ior);
 
 
-$SV1 = $server1->CreateProcess ("../../Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("../../Naming_Service/tao_cosnaming",
                                 "-ORBNameServicePort $port " .
                                 "-o $server1_naming_ior");
 
-$SV2 = $server2->CreateProcess ("../../Event_Service/Event_Service",
+$SV2 = $server2->CreateProcess ("../../Event_Service/tao_rtevent",
                                 "-ORBInitRef NameService=file://$server2_naming_ior");
 
 $SV3 = $server3->CreateProcess ("ECM_Supplier",
diff --git a/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
index 723910ec736..f4bbba4a267 100644
--- a/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
+++ b/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
@@ -4,10 +4,6 @@
 #include "AddrServer.h"
 #include "ace/INET_Addr.h"
 
-ACE_RCSID(EC_MT_Mcast,
-          AddrServer,
-          "$Id$")
-
 AddrServer::AddrServer (const ACE_INET_Addr& addr)
 {
 #if defined (ACE_HAS_IPV6)
diff --git a/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 2d48ae0266f..4f6034189b0 100644
--- a/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID(EC_MT_Mcast,
-          Consumer,
-          "$Id$")
-
 Consumer::Consumer (void)
   : event_count_ (0)
 {
diff --git a/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index dda31a733bb..d4c4d253821 100644
--- a/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -16,10 +16,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_MT_Mcast,
-           MCast,
-           "$Id$")
-
 const ACE_TCHAR *udp_mcast_address =
     ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001");
 
@@ -176,7 +172,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       // Now we setup the sender:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender;
+      PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender;
       sender = TAO_ECG_UDP_Sender::create();
 
       sender->init (event_channel.in (),
@@ -198,7 +194,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       sender->connect (sub);
 
       // To receive events we need to setup an event handler:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver;
+      PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver;
       receiver = TAO_ECG_UDP_Receiver::create();
 
       TAO_ECG_Mcast_EH mcast_eh (&*receiver);
@@ -374,6 +370,6 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/orbsvcs/tests/EC_MT_Mcast/Makefile.am
deleted file mode 100644
index 2d4e76e9d6c..00000000000
--- a/orbsvcs/tests/EC_MT_Mcast/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EC_MT_Mcast.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = MCast
-
-MCast_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-MCast_SOURCES = \
-  AddrServer.cpp \
-  Consumer.cpp \
-  MCast.cpp \
-  Supplier.cpp \
-  AddrServer.h \
-  Consumer.h \
-  Supplier.h
-
-MCast_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index ff590115fb7..ad2d5afda4c 100644
--- a/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID(EC_MT_Mcast,
-          Supplier,
-          "$Id$")
-
 Supplier::Supplier (void)
 {
 }
diff --git a/orbsvcs/tests/EC_MT_Mcast/svc.conf b/orbsvcs/tests/EC_MT_Mcast/svc.conf
index c6fce32e1bc..62619ef796e 100644
--- a/orbsvcs/tests/EC_MT_Mcast/svc.conf
+++ b/orbsvcs/tests/EC_MT_Mcast/svc.conf
@@ -1,5 +1,6 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFiltering per-supplier"
-static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandler MT"
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread"
+static Client_Strategy_Factory "-ORBClientConnectionHandler MT"
+static Server_Strategy_Factory "-ORBConcurrency reactive"
 static Advanced_Resource_Factory "-ORBReactorType tp -ORBInputCDRAllocator thread -ORBConnectionCacheLock thread"
diff --git a/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 75d1ae02c5d..10b0777b219 100644
--- a/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -23,10 +23,6 @@
 #include "EC_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (EC_Mcast,
-           EC_Mcast,
-           "$Id$")
-
 ECM_Driver::ECM_Driver (void)
   : event_period_ (250000),
     event_count_ (100),
@@ -205,8 +201,7 @@ ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->open (this->event_count_,
-                                         ec);
+      this->local_federations_[i]->open (this->event_count_, ec);
     }
 }
 
@@ -218,8 +213,7 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
   interval *= 10;
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->activate (ec,
-                                             interval);
+      this->local_federations_[i]->activate (ec, interval);
     }
 }
 
@@ -256,8 +250,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec)
       ACE_NEW (clone,
                TAO_ECG_UDP_Out_Endpoint (this->endpoint_));
 
-      this->all_federations_[i]->open (clone,
-                                       ec);
+      this->all_federations_[i]->open (clone, ec);
     }
 }
 
@@ -743,7 +736,7 @@ ECM_Consumer::ECM_Consumer (ECM_Local_Federation *federation)
 void
 ECM_Consumer::open (const char*,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    ACE_RANDR_TYPE &seed)
+                    unsigned int *seed)
 {
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -758,7 +751,7 @@ ECM_Consumer::open (const char*,
 }
 
 void
-ECM_Consumer::connect (ACE_RANDR_TYPE &seed)
+ECM_Consumer::connect (unsigned int *seed)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
@@ -887,7 +880,7 @@ ECM_Local_Federation::open (int event_count,
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, this->seed_);
+  this->consumer_.open (buf, ec, &this->seed_);
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
 }
@@ -940,7 +933,7 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
   ACE_Time_Value delta = ACE_OS::gettimeofday () -
     this->last_subscription_change_;
 
-  unsigned int x = ACE_OS::rand_r (this->seed_);
+  unsigned int x = ACE_OS::rand_r (&this->seed_);
   double p = double (x) / RAND_MAX;
   double maxp = double (delta.msec ()) / this->subscription_change_period_;
 
@@ -950,7 +943,7 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
                   "Reconfiguring federation %s: %f %f [%d]\n",
                   this->name (), p, maxp, x));
       this->consumer_.disconnect ();
-      this->consumer_.connect (this->seed_);
+      this->consumer_.connect (&this->seed_);
       this->last_subscription_change_ = ACE_OS::gettimeofday ();
     }
 }
diff --git a/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index c9d20cce869..52437fb8233 100644
--- a/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -141,7 +141,7 @@ private:
   char** consumer_names_;
   CORBA::ULong* consumer_ipaddr_;
 
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender_;
+  PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender_;
   // The sender
 
   TAO_EC_Simple_AddrServer addr_server_;
@@ -221,13 +221,13 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             ACE_RANDR_TYPE &seed);
+             unsigned int *seed);
   // This method connects the consumer to the EC.
 
   void close (void);
   // Disconnect from the EC.
 
-  void connect (ACE_RANDR_TYPE& seed);
+  void connect (unsigned int *seed);
   void disconnect (void);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
@@ -345,7 +345,7 @@ private:
   // The last time we changed our publication, so we don't change too
   // often.
 
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver_;
+  PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver_;
   // This object reads the events and pushes them into the EC. Notice
   // that it can receive events from multiple Event Handlers.
 
@@ -357,7 +357,7 @@ private:
   // @@ TODO Eventually we may need several of this objects to handle
   // OS limitations on the number of multicast groups per socket.
 
-  ACE_RANDR_TYPE seed_;
+  unsigned int seed_;
   // The seed for a random number generator.
 
   CORBA::ULong subscription_change_period_;
diff --git a/orbsvcs/tests/EC_Mcast/Makefile.am b/orbsvcs/tests/EC_Mcast/Makefile.am
deleted file mode 100644
index efc0e0bf21c..00000000000
--- a/orbsvcs/tests/EC_Mcast/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EC_Mcast.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = EC_Mcast
-
-EC_Mcast_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-EC_Mcast_SOURCES = \
-  EC_Mcast.cpp \
-  EC_Mcast.h \
-  EC_Mcast.inl
-
-EC_Mcast_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_Mcast/svc.conf b/orbsvcs/tests/EC_Mcast/svc.conf
index 7505d001e70..06cdae7a509 100644
--- a/orbsvcs/tests/EC_Mcast/svc.conf
+++ b/orbsvcs/tests/EC_Mcast/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier -ECObserver basic"
diff --git a/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index ce33914cfba..e7e6a91b20d 100644
--- a/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -27,10 +27,6 @@
 # include <sys/lwp.h> /* for _lwp_self */
 #endif /* sun */
 
-ACE_RCSID (EC_Multiple,
-           EC_Multiple,
-           "$Id$")
-
 Test_ECG::Test_ECG (void)
   : lcl_name_ ("Test_ECG"),
     rmt_name_ (""),
@@ -66,8 +62,8 @@ Test_ECG::Test_ECG (void)
 void
 print_priority_info (const char *const name)
 {
-#if defined (ACE_HAS_PTHREADS_STD) || defined (sun)
-#if defined (ACE_HAS_PTHREADS_STD)
+#if defined (ACE_HAS_PTHREADS) || defined (sun)
+#if defined (ACE_HAS_PTHREADS)
   struct sched_param param;
   int policy, status;
 
@@ -95,7 +91,7 @@ print_priority_info (const char *const name)
   }
 #else
   ACE_UNUSED_ARG (name);
-#endif /* ACE_HAS_PTHREADS_STD */
+#endif /* ACE_HAS_PTHREADS */
 
 #ifdef sun
   // Find what scheduling class the thread's LWP is in.
@@ -125,7 +121,7 @@ print_priority_info (const char *const name)
 #endif /* sun */
 #else
   ACE_UNUSED_ARG (name);
-#endif /* ACE_HAS_PTHREADS_STD */
+#endif /* ACE_HAS_PTHREADS || sun */
 }
 
 int
diff --git a/orbsvcs/tests/EC_Multiple/Makefile.am b/orbsvcs/tests/EC_Multiple/Makefile.am
deleted file mode 100644
index ef1eaba0a3f..00000000000
--- a/orbsvcs/tests/EC_Multiple/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EC_Multiple.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = EC_Multiple
-
-EC_Multiple_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-EC_Multiple_SOURCES = \
-  EC_Multiple.cpp \
-  EC_Multiple.h \
-  Scheduler_Runtime1.h \
-  Scheduler_Runtime2.h \
-  Scheduler_Runtime_Dynamic.h
-
-EC_Multiple_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_Multiple/run_test.pl b/orbsvcs/tests/EC_Multiple/run_test.pl
index 5db73ceb7a6..9c0dbe4cabd 100755
--- a/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../Naming_Service/Naming_Service",
+$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level -o $server_iorfile");
 
 $CL = $client->CreateProcess ("EC_Multiple",
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 26d765f6145..d651ccb46aa 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -14,10 +14,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Consumer,
-           "$Id$")
-
 Test_Consumer::Test_Consumer (ECT_Driver *driver,
                               void *cookie,
                               int n_suppliers,
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 0694c7b8b5c..95b06fd8819 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -16,10 +16,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Consumer_Driver,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index 0aaabaaa42e..d97704bf08a 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -3,7 +3,7 @@
 #include "ECT_Driver.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(EC_Throughput, ECT_Driver, "$Id$")
+
 
 ECT_Driver::~ECT_Driver (void)
 {
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 3357ec50f68..99b7357252a 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -16,10 +16,6 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Supplier,
-           "$Id$")
-
 Test_Supplier::Test_Supplier (ECT_Driver *driver)
   :  driver_ (driver),
      supplier_ (this),
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 3cafc9acc7f..09ff18e842e 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -16,10 +16,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Supplier_Driver,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 267d2cd920f..45a91c2599b 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -20,10 +20,7 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_errno.h"
-
-ACE_RCSID (EC_Throughput,
-           ECT_Throughput,
-           "$Id$")
+#include "ace/OS_NS_unistd.h"
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index 084a636c7d3..e3a3ae718ff 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -23,11 +23,6 @@
 
 class ECT_Throughput : public ECT_Driver
 {
-  //
-  // = TITLE
-  //
-  // = DESCRIPTION
-  //
 public:
   ECT_Throughput (void);
 
diff --git a/orbsvcs/tests/EC_Throughput/Makefile.am b/orbsvcs/tests/EC_Throughput/Makefile.am
deleted file mode 100644
index 4f04ed9e586..00000000000
--- a/orbsvcs/tests/EC_Throughput/Makefile.am
+++ /dev/null
@@ -1,157 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ECT_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ECT_Consumer
-
-ECT_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECT_Consumer_SOURCES = \
-  ECT_Consumer.cpp \
-  ECT_Consumer_Driver.cpp \
-  ECT_Driver.cpp \
-  ECT_Consumer.h \
-  ECT_Consumer_Driver.h \
-  ECT_Driver.h
-
-ECT_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ECT_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ECT_Supplier
-
-ECT_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECT_Supplier_SOURCES = \
-  ECT_Driver.cpp \
-  ECT_Supplier.cpp \
-  ECT_Supplier_Driver.cpp \
-  ECT_Driver.h \
-  ECT_Supplier.h \
-  ECT_Supplier_Driver.h
-
-ECT_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ECT_Throughput.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ECT_Throughput
-
-ECT_Throughput_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECT_Throughput_SOURCES = \
-  ECT_Consumer.cpp \
-  ECT_Driver.cpp \
-  ECT_Supplier.cpp \
-  ECT_Throughput.cpp \
-  ECT_Consumer.h \
-  ECT_Driver.h \
-  ECT_Supplier.h \
-  ECT_Throughput.h
-
-ECT_Throughput_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_Throughput/ec.conf b/orbsvcs/tests/EC_Throughput/ec.conf
index ebab986872a..056cb5a366e 100644
--- a/orbsvcs/tests/EC_Throughput/ec.conf
+++ b/orbsvcs/tests/EC_Throughput/ec.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static EC_Factory "-ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECsupplierfiltering per-supplier"
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/orbsvcs/tests/EC_Throughput/run_test.pl b/orbsvcs/tests/EC_Throughput/run_test.pl
index 9c58bdefefc..b0b895329d4 100755
--- a/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -31,9 +31,9 @@ my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
 my $es_nsiorfile = $es->LocalFile ($nsiorfile);
 my $con_nsiorfile = $con->LocalFile ($nsiorfile);
 my $sup_nsiorfile = $sup->LocalFile ($nsiorfile);
-my $test_ecconffile = $test->LocalFile ($ecconffile); 
-my $es_ecconffile = $es->LocalFile ($ecconffile); 
-my $test_ecmtconffile = $test->LocalFile ($ecmtconffile); 
+my $test_ecconffile = $test->LocalFile ($ecconffile);
+my $es_ecconffile = $es->LocalFile ($ecconffile);
+my $test_ecmtconffile = $test->LocalFile ($ecmtconffile);
 $ns->DeleteFile ($nsiorfile);
 $es->DeleteFile ($nsiorfile);
 $con->DeleteFile ($nsiorfile);
@@ -41,7 +41,7 @@ $sup->DeleteFile ($nsiorfile);
 
 print STDERR "================ Collocated tests, single threaded\n";
 
-$T = $test->CreateProcess ("ECT_Throughput", 
+$T = $test->CreateProcess ("ECT_Throughput",
                            "-ORBSvcConf $test_ecconffile ".
                            "-u 10000 -n 1 -t 0 -c 4");
 
@@ -53,7 +53,7 @@ if ($T_status != 0) {
 
 print STDERR "================ Collocated tests, multi threaded\n";
 
-$T = $test->CreateProcess ("ECT_Throughput", 
+$T = $test->CreateProcess ("ECT_Throughput",
                            "-ORBSvcConf $test_ecmtconffile ".
                            "-u 10000 -n 1 -t 0 -c 4");
 
@@ -65,10 +65,10 @@ if ($T_status != 0) {
 
 print STDERR "================ Remote test\n";
 
-$NS = $ns->CreateProcess ("../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming",
                            "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ("../../Event_Service/Event_Service",
+$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent",
                           "-ORBInitRef NameService=file://$es_nsiorfile ".
                           "-ORBSvcConf $es_ecconffile ".
                           "-s local");
diff --git a/orbsvcs/tests/EC_Throughput/run_test_overflow.pl b/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
index 697f4ec9a3e..f14d715d09e 100755
--- a/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
+++ b/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
@@ -31,7 +31,7 @@ my $es_nsiorfile = $es->LocalFile ($nsiorfile);
 my $con_nsiorfile = $con->LocalFile ($nsiorfile);
 my $sup_nsiorfile = $sup->LocalFile ($nsiorfile);
 my $sup2_nsiorfile = $sup2->LocalFile ($nsiorfile);
-my $es_ecmtconffile = $es->LocalFile ($ecmtconffile); 
+my $es_ecmtconffile = $es->LocalFile ($ecmtconffile);
 $ns->DeleteFile ($nsiorfile);
 $es->DeleteFile ($nsiorfile);
 $con->DeleteFile ($nsiorfile);
@@ -41,10 +41,10 @@ $sup2->DeleteFile ($nsiorfile);
 
 print STDERR "================ Overflow test\n";
 
-$NS = $ns->CreateProcess ("../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ("../../Event_Service/Event_Service",
+$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent",
                           "-ORBInitRef NameService=file://$es_nsiorfile ".
                           " -ORBSvcConf $es_ecmtconffile ".
                           " -s local");
@@ -57,7 +57,7 @@ $CON = $con->CreateProcess ("ECT_Consumer",
 $SUP = $sup->CreateProcess ("ECT_Supplier",
                             "-ORBInitRef NameService=file://$sup_nsiorfile ".
                             " -s 3 -u 10000 -n 1 -t 0 -b 8");
-                            
+
 $SUP2 = $sup2->CreateProcess ("ECT_Supplier",
                               "-ORBInitRef NameService=file://$sup2_nsiorfile ".
                               " -s 1 -u 10 -n 1 -t 0");
diff --git a/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 35422a94695..bc35adba8ca 100644
--- a/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -10,10 +10,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Atomic_Reconnect,
-           "$Id$")
-
 const int event_type = 20;
 const int event_source = 10;
 
diff --git a/orbsvcs/tests/Event/Basic/BCast.cpp b/orbsvcs/tests/Event/Basic/BCast.cpp
index 4eb3e8d4968..e12521fccba 100644
--- a/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -8,10 +8,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/INET_Addr.h"
 
-ACE_RCSID (EC_Tests_Basic,
-           BCast,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Bitmask.cpp b/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 29ab5292c67..86be16f5328 100644
--- a/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Bitmask,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Complex.cpp b/orbsvcs/tests/Event/Basic/Complex.cpp
index e0297bb91d2..1607d15d60c 100644
--- a/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Complex,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Control.cpp b/orbsvcs/tests/Event/Basic/Control.cpp
index 52b1b07b4a9..0714f229a4a 100644
--- a/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/orbsvcs/tests/Event/Basic/Control.cpp
@@ -10,10 +10,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Control,
-           "$Id$")
-
 const int event_type = 20;
 const int event_source = 10;
 
diff --git a/orbsvcs/tests/Event/Basic/Disconnect.cpp b/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 87a6716299c..cb3153210b4 100644
--- a/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Disconnect,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks);
 
diff --git a/orbsvcs/tests/Event/Basic/Gateway.cpp b/orbsvcs/tests/Event/Basic/Gateway.cpp
index 8f11228326e..f112f9f6d9a 100644
--- a/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "orbsvcs/Event/EC_Gateway_IIOP.h"
 
-ACE_RCSID (EC_Tests,
-           Gateway,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index fa4957da024..a447a99d4a2 100644
--- a/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           MT_Disconnect,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks);
 
diff --git a/orbsvcs/tests/Event/Basic/Makefile.am b/orbsvcs/tests/Event/Basic/Makefile.am
deleted file mode 100644
index eb08fabc9ac..00000000000
--- a/orbsvcs/tests/Event/Basic/Makefile.am
+++ /dev/null
@@ -1,755 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Event_Basic_Atomic_Reconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Atomic_Reconnect
-
-Atomic_Reconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Atomic_Reconnect_SOURCES = \
-  Atomic_Reconnect.cpp \
-  Atomic_Reconnect.h
-
-Atomic_Reconnect_LDFLAGS = \
-  -L../lib
-
-Atomic_Reconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_BCast.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += BCast
-
-BCast_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-BCast_SOURCES = \
-  BCast.cpp \
-  BCast.h
-
-BCast_LDFLAGS = \
-  -L../lib
-
-BCast_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Bitmask.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Bitmask
-
-Bitmask_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Bitmask_SOURCES = \
-  Bitmask.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Bitmask_LDFLAGS = \
-  -L../lib
-
-Bitmask_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Complex.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Complex
-
-Complex_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Complex_SOURCES = \
-  Complex.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Complex_LDFLAGS = \
-  -L../lib
-
-Complex_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Control.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Control
-
-Control_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Control_SOURCES = \
-  Control.cpp \
-  Control.h
-
-Control_LDFLAGS = \
-  -L../lib
-
-Control_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Disconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Disconnect
-
-Disconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Disconnect_SOURCES = \
-  Disconnect.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Disconnect_LDFLAGS = \
-  -L../lib
-
-Disconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Gateway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Gateway
-
-Gateway_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Gateway_SOURCES = \
-  Gateway.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Gateway_LDFLAGS = \
-  -L../lib
-
-Gateway_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_MT_Disconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += MT_Disconnect
-
-MT_Disconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-MT_Disconnect_SOURCES = \
-  MT_Disconnect.cpp \
-  MT_Disconnect.h
-
-MT_Disconnect_LDFLAGS = \
-  -L../lib
-
-MT_Disconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Negation.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Negation
-
-Negation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Negation_SOURCES = \
-  Negation.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Negation_LDFLAGS = \
-  -L../lib
-
-Negation_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Observer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Observer
-
-Observer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Observer_SOURCES = \
-  Observer.cpp \
-  Observer.h
-
-Observer_LDFLAGS = \
-  -L../lib
-
-Observer_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Random.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Random
-
-Random_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Random_SOURCES = \
-  Random.cpp \
-  Random.h
-
-Random_LDFLAGS = \
-  -L../lib
-
-Random_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Reconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Reconnect
-
-Reconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Reconnect_SOURCES = \
-  Reconnect.cpp \
-  Reconnect.h
-
-Reconnect_LDFLAGS = \
-  -L../lib
-
-Reconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Shutdown.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Shutdown
-
-Shutdown_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Shutdown_SOURCES = \
-  Shutdown.cpp \
-  Shutdown.h
-
-Shutdown_LDFLAGS = \
-  -L../lib
-
-Shutdown_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Timeout.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Timeout
-
-Timeout_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Timeout_SOURCES = \
-  Timeout.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Timeout_LDFLAGS = \
-  -L../lib
-
-Timeout_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Wildcard.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Wildcard
-
-Wildcard_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Wildcard_SOURCES = \
-  Wildcard.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Wildcard_LDFLAGS = \
-  -L../lib
-
-Wildcard_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Basic/Negation.cpp b/orbsvcs/tests/Event/Basic/Negation.cpp
index 0de338ee369..0ec7aaa6dfe 100644
--- a/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Negation,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Observer.cpp b/orbsvcs/tests/Event/Basic/Observer.cpp
index 1b0a42e01f1..302bb16f9e8 100644
--- a/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -8,10 +8,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID (EC_Tests_Basic,
-           Observer,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
@@ -48,7 +44,7 @@ EC_Master::run (int argc, ACE_TCHAR* argv[])
       // test.
       ACE_High_Res_Timer::calibrate ();
 
-      this->seed_ = static_cast<ACE_RANDR_TYPE> (ACE_OS::time (0));
+      this->seed_ = static_cast<unsigned int> (ACE_OS::time (0));
 
       this->initialize_orb_and_poa (argc, argv);
 
@@ -65,7 +61,7 @@ EC_Master::run (int argc, ACE_TCHAR* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            ACE_OS::rand_r (this->seed_);
+            ACE_OS::rand_r (&this->seed_);
             ACE_NEW_RETURN (this->channels_[i],
                             EC_Observer (this,
                                          this->seed_,
@@ -213,7 +209,7 @@ EC_Master::channel (int i) const
 // ****************************************************************
 
 EC_Observer::EC_Observer (EC_Master *master,
-                          ACE_RANDR_TYPE seed,
+                          unsigned int seed,
                           CORBA::ORB_ptr orb,
                           PortableServer::POA_ptr root_poa,
                           int id)
@@ -344,7 +340,7 @@ EC_Observer::connect_consumer (
       this->EC_Driver::connect_consumer (consumer_admin, i);
       return;
     }
-  unsigned int x = ACE_OS::rand_r (this->seed_);
+  unsigned int x = ACE_OS::rand_r (&this->seed_);
   if (x < RAND_MAX / 8)
     this->EC_Driver::connect_consumer (consumer_admin, i);
 }
@@ -353,7 +349,7 @@ void
 EC_Observer::consumer_push (void*,
                             const RtecEventComm::EventSet&)
 {
-  unsigned int x = ACE_OS::rand_r (this->seed_);
+  unsigned int x = ACE_OS::rand_r (&this->seed_);
   if (x < (RAND_MAX / 64))
     {
       if (this->verbose ())
diff --git a/orbsvcs/tests/Event/Basic/Observer.h b/orbsvcs/tests/Event/Basic/Observer.h
index 498e5bc6873..a1036f5dafe 100644
--- a/orbsvcs/tests/Event/Basic/Observer.h
+++ b/orbsvcs/tests/Event/Basic/Observer.h
@@ -52,7 +52,7 @@ private:
 
 private:
   /// The seed
-  ACE_RANDR_TYPE seed_;
+  unsigned int seed_;
 
   /// The driver programs
   int n_channels_;
@@ -76,7 +76,7 @@ class EC_Observer : public EC_Driver
 public:
   /// Constructor
   EC_Observer (EC_Master *master,
-               ACE_RANDR_TYPE seed,
+               unsigned int seed,
                CORBA::ORB_ptr orb,
                PortableServer::POA_ptr root_poa,
                int id);
@@ -104,7 +104,7 @@ public:
 
 private:
   EC_Master *master_;
-  ACE_RANDR_TYPE seed_;
+  unsigned int seed_;
   int id_;
 
   TAO_EC_Gateway_IIOP *gwys_;
diff --git a/orbsvcs/tests/Event/Basic/Random.cpp b/orbsvcs/tests/Event/Basic/Random.cpp
index 8cba24c7e04..77a600c59ef 100644
--- a/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/orbsvcs/tests/Event/Basic/Random.cpp
@@ -9,10 +9,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Tests,
-           Random,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Random.h b/orbsvcs/tests/Event/Basic/Random.h
index 566080cc4b1..cdfe706e511 100644
--- a/orbsvcs/tests/Event/Basic/Random.h
+++ b/orbsvcs/tests/Event/Basic/Random.h
@@ -23,14 +23,12 @@
 
 class RND_Driver;
 
+/**
+ * Simple consumer object
+ */
 class RND_Consumer
   : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //
 public:
   /// Constructor
   RND_Consumer (RND_Driver *driver);
@@ -77,15 +75,13 @@ RND_Timer::RND_Timer (RND_Driver *driver)
 
 // ****************************************************************
 
+/**
+ * Simple supplier object
+ */
 class RND_Supplier
   : public POA_RtecEventComm::PushSupplier
   , public ACE_Task_Base
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //
 public:
   /// Constructor
   RND_Supplier (int verbose);
diff --git a/orbsvcs/tests/Event/Basic/Reconnect.cpp b/orbsvcs/tests/Event/Basic/Reconnect.cpp
index bf88d4568a3..31e4d1de658 100644
--- a/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -7,10 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID (EC_Tests_Basic,
-           Reconnect,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Schedule.cpp b/orbsvcs/tests/Event/Basic/Schedule.cpp
index ed84937dff7..c0461b8125f 100644
--- a/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -11,7 +11,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID(EC_Tests_Basic, Schedule, "$Id$")
+
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/Event/Basic/Shutdown.cpp b/orbsvcs/tests/Event/Basic/Shutdown.cpp
index d23fda2966e..7e308b5124d 100644
--- a/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -4,7 +4,7 @@
 #include "Consumer.h"
 #include "Supplier.h"
 
-ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$")
+
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/Event/Basic/Timeout.cpp b/orbsvcs/tests/Event/Basic/Timeout.cpp
index 21978e810d8..0dd7e45e059 100644
--- a/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -8,12 +8,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Timeout,
-           "$Id$")
-
-// ****************************************************************
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Wildcard.cpp b/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 366be7854f9..3dc6d2d4c6a 100644
--- a/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Wildcard,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/control.conf b/orbsvcs/tests/Event/Basic/control.conf
index bfedbdcfa71..72c79a15f2b 100644
--- a/orbsvcs/tests/Event/Basic/control.conf
+++ b/orbsvcs/tests/Event/Basic/control.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"
diff --git a/orbsvcs/tests/Event/Basic/exhaustive_test.pl b/orbsvcs/tests/Event/Basic/exhaustive_test.pl
index 7ff0920f1b1..633e3d5fdc1 100755
--- a/orbsvcs/tests/Event/Basic/exhaustive_test.pl
+++ b/orbsvcs/tests/Event/Basic/exhaustive_test.pl
@@ -17,10 +17,10 @@ $conf_file = PerlACE::LocalFile ("exhaustive$PerlACE::svcconf_ext");
 
 @dispatching_configs   = ("-ECDispatching reactive",
                           "-ECDispatching mt -ECDispatchingThreads 4");
-@collection_strategies = ("copy_on_read", 
-                          "copy_on_write", 
+@collection_strategies = ("copy_on_read",
+                          "copy_on_write",
                           "delayed");
-@collection_types      = ("list", 
+@collection_types      = ("list",
                           "rb_tree");
 @filtering_configs     = ("-ECFiltering prefix -ECSupplierFilter per-supplier",
                           "-ECFiltering prefix -ECSupplierFilter null");
@@ -30,7 +30,7 @@ foreach $d (@dispatching_configs) {
         foreach $c (@collection_strategies) {
             foreach $t (@collection_types) {
                 my $collection = "mt:".$c.":".$t;
-                
+
                 my $config = 'static EC_Factory "'
                              .$d
                              ." -ECProxyPushConsumerCollection ".$collection
diff --git a/orbsvcs/tests/Event/Basic/mt.svc.conf b/orbsvcs/tests/Event/Basic/mt.svc.conf
index 8ba2c743960..7b3c1adee6f 100644
--- a/orbsvcs/tests/Event/Basic/mt.svc.conf
+++ b/orbsvcs/tests/Event/Basic/mt.svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECObserver null -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Basic/observer.conf b/orbsvcs/tests/Event/Basic/observer.conf
index c4639fe7f59..bfd14ad37e3 100644
--- a/orbsvcs/tests/Event/Basic/observer.conf
+++ b/orbsvcs/tests/Event/Basic/observer.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECDispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Basic/svc.complex.conf b/orbsvcs/tests/Event/Basic/svc.complex.conf
index 0b3e29e08b1..6c00cf04975 100644
--- a/orbsvcs/tests/Event/Basic/svc.complex.conf
+++ b/orbsvcs/tests/Event/Basic/svc.complex.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECfiltering prefix -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Basic/svc.conf b/orbsvcs/tests/Event/Basic/svc.conf
index c4d0cc45fbf..09d8c58d194 100644
--- a/orbsvcs/tests/Event/Basic/svc.conf
+++ b/orbsvcs/tests/Event/Basic/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Makefile.am b/orbsvcs/tests/Event/Makefile.am
deleted file mode 100644
index 7663a0d02bd..00000000000
--- a/orbsvcs/tests/Event/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Mcast \
-        ThreadFlags \
-        UDP \
-        lib \
-        Performance \
-        Basic
-
diff --git a/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
index 6255f267333..1ae3cae880d 100644
--- a/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
+++ b/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
@@ -5,7 +5,7 @@
 #include "orbsvcs/RtecEventCommC.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://as.ior");
 
diff --git a/orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am b/orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am
deleted file mode 100644
index 67e03d2e9fe..00000000000
--- a/orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AddrServer_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-client_SOURCES = \
-  Client.cpp \
-  TestAddrServer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AddrServer_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-server_SOURCES = \
-  Server.cpp \
-  TestAddrServer.cpp \
-  TestAddrServer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index ce760d23290..4d7b998dd0a 100644
--- a/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -10,10 +10,10 @@ EC_Wrapper::EC_Wrapper (void)
 {
 }
 
-TAO_EC_Servant_Var<EC_Wrapper>
+PortableServer::Servant_var<EC_Wrapper>
 EC_Wrapper::create (void)
 {
-  TAO_EC_Servant_Var<EC_Wrapper> w;
+  PortableServer::Servant_var<EC_Wrapper> w;
   ACE_NEW_RETURN (w,
                   EC_Wrapper,
                   w);
diff --git a/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index 83874c32241..56b377c7878 100644
--- a/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -32,7 +32,7 @@ public:
   /// Create a new EC_Wrapper object.
   /// (Constructor access is restricted to insure that all
   /// EC_Wrapper objects are heap-allocated.)
-  static TAO_EC_Servant_Var<EC_Wrapper> create (void);
+  static PortableServer::Servant_var<EC_Wrapper> create (void);
 
   /// Destructor.  Destroys the Event Channel implementation.
   virtual ~EC_Wrapper (void);
@@ -72,7 +72,7 @@ private:
   /// Event Channel implementation.
   /*
    * Once Event Channel implementation is made reference-counted, this
-   * pointer should turn into a Servant_Var.
+   * pointer should turn into a Servant_var.
    */
   TAO_EC_Event_Channel *ec_impl_;
 
diff --git a/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 9b3800d166d..943195e2bb9 100644
--- a/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -105,7 +105,7 @@ Gateway_EC::run (int argc, ACE_TCHAR ** argv)
       manager->activate ();
 
       // Set up EC.
-      TAO_EC_Servant_Var<EC_Wrapper> ec_wrapper (EC_Wrapper::create ());
+      PortableServer::Servant_var<EC_Wrapper> ec_wrapper (EC_Wrapper::create ());
       if (!ec_wrapper.in ())
         return -1;
 
diff --git a/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/orbsvcs/tests/Event/Mcast/Common/Makefile.am
deleted file mode 100644
index 443c61d62a5..00000000000
--- a/orbsvcs/tests/Event/Mcast/Common/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ECMcastTests_lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES = libECMcastTests.la
-
-libECMcastTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DECMCASTTESTS_BUILD_DLL
-
-libECMcastTests_la_SOURCES = \
-  EC_Wrapper.cpp \
-  Gateway_EC.cpp
-
-noinst_HEADERS = \
-  ECMcastTests_export.h \
-  EC_Wrapper.h \
-  Gateway_EC.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
deleted file mode 100644
index 9f8acb43baf..00000000000
--- a/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
+++ /dev/null
@@ -1,156 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Complex_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-consumer_SOURCES = \
-  consumer.cpp \
-  Constants.h
-
-consumer_LDFLAGS = \
-  -L../Common
-
-consumer_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Complex_Gateway_Ec.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += gateway-ec
-
-gateway_ec_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-gateway_ec_SOURCES = \
-  gateway-ec.cpp \
-  Constants.h
-
-gateway_ec_LDFLAGS = \
-  -L../Common
-
-gateway_ec_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Complex_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-supplier_SOURCES = \
-  supplier.cpp \
-  Constants.h
-
-supplier_LDFLAGS = \
-  -L../Common
-
-supplier_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf b/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf
index fefd2eec034..1d65bf87fe8 100644
--- a/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf
+++ b/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService receiver -ECGHandler complex -ECGAddressServer type -ECGAddressServerArg '17@230.100.0.7:12700 18@230.100.0.8:12700 19@230.100.0.9:12700'"
diff --git a/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index e2d4ebd7219..bc9c677cd1d 100644
--- a/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -157,7 +157,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       // Create the consumer and register it with POA.
-      TAO_EC_Servant_Var<EC_Consumer> consumer_impl =
+      PortableServer::Servant_var<EC_Consumer> consumer_impl =
         new EC_Consumer (orb, ec);
 
       if (!consumer_impl.in ())
diff --git a/orbsvcs/tests/Event/Mcast/Complex/run_test.pl b/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
index fe9d79a0e18..7fa7648f7e7 100755
--- a/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
+++ b/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
@@ -118,7 +118,7 @@ sub run_test
         print STDERR "ERROR: supplier returned $process_status\n";
         $status = 1;
         kill_processes ();
-        return $status; 
+        return $status;
     }
 
     # Shutdown.
@@ -197,7 +197,7 @@ sub analyze_results {
         }
         close (TEST_OUTPUT);
     }
-    
+
     my $all_received = 1;
     if ($a_events != 100 || $b_events != 100 || $c_events != 100) {
         $all_received = 0;
@@ -206,7 +206,7 @@ sub analyze_results {
                 ."\t$b_events B events, expected 100\n"
                     ."\t$c_events C events, expected 100\n";
     }
-    
+
     if ($all_received && $status == 0) {
         print STDERR "SUCCESS\n";
         return 0;
diff --git a/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf b/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf
index 7135b8f4957..17d535d40f5 100644
--- a/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf
+++ b/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService sender -ECGAddressServer type -ECGAddressServerArg '17@230.100.0.7:12700 18@230.100.0.8:12700 19@230.100.0.9:12700'"
diff --git a/orbsvcs/tests/Event/Mcast/Makefile.am b/orbsvcs/tests/Event/Mcast/Makefile.am
deleted file mode 100644
index 3d177fbffcc..00000000000
--- a/orbsvcs/tests/Event/Mcast/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AddrServer \
-        Common \
-        Complex \
-        RTEC_MCast_Federated \
-        Simple \
-        Two_Way
-
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
index 10c7ff35b06..8708015e3d0 100644
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
+++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
@@ -22,7 +22,7 @@ EchoEventConsumer_i::EchoEventConsumer_i(CORBA::ORB_ptr orb, int event_limit)
 void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
 {
   // Loop through the events, looking for shutdown events.
-  for (u_int i = 0; i < events.length (); ++i) 
+  for (u_int i = 0; i < events.length (); ++i)
     {
       //ACE_OS::printf(".");
       // Extract event data from the any.
@@ -37,14 +37,14 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
           << "  source: " << events[i].header.source;
 
 #if !defined (TAO_LACKS_EVENT_CHANNEL_ANY)
-      if (events[i].data.any_value >>= eventData) 
+      if (events[i].data.any_value >>= eventData)
         {
           out << "  text: "   << eventData;
         }
 #else
       if (events[i].data.payload.length() > 0)
         {
-          out << "  text: " << 
+          out << "  text: " <<
             (const char *)events[i].data.payload.get_buffer();
         }
 #endif  /* !TAO_LACKS_EVENT_CHANNEL_ANY */
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index 50216f31ff9..ed54c02d3d9 100644
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -150,7 +150,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       RtecUDPAdmin::AddrServer::_narrow(tmpobj.in());
 
     // Create and initialize the sender object
-    TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender =
+    PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender =
                                 TAO_ECG_UDP_Sender::create();
     TAO_ECG_UDP_Out_Endpoint endpoint;
     // need to be explicit about the address type when built with
@@ -179,7 +179,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     sender->connect (sub);
 
     // Create and initialize the receiver
-    TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver =
+    PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver =
                                       TAO_ECG_UDP_Receiver::create();
 
     // TAO_ECG_UDP_Receiver::init() takes a TAO_ECG_Refcounted_Endpoint.
@@ -200,7 +200,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       auto_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in()));
       mcast_eh->reactor (orb->orb_core ()->reactor ());
       mcast_eh->open (ec.in());
-      ACE_AUTO_PTR_RESET(eh,mcast_eh.release(),ACE_Event_Handler);
+      ACE_auto_ptr_reset(eh,mcast_eh.release());
       //eh.reset(mcast_eh.release());
     } else {
       auto_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in()));
@@ -209,7 +209,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (udp_eh->open (local_addr) == -1)
         ACE_ERROR ((LM_ERROR,"Cannot open EH\n"));
 
-      ACE_AUTO_PTR_RESET(eh,udp_eh.release(),ACE_Event_Handler);
+      ACE_auto_ptr_reset(eh,udp_eh.release());
       //eh.reset(udp_eh.release());
     }
 
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
deleted file mode 100644
index ba7e9e16b05..00000000000
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTEC_MCast_Federated_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += EchoEventConsumer
-
-EchoEventConsumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-EchoEventConsumer_SOURCES = \
-  EchoEventConsumerMain.cpp \
-  EchoEventConsumer_i.cpp \
-  EchoEventConsumer_i.h
-
-EchoEventConsumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTEC_MCast_Federated_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += EchoEventSupplier
-
-EchoEventSupplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-EchoEventSupplier_SOURCES = \
-  EchoEventSupplierMain.cpp \
-  EchoEventSupplier_i.cpp \
-  SimpleAddressServer.cpp \
-  EchoEventSupplier_i.h \
-  SimpleAddressServer.h
-
-EchoEventSupplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl
index 747d3611fde..ca08884713e 100755
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl
+++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl
@@ -99,7 +99,7 @@ $consumer2->DeleteFile ($ns_ior);
 $supplier1->DeleteFile ($ec1_ior);
 $supplier2->DeleteFile ($ec2_ior);
 
-$NS = $nservice->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service",
+$NS = $nservice->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                                "$debug -o $ns_ns_ior $end_point:$ns_port");
 my $sp1_args = "$debug -ORBInitRef NameService=file://$supplier1_ns_ior ".
                "-ORBSvcConf $supplier1_sp_conf $end_point -iorfile $supplier1_ec1_ior";
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
index 5ec352ab7be..eb17a579188 100644
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
+++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECobserver basic -ECConsumerControl Reactive"
diff --git a/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
deleted file mode 100644
index 86f05f9504a..00000000000
--- a/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
+++ /dev/null
@@ -1,156 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Simple_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-consumer_SOURCES = \
-  consumer.cpp \
-  Constants.h
-
-consumer_LDFLAGS = \
-  -L../Common
-
-consumer_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Simple_Gateway_Ec.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += gateway-ec
-
-gateway_ec_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-gateway_ec_SOURCES = \
-  gateway-ec.cpp \
-  Constants.h
-
-gateway_ec_LDFLAGS = \
-  -L../Common
-
-gateway_ec_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Simple_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-supplier_SOURCES = \
-  supplier.cpp \
-  Constants.h
-
-supplier_LDFLAGS = \
-  -L../Common
-
-supplier_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index ce905b3945c..2738362a2a6 100644
--- a/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -126,7 +126,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       // Create the consumer and register it with POA.
-      TAO_EC_Servant_Var<EC_Consumer> consumer_impl =
+      PortableServer::Servant_var<EC_Consumer> consumer_impl =
         new EC_Consumer (orb, ec);
 
       if (!consumer_impl.in ())
diff --git a/orbsvcs/tests/Event/Mcast/Simple/run_test.pl b/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
index 86285dfb808..286196cc55f 100755
--- a/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
+++ b/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
@@ -67,13 +67,13 @@ sub run_test {
         kill_processes ();
         return -1;
     }
-    
+
     # Consumer EC.
     if (run_ec (1, $consumer_conffile[$index], $consumer_iorfile) != 0) {
         kill_processes ();
         return -1;
     }
-    
+
     # Consumer.
     $ps[2] = $test->CreateProcess ("consumer", "-ORBLogFile $output_files[2] ".
                                                "-ORBInitRef Event_Service=file://$consumer_iorfile");
@@ -81,10 +81,10 @@ sub run_test {
         kill_processes ();
         return -1;
     }
-    
+
     # Give consumer a chance to connect to its EC before firing off the supplier.
     sleep ($sleeptime);
-    
+
     # Supplier.
     $ps[3] = $test->CreateProcess ("supplier", "-ORBLogFile $output_files[3] ".
                                                "-ORBInitRef Event_Service=file://$supplier_iorfile");
@@ -172,16 +172,16 @@ sub analyze_results {
     }
 
     close (TEST_OUTPUT);
-    
+
     if ($events_received != 100) {
         print STDERR "ERROR: consumer received $events_received events, expected 100\n";
     }
-    
+
     if ($events_received == 100 && $status == 0) {
         print STDERR "SUCCESS\n";
         return 0;
     }
- 
+
     print STDERR "ERROR - check $output_files[$process_id] for full output.\n";
     return -1;
 }
diff --git a/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
deleted file mode 100644
index 48cbe92f4b6..00000000000
--- a/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
+++ /dev/null
@@ -1,112 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Two_Way_Application.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += application
-
-application_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-application_SOURCES = \
-  application.cpp \
-  Constants.h
-
-application_LDFLAGS = \
-  -L../Common
-
-application_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Two_Way_Gateway_Ec.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += gateway-ec
-
-gateway_ec_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-gateway_ec_SOURCES = \
-  gateway-ec.cpp \
-  Constants.h
-
-gateway_ec_LDFLAGS = \
-  -L../Common
-
-gateway_ec_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index 90e1eda5d73..3ac17021462 100644
--- a/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -571,7 +571,7 @@ int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   // We may want this to be alive beyond the next block.
-  TAO_EC_Servant_Var<Heartbeat_Application> app;
+  PortableServer::Servant_var<Heartbeat_Application> app;
 
   try
     {
diff --git a/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf b/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf
index e87f9196f76..01725399041 100644
--- a/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf
+++ b/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService two_way -ECGAddressServerArg 230.100.1.7:26700"
diff --git a/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl b/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
index eac3e3f580f..96cad33de96 100755
--- a/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
+++ b/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
@@ -124,7 +124,7 @@ sub analyze_results {
         print STDERR "ERROR: Could not open $filename\n";
         return -1;
     }
-    
+
     my $status = 0;
     while (<TEST_OUTPUT>) {
         if (m/total of/) {
@@ -143,7 +143,7 @@ sub analyze_results {
         }
     }
     close (TEST_OUTPUT);
-    
+
     foreach $pid (keys %heartbeats) {
         my $ideal_heartbeats = $apps_number * 50;
         my $received_heartbeats = $heartbeats{$pid};
@@ -165,7 +165,7 @@ sub analyze_results {
         print STDERR "SUCCESS\n";
         return 0;
     }
- 
+
     print STDERR "ERROR - check $filename for full output.\n";
     return -1;
 }
diff --git a/orbsvcs/tests/Event/Performance/Connect.cpp b/orbsvcs/tests/Event/Performance/Connect.cpp
index 1b1145d67dc..91e0b6738a3 100644
--- a/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -8,10 +8,6 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (EC_Tests_Performance,
-           Connect,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Performance/Connect.h b/orbsvcs/tests/Event/Performance/Connect.h
index 1e78e417819..97b1482ebf2 100644
--- a/orbsvcs/tests/Event/Performance/Connect.h
+++ b/orbsvcs/tests/Event/Performance/Connect.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Connect
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Connect.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_CONNECT_H
 #define EC_CONNECT_H
@@ -24,35 +20,35 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class EC_Connect
+ *
+ * @brief Test the EC connection feature
+ *
+ * The EC can be configured to allow re-connection of suppliers
+ * and consumers, this test verifies that:
+ * + The EC does *not* allow connections if the feature is
+ * disabled (the default)
+ * + The EC does allow connections if the feature is enabled
+ * and:
+ * - There are no memory leaks
+ * - Compares the time required for a connection vs a complete
+ * connect/disconnect cycle, specially as the number of
+ * suppliers and consumers increases.
+ */
 class EC_Connect : public EC_Driver
 {
-  //
-  // = TITLE
-  //   Test the EC connection feature
-  //
-  // = DESCRIPTION
-  //   The EC can be configured to allow re-connection of suppliers
-  //   and consumers, this test verifies that:
-  //   + The EC does *not* allow connections if the feature is
-  //     disabled (the default)
-  //   + The EC does allow connections if the feature is enabled
-  //     and:
-  //     - There are no memory leaks
-  //     - Compares the time required for a connection vs a complete
-  //       connect/disconnect cycle, specially as the number of
-  //       suppliers and consumers increases.
-  //
 public:
+  /// Constructor
   EC_Connect (void);
-  // Constructor
 
   // = The EC_Driver methods
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_usage (void);
   virtual void print_args (void) const;
 
+  /// Don't run the suppliers, just test connect and disconnect calls.
   void execute_test (void);
-  // Don't run the suppliers, just test connect and disconnect calls.
 
   virtual void dump_results (void);
 
@@ -78,8 +74,8 @@ private:
   ACE_Throughput_Stats consumer_disconnect_;
   ACE_Throughput_Stats supplier_disconnect_;
 
+  /// What is connected first?
   int order_;
-  // What is connected first?
 };
 
 // ****************************************************************
diff --git a/orbsvcs/tests/Event/Performance/Inversion.cpp b/orbsvcs/tests/Event/Performance/Inversion.cpp
index 6b240c1f941..56f18c95d59 100644
--- a/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -8,10 +8,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/Arg_Shifter.h"
 
-ACE_RCSID (EC_Tests_Performance,
-           Inversion,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Performance/Inversion.h b/orbsvcs/tests/Event/Performance/Inversion.h
index c73eb43bbc8..19a7af0b111 100644
--- a/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/orbsvcs/tests/Event/Performance/Inversion.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Inversion
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Inversion.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_INVERSION_H
 #define EC_INVERSION_H
@@ -23,38 +19,42 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class EC_Inversion
+ *
+ * @brief Measure priority inversions in the EC.
+ *
+ */
 class EC_Inversion : public EC_Driver
 {
-  //
-  // = TITLE
-  //   Measure priority inversions in the EC.
-  //
-  // = DESCRIPTION
-  //
 public:
+  /// Constructor
   EC_Inversion (void);
-  // Constructor
 
   // = The EC_Driver methods
+  /**
+   * Parse the arguments, but override the number of consumers.
+   * The options controlling the event types are ignored, and only two
+   * consumers are created.
+   */
   int parse_args (int &argc, ACE_TCHAR *argv[]);
-  // Parse the arguments, but override the number of consumers.
-  // The options controlling the event types are ignored, and only two
-  // consumers are created.
 
+  /**
+   * In this test there are two consumers, the high priority consumer
+   * receives only events from a single high priority supplier.  The
+   * other consumer receives events from a set of low priority
+   * suppliers.
+   */
   virtual void connect_consumers (void);
   virtual void connect_suppliers (void);
-  // In this test there are two consumers, the high priority consumer
-  // receives only events from a single high priority supplier.  The
-  // other consumer receives events from a set of low priority
-  // suppliers.
 
+  /// Activate the suppliers at different priorities
   virtual void activate_tasks (void);
-  // Activate the suppliers at different priorities
 
 private:
+  /// If set then both low priority and high priority suppliers
+  /// generate the same events.
   int same_events_;
-  // If set then both low priority and high priority suppliers
-  // generate the same events.
 };
 
 #endif /* EC_INVERSION_H */
diff --git a/orbsvcs/tests/Event/Performance/Latency.cpp b/orbsvcs/tests/Event/Performance/Latency.cpp
index 279aaad2520..9b1f4d5bc5e 100644
--- a/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -13,7 +13,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(EC_Tests_Performance, Latency, "$Id$")
+
 
 int iterations = 1000;
 int do_dump_history = 0;
@@ -266,7 +266,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Event/Performance/Latency.h b/orbsvcs/tests/Event/Performance/Latency.h
index f09e9ad531e..9711d7989ad 100644
--- a/orbsvcs/tests/Event/Performance/Latency.h
+++ b/orbsvcs/tests/Event/Performance/Latency.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Latency
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Latency.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_LATENCY_H
 #define EC_LATENCY_H
diff --git a/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index e2e7e8e4937..9de21e581d9 100644
--- a/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -12,7 +12,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(EC_Tests_Performance, Latency_Server, "$Id$")
+
 
 const ACE_TCHAR *ior_file_name = ACE_TEXT("ec.ior");
 
@@ -155,6 +155,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/Event/Performance/Makefile.am b/orbsvcs/tests/Event/Performance/Makefile.am
deleted file mode 100644
index 1b5ed68fe9b..00000000000
--- a/orbsvcs/tests/Event/Performance/Makefile.am
+++ /dev/null
@@ -1,254 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Event_Performance_Connect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Connect
-
-Connect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Connect_SOURCES = \
-  Connect.cpp \
-  Connect.h
-
-Connect_LDFLAGS = \
-  -L../lib
-
-Connect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Performance_Inversion.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Inversion
-
-Inversion_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Inversion_SOURCES = \
-  Inversion.cpp \
-  Inversion.h
-
-Inversion_LDFLAGS = \
-  -L../lib
-
-Inversion_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Performance_Latency.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Latency
-
-Latency_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Latency_SOURCES = \
-  Latency.cpp \
-  Latency.h
-
-Latency_LDFLAGS = \
-  -L../lib
-
-Latency_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Performance_Latency_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Latency_Server
-
-Latency_Server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Latency_Server_SOURCES = \
-  Latency_Server.cpp \
-  Connect.h \
-  Inversion.h \
-  Latency.h \
-  Throughput.h
-
-Latency_Server_LDFLAGS = \
-  -L../lib
-
-Latency_Server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Performance_Throughput.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Throughput
-
-Throughput_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Throughput_SOURCES = \
-  Throughput.cpp \
-  Throughput.h
-
-Throughput_LDFLAGS = \
-  -L../lib
-
-Throughput_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Performance/Throughput.cpp b/orbsvcs/tests/Event/Performance/Throughput.cpp
index c3babe4dd4e..dddde59bcfa 100644
--- a/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (EC_Tests_Performance,
-           Throughput,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Performance/Throughput.h b/orbsvcs/tests/Event/Performance/Throughput.h
index 20b5bc63fcf..966c0f6b586 100644
--- a/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/orbsvcs/tests/Event/Performance/Throughput.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Throughput
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Throughput.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_THROUGHPUT_H
 #define EC_THROUGHPUT_H
@@ -23,32 +19,32 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class EC_Throughput
+ *
+ * @brief Test the EC throughput
+ *
+ */
 class EC_Throughput : public EC_Driver
 {
-  //
-  // = TITLE
-  //   Test the EC throughput
-  //
-  // = DESCRIPTION
-  //
 public:
+  /// Constructor
   EC_Throughput (void);
-  // Constructor
 
   // = The EC_Driver methods
+  /// add some command line args to enable/disable throughputions
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
-  // add some command line args to enable/disable throughputions
 
+  /// set the throughpution flags
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
-  // set the throughpution flags
 
+  /// Don't run the suppliers, just test connect and disconnect calls.
   void execute_test (void);
-  // Don't run the suppliers, just test connect and disconnect calls.
 
+  /// Don't dump the EC_Driver results, they are meaningless.
   void dump_results (void);
-  // Don't dump the EC_Driver results, they are meaningless.
 
 private:
 };
diff --git a/orbsvcs/tests/Event/Performance/ec.list.conf b/orbsvcs/tests/Event/Performance/ec.list.conf
index 5c28ef28fec..0abb338df0e 100644
--- a/orbsvcs/tests/Event/Performance/ec.list.conf
+++ b/orbsvcs/tests/Event/Performance/ec.list.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection st:delayed:list -ECProxyPushSupplierCollection st:delayed:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"
diff --git a/orbsvcs/tests/Event/Performance/ec.mt.conf b/orbsvcs/tests/Event/Performance/ec.mt.conf
index c9583c1847d..a5e1e08f1ac 100644
--- a/orbsvcs/tests/Event/Performance/ec.mt.conf
+++ b/orbsvcs/tests/Event/Performance/ec.mt.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECDispatching mt -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Performance/ec.rb_tree.conf b/orbsvcs/tests/Event/Performance/ec.rb_tree.conf
index 1032eb4807c..1b8f1e89741 100644
--- a/orbsvcs/tests/Event/Performance/ec.rb_tree.conf
+++ b/orbsvcs/tests/Event/Performance/ec.rb_tree.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection st:delayed:rb_tree -ECProxyPushSupplierCollection st:delayed:rb_tree -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"
diff --git a/orbsvcs/tests/Event/Performance/ec.st.conf b/orbsvcs/tests/Event/Performance/ec.st.conf
index 6e185e74acb..725d02ac3a1 100644
--- a/orbsvcs/tests/Event/Performance/ec.st.conf
+++ b/orbsvcs/tests/Event/Performance/ec.st.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection st:immediate:list -ECProxyPushSupplierCollection st:immediate:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"
diff --git a/orbsvcs/tests/Event/Performance/latency.conf b/orbsvcs/tests/Event/Performance/latency.conf
index 35359a852cb..df7a3a2dc55 100644
--- a/orbsvcs/tests/Event/Performance/latency.conf
+++ b/orbsvcs/tests/Event/Performance/latency.conf
@@ -1,4 +1,5 @@
 # $Id$
+
 # tp is now the default reactor type
 # static Resource_Factory "-ORBReactorType tp"
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/orbsvcs/tests/Event/ThreadFlags/Makefile.am b/orbsvcs/tests/Event/ThreadFlags/Makefile.am
deleted file mode 100644
index 10fcbfa4263..00000000000
--- a/orbsvcs/tests/Event/ThreadFlags/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.TFTest.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = testflags
-
-testflags_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-testflags_SOURCES = \
-  testflags.cpp
-
-testflags_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
index 9ced5ca501e..b38aaa13633 100644
--- a/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
+++ b/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_Thread.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID(EC_Tests, testflags, "$Id$")
+
 
 /*
   Here are the scenarios we need to test:
diff --git a/orbsvcs/tests/Event/UDP/AddrServer.cpp b/orbsvcs/tests/Event/UDP/AddrServer.cpp
index 0ee93ca95cb..7992bc6f951 100644
--- a/orbsvcs/tests/Event/UDP/AddrServer.cpp
+++ b/orbsvcs/tests/Event/UDP/AddrServer.cpp
@@ -3,7 +3,7 @@
 #include "AddrServer.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID(EC_Examples, AddrServer, "$Id$")
+
 
 AddrServer::AddrServer (const ACE_INET_Addr& addr)
 {
diff --git a/orbsvcs/tests/Event/UDP/AddrServer.h b/orbsvcs/tests/Event/UDP/AddrServer.h
index 2df463629ac..3f10baed395 100644
--- a/orbsvcs/tests/Event/UDP/AddrServer.h
+++ b/orbsvcs/tests/Event/UDP/AddrServer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   AddrServer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef ADDRSERVER_H
 #define ADDRSERVER_H
@@ -21,23 +17,24 @@
 #include "orbsvcs/RtecUDPAdminS.h"
 #include "ace/INET_Addr.h"
 
+/**
+ * @class AddrServer
+ *
+ * @brief A simple AddrServer
+ *
+ * The EC is able to use multiple multicast groups to transmit its
+ * data, the is given control over the mapping between the Event
+ * (type,source) pair and the (ipaddr,port) pair using a
+ * AddrServer.
+ * This class implements a very simple server that simply maps the
+ * <type> component to the <ipaddr> and uses a fixed <port>,
+ * provided at initialization time.
+ */
 class AddrServer : public POA_RtecUDPAdmin::AddrServer
 {
-  // = TITLE
-  //   A simple AddrServer
-  //
-  // = DESCRIPTION
-  //   The EC is able to use multiple multicast groups to transmit its
-  //   data, the is given control over the mapping between the Event
-  //   (type,source) pair and the (ipaddr,port) pair using a
-  //   AddrServer.
-  //   This class implements a very simple server that simply maps the
-  //   <type> component to the <ipaddr> and uses a fixed <port>,
-  //   provided at initialization time.
-  //
 public:
+  /// Constructor
   AddrServer (const ACE_INET_Addr& addr);
-  // Constructor
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
@@ -48,8 +45,8 @@ public:
 
 
 private:
+  /// The address
   ACE_INET_Addr addr_;
-  // The address
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/tests/Event/UDP/Consumer.cpp b/orbsvcs/tests/Event/UDP/Consumer.cpp
index 362b64604a6..89dd8c30951 100644
--- a/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -6,10 +6,6 @@
 
 #include "TestC.h"
 
-ACE_RCSID (EC_Examples,
-           Consumer,
-           "$Id$")
-
 Consumer::Consumer (bool valuetype)
   : event_count_ (0),
     valuetype_ (valuetype)
diff --git a/orbsvcs/tests/Event/UDP/Consumer.h b/orbsvcs/tests/Event/UDP/Consumer.h
index e805bbb8236..aeb512ae5aa 100644
--- a/orbsvcs/tests/Event/UDP/Consumer.h
+++ b/orbsvcs/tests/Event/UDP/Consumer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_H
 #define CONSUMER_H
@@ -24,38 +20,39 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Consumer
+ *
+ * @brief Simple consumer object
+ *
+ * This class is a consumer of events.
+ * It simply subscribes to one event type.
+ */
 class Consumer : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   It simply subscribes to one event type.
-  //
 public:
+  /// Constructor
   Consumer (bool valuetype);
-  // Constructor
 
+  /// Connect to the Event Channel
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  // Connect to the Event Channel
 
+  /// Disconnect from the event channel
   void disconnect (void);
-  // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 
   CORBA::ULong event_count (void) const;
 private:
+  /// Keep track of the number of events received.
   CORBA::ULong event_count_;
-  // Keep track of the number of events received.
 
+  /// The proxy
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy_;
-  // The proxy
 
   bool valuetype_;
 };
diff --git a/orbsvcs/tests/Event/UDP/Makefile.am b/orbsvcs/tests/Event/UDP/Makefile.am
deleted file mode 100644
index db85cf06b59..00000000000
--- a/orbsvcs/tests/Event/UDP/Makefile.am
+++ /dev/null
@@ -1,145 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RtEC_UDP_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.RtEC_UDP_Receiver.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  AddrServer.cpp \
-  Consumer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  receiver.cpp \
-  AddrServer.h \
-  Consumer.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RtEC_UDP_Sender.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  AddrServer.cpp \
-  Supplier.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  sender.cpp \
-  AddrServer.h \
-  Supplier.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/UDP/Supplier.cpp b/orbsvcs/tests/Event/UDP/Supplier.cpp
index 72c83e70cdc..1138ba409f4 100644
--- a/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID (EC_Examples,
-           Supplier,
-           "$Id$")
-
 Supplier::Supplier (bool valuetype) : valuetype_ (valuetype), event_count_ (0)
 {
 }
diff --git a/orbsvcs/tests/Event/UDP/Supplier.h b/orbsvcs/tests/Event/UDP/Supplier.h
index 52c17eb22f9..23ea368ef62 100644
--- a/orbsvcs/tests/Event/UDP/Supplier.h
+++ b/orbsvcs/tests/Event/UDP/Supplier.h
@@ -1,18 +1,13 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
 
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
@@ -25,39 +20,40 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ * It simply publishes one event type, when the perform_push()
+ * method is invoked it pushes the event through the event service
+ */
 class Supplier : public POA_RtecEventComm::PushSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   It simply publishes one event type, when the perform_push()
-  //   method is invoked it pushes the event through the event service
-  //
 public:
+  /// Constructor
   Supplier (bool valuetype);
-  // Constructor
 
+  /// Connect to the event channel
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  // Connect to the event channel
 
+  /// Disconnect from the event channel
   void disconnect (void);
-  // Disconnect from the event channel
 
+  /// Push a single event
   void perform_push (void);
-  // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
+  /// The skeleton methods.
   virtual void disconnect_push_supplier (void);
-  // The skeleton methods.
 
 private:
   void insert_into_any (CORBA::Any& any, Components::EventBase* vb);
 
+  /// The proxy
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy_;
-  // The proxy
 
   bool valuetype_;
 
diff --git a/orbsvcs/tests/Event/UDP/receiver.cpp b/orbsvcs/tests/Event/UDP/receiver.cpp
index 0eac152ebb1..2b94d185d48 100644
--- a/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "Consumer.h"
 #include "AddrServer.h"
 #include "orbsvcs/Event_Service_Constants.h"
@@ -14,10 +13,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "TestC.h"
 
-ACE_RCSID (EC_Examples,
-           MCast,
-           "$Id$")
-
 const ACE_TCHAR *udp_mcast_address =
     ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001");
 
@@ -160,7 +155,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
       // To receive events we need to setup an event handler:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver = TAO_ECG_UDP_Receiver::create();
+      PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver =
+        TAO_ECG_UDP_Receiver::create();
       TAO_ECG_Mcast_EH mcast_eh (&(*receiver));
 
       // The event handler uses the ORB reactor to wait for multicast
@@ -327,6 +323,6 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/Event/UDP/sender.cpp b/orbsvcs/tests/Event/UDP/sender.cpp
index c0ac8a4a6f5..3a83d94c10d 100644
--- a/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/orbsvcs/tests/Event/UDP/sender.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "Supplier.h"
 #include "AddrServer.h"
 #include "orbsvcs/Event_Service_Constants.h"
@@ -13,10 +12,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Examples,
-           MCast,
-           "$Id$")
-
 const ACE_TCHAR *udp_mcast_address =
     ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001");
 
@@ -144,7 +139,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       // Now we setup the sender:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create();
+      PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender =
+        TAO_ECG_UDP_Sender::create();
       sender->init (event_channel.in (),
                     address_server.in (),
                     endpoint);
@@ -278,6 +274,6 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/Event/UDP/svc.conf b/orbsvcs/tests/Event/UDP/svc.conf
index d0297d4649e..9b72e028412 100644
--- a/orbsvcs/tests/Event/UDP/svc.conf
+++ b/orbsvcs/tests/Event/UDP/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFilter per-supplier"
diff --git a/orbsvcs/tests/Event/lib/Consumer.cpp b/orbsvcs/tests/Event/lib/Consumer.cpp
index 8494bae5c9a..afc80cd72de 100644
--- a/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -6,10 +6,6 @@
 
 #include "tao/debug.h"
 
-ACE_RCSID (EC_Tests,
-           EC_Consumer,
-           "$Id$")
-
 EC_Consumer::EC_Consumer (EC_Driver *driver,
                           void *cookie)
   : driver_ (driver),
diff --git a/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index a022244d3cb..cf78deb34e1 100644
--- a/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "Counting_Consumer.h"
 
-ACE_RCSID(EC_Tests, EC_Count_Consumer, "$Id$")
+
 
 EC_Counting_Consumer::EC_Counting_Consumer (const char* name)
   : event_count (0),
diff --git a/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 0ce3c6e4be9..35da042eb61 100644
--- a/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Tests,
-           EC_Count_Supplier,
-           "$Id$")
-
 EC_Counting_Supplier::EC_Counting_Supplier (void)
   :  event_count (0),
      disconnect_count (0),
diff --git a/orbsvcs/tests/Event/lib/Driver.cpp b/orbsvcs/tests/Event/lib/Driver.cpp
index 4202c834f61..4c3d1c11106 100644
--- a/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/orbsvcs/tests/Event/lib/Driver.cpp
@@ -26,7 +26,7 @@
 #include "Driver.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(EC_Tests, EC_Driver, "$Id$")
+
 
 EC_Driver::EC_Driver (void)
   :  n_consumers_ (1),
diff --git a/orbsvcs/tests/Event/lib/Makefile.am b/orbsvcs/tests/Event/lib/Makefile.am
deleted file mode 100644
index cc6f3bd2da2..00000000000
--- a/orbsvcs/tests/Event/lib/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Event_Test_Lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES = libECTests.la
-
-libECTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DEC_TEST_BUILD_DLL
-
-libECTests_la_SOURCES = \
-  Consumer.cpp \
-  Counting_Consumer.cpp \
-  Counting_Supplier.cpp \
-  Driver.cpp \
-  Supplier.cpp
-
-noinst_HEADERS = \
-  Consumer.h \
-  Counting_Consumer.h \
-  Counting_Supplier.h \
-  Driver.h \
-  Driver.inl \
-  Supplier.h \
-  ectest_export.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/lib/Supplier.cpp b/orbsvcs/tests/Event/lib/Supplier.cpp
index 7e68e48dc01..d7f95265e8d 100644
--- a/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -7,10 +7,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Tests,
-           EC_Supplier,
-           "$Id$")
-
 EC_Supplier::EC_Supplier (EC_Driver *driver,
                           void* cookie)
   :  driver_ (driver),
diff --git a/orbsvcs/tests/FT_App/FT_Client.cpp b/orbsvcs/tests/FT_App/FT_Client.cpp
index d9c33457395..d220a23984d 100644
--- a/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -184,12 +184,14 @@ FTClientMain::parse_args (int argc, ACE_TCHAR *argv[])
         this->inFile_ = ACE_OS::fopen (this->inFileName_, "r");
         if(this->inFile_ && !ferror (this->inFile_))
         {
-          ACE_OS::fprintf (stdout, "FT Client: Reading commands from %s\n", this->inFileName_);
+          ACE_OS::fprintf (stdout, "FT Client: Reading commands from %s\n",
+                           ACE_TEXT_ALWAYS_CHAR (this->inFileName_));
           this->commandIn_ = this->inFile_;
         }
         else
         {
-          ACE_OS::fprintf (stderr, "FT Client: Can't open input file: %s\n", this->inFileName_);
+          ACE_OS::fprintf (stderr, "FT Client: Can't open input file: %s\n",
+                           ACE_TEXT_ALWAYS_CHAR (this->inFileName_));
           result = -1;
         }
         break;
@@ -510,7 +512,11 @@ int FTClientMain::next_replica (void)
   }
   else
   {
-    ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** %d\n", this->replica_pos_);
+    ACE_OS::fprintf (stderr,
+                     "***OUT_OF_REPLICAS*** "
+                     ACE_SIZE_T_FORMAT_SPECIFIER_ASCII
+                     "\n",
+                     this->replica_pos_);
   }
   return result;
 }
diff --git a/orbsvcs/tests/FT_App/FT_Creator.cpp b/orbsvcs/tests/FT_App/FT_Creator.cpp
index cf764bf72c4..6a08013f12b 100644
--- a/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -192,7 +192,8 @@ int FTAPP::FT_Creator::run (void)
       CORBA::String_var iogr = this->orb_->object_to_string (group.in ());
 
       char iogr_filename[1000];
-      ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename), "%s%s_%d.iogr",
+      ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename),
+        "%s%s_" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII ".iogr",
         this->prefix_.c_str (),
         role,
         this->iogr_seq_);
@@ -213,7 +214,8 @@ int FTAPP::FT_Creator::run (void)
     if(this->ns_register_)
     {
       char iogr_name[1000];
-      ACE_OS::snprintf (iogr_name, sizeof(iogr_name), "%s_%s_%d",
+      ACE_OS::snprintf (iogr_name, sizeof(iogr_name),
+        "%s_%s_" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII,
         this->prefix_.c_str (),
         role,
         this->iogr_seq_);
diff --git a/orbsvcs/tests/FT_App/FT_Creator.h b/orbsvcs/tests/FT_App/FT_Creator.h
index 1f8c767c02c..44e7b6125f4 100644
--- a/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/orbsvcs/tests/FT_App/FT_Creator.h
@@ -100,7 +100,7 @@ namespace FTAPP
     /**
      * sequence number applied to created IOGRs
      */
-    unsigned long iogr_seq_;
+    size_t iogr_seq_;
 
     /**
      * prefix for names
diff --git a/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 350aa991349..371ec0151eb 100644
--- a/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -89,9 +89,8 @@ FT_ReplicaFactory_i::FT_ReplicaFactory_i ()
 
 FT_ReplicaFactory_i::~FT_ReplicaFactory_i ()
 {
-  //scope the guard
   {
-    InternalGuard guard (this->internals_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
     // be sure all replicas are gone
     // before this object disappears
@@ -234,7 +233,7 @@ int FT_ReplicaFactory_i::parse_args (int argc, ACE_TCHAR * argv[])
       break;
     }
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -482,15 +481,14 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb)
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_.c_str ());
 
-    this->naming_context_->rebind (this->this_name_, this_obj.in()  // CORBA::Object::_duplicate(this_obj)
-                            );
+    this->naming_context_->rebind (this->this_name_, this_obj.in());
   }
 
   // if we're testing.  Create a replica at startup time
   if (this->test_output_file_ != 0)
   {
     // shouldn't be necessary, but create_replica assumes this
-    InternalGuard guard (this->internals_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, 1);
     FT_TestReplica_i * replica = create_replica ("test");
 
     PortableServer::POA_var poa = replica->_default_POA ();
@@ -561,7 +559,7 @@ int FT_ReplicaFactory_i::fini (void)
 
 void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * replica)
 {
-  InternalGuard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   if (id < this->replicas_.size())
   {
     if(this->replicas_[id] == replica)
@@ -595,12 +593,11 @@ void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * rep
 CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  )
+    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
 {
   METHOD_ENTRY(FT_ReplicaFactory_i::create_object);
   ACE_UNUSED_ARG (type_id);
-  InternalGuard guard (this->internals_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, CORBA::Object::_nil ());
 
   ::TAO::PG_Property_Set decoder (the_criteria);
 
@@ -682,12 +679,11 @@ FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name)
 }
 
 void FT_ReplicaFactory_i::delete_object (
-    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  )
+    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id)
 {
   METHOD_ENTRY(FT_ReplicaFactory_i::delete_object);
 
-  InternalGuard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
   CORBA::ULong factoryId;
   factory_creation_id >>= factoryId;
@@ -712,13 +708,13 @@ void FT_ReplicaFactory_i::delete_object (
 CORBA::Boolean FT_ReplicaFactory_i::is_alive (void)
 {
   METHOD_RETURN(FT_ReplicaFactory_i::is_alive)
-    1;
+    true;
 }
 
 void FT_ReplicaFactory_i::shutdown (void)
 {
   METHOD_ENTRY(FT_FaultDetectorFactory_i::shutdown);
-  InternalGuard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   shutdown_i ();
   this->quit_requested_ = 1;
   METHOD_RETURN(FT_FaultDetectorFactory_i::shutdown);
diff --git a/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index 44362b7092b..b4a38b107bb 100644
--- a/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -161,7 +161,6 @@ private:
    * locked if necessary.
    */
   TAO_SYNCH_MUTEX internals_;
-  typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
 
   /**
    * The orb
diff --git a/orbsvcs/tests/FT_App/Makefile.am b/orbsvcs/tests/FT_App/Makefile.am
deleted file mode 100644
index 48f82a8bec2..00000000000
--- a/orbsvcs/tests/FT_App/Makefile.am
+++ /dev/null
@@ -1,486 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.FT_App_Analyzer.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_analyzer
-
-ft_analyzer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_analyzer_SOURCES = \
-  FTAPP_Analyzer_Main.cpp \
-  StubBatchConsumer.cpp \
-  StubFaultAnalyzer.cpp \
-  StubFaultConsumer.cpp \
-  StubBatchConsumer.h \
-  StubFaultAnalyzer.h \
-  StubFaultConsumer.h
-
-ft_analyzer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  FT_TestReplicaC.cpp \
-  FT_TestReplicaC.h \
-  FT_TestReplicaC.inl \
-  FT_TestReplicaS.cpp \
-  FT_TestReplicaS.h \
-  FT_TestReplicaS.inl
-
-CLEANFILES = \
-  FT_TestReplica-stamp \
-  FT_TestReplicaC.cpp \
-  FT_TestReplicaC.h \
-  FT_TestReplicaC.inl \
-  FT_TestReplicaS.cpp \
-  FT_TestReplicaS.h \
-  FT_TestReplicaS.inl
-
-FT_TestReplicaC.cpp FT_TestReplicaC.h FT_TestReplicaC.inl FT_TestReplicaS.cpp FT_TestReplicaS.h FT_TestReplicaS.inl: FT_TestReplica-stamp
-
-FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl
-	@touch $@
-
-noinst_HEADERS = \
-  FT_TestReplica.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.FT_App_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_client
-
-ft_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_client_SOURCES = \
-  FT_Client.cpp \
-  FT_TestReplicaC.cpp \
-  FT_Creator.h \
-  FT_ReplicaFactory_i.h \
-  FT_TestReplica_i.h \
-  ReplicationManagerFaultConsumerAdapter.h \
-  StubBatchConsumer.h \
-  StubFaultAnalyzer.h \
-  StubFaultConsumer.h \
-  StubFaultNotifier.h \
-  TAO_Object_Group_Creator.h
-
-ft_client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_Creator.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_create
-
-ft_create_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_create_SOURCES = \
-  FT_Creator.cpp \
-  TAO_Object_Group_Creator.cpp \
-  FT_Creator.h \
-  TAO_Object_Group_Creator.h
-
-ft_create_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_FactoryRegistry.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_registry
-
-ft_registry_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_registry_SOURCES = \
-  FTAPP_FactoryRegistry_Main.cpp
-
-ft_registry_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_FaultConsumer.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_fault_consumer
-
-ft_fault_consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_fault_consumer_SOURCES = \
-  FTAPP_FaultConsumer_Main.cpp \
-  ReplicationManagerFaultConsumerAdapter.cpp \
-  ReplicationManagerFaultConsumerAdapter.h
-
-ft_fault_consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/FT_ReplicationManager/libTAO_ReplicationManagerLib.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_Notifier.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_notifier
-
-ft_notifier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_notifier_SOURCES = \
-  FTAPP_Notifier_Main.cpp \
-  StubFaultNotifier.cpp \
-  StubFaultNotifier.h
-
-ft_notifier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_RMController.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += replmgr_controller
-
-replmgr_controller_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-replmgr_controller_SOURCES = \
-  FT_ReplicationManagerController.cpp \
-  FT_Creator.h \
-  FT_ReplicaFactory_i.h \
-  FT_TestReplica_i.h \
-  ReplicationManagerFaultConsumerAdapter.h \
-  StubBatchConsumer.h \
-  StubFaultAnalyzer.h \
-  StubFaultConsumer.h \
-  StubFaultNotifier.h \
-  TAO_Object_Group_Creator.h
-
-replmgr_controller_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_replica
-
-ft_replica_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_replica_SOURCES = \
-  FT_Replica.cpp \
-  FT_ReplicaFactory_i.cpp \
-  FT_TestReplicaC.cpp \
-  FT_TestReplicaS.cpp \
-  FT_TestReplica_i.cpp \
-  FT_ReplicaFactory_i.h \
-  FT_TestReplica_i.h
-
-ft_replica_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 5d123ccb437..2b8903ed3d3 100644
--- a/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -115,7 +115,8 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb)
   this->factory_ = ::FT::FaultDetectorFactory::_narrow(detector_obj.in ());
   if (CORBA::is_nil(this->factory_.in ()))
   {
-    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n", this->detector_ior_);
+    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n",
+                     ACE_TEXT_ALWAYS_CHAR (this->detector_ior_));
     result = -1;
   }
 
@@ -125,7 +126,8 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb)
   this->notifier_ = ::FT::FaultNotifier::_narrow(not_obj.in ());
   if (CORBA::is_nil(this->notifier_.in ()))
   {
-    ACE_OS::fprintf (stderr, "Can't resolve Notifier IOR %s\n", this->notifier_ior_);
+    ACE_OS::fprintf (stderr, "Can't resolve Notifier IOR %s\n",
+                     ACE_TEXT_ALWAYS_CHAR (this->notifier_ior_));
     result = -1;
   }
 
diff --git a/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 5b84af9a390..e51a9eacf59 100644
--- a/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -182,7 +182,8 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb)
   this->factory_ = ::FT::FaultDetectorFactory::_narrow(obj.in ());
   if (CORBA::is_nil(this->factory_.in ()))
   {
-    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n", this->detector_ior_);
+    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n",
+                     ACE_TEXT_ALWAYS_CHAR (this->detector_ior_));
     result = -1;
   }
   if (result == 0)
diff --git a/orbsvcs/tests/FT_App/run_test_demo.pl b/orbsvcs/tests/FT_App/run_test_demo.pl
index 56226d77fe4..4ed9b4fa641 100755
--- a/orbsvcs/tests/FT_App/run_test_demo.pl
+++ b/orbsvcs/tests/FT_App/run_test_demo.pl
@@ -262,7 +262,7 @@ $hostname = $rp_manager->HostName ();
 $port = $rp_manager->RandomPort ();
 
 $RM = $rp_manager->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager" .
-                                  "$build_directory/FT_ReplicationManager",
+                                  "$build_directory/tao_ft_replicationmanager",
                                   "-o $rp_manager_ior " .
                                   "-ORBEndpoint iiop://$hostname:$port");
 
@@ -271,18 +271,18 @@ $RMC = $rp_manager_controller->CreateProcess (".$build_directory/replmgr_control
                                  "-x");
 
 $NOT = $fault_notifier->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Notifier" .
-                                       "$build_directory/Fault_Notifier" ,
+                                       "$build_directory/tao_fault_notifier" ,
                                         "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                         "-o $fault_notifier_ior -q");
 
 $DET1 = $fault_detector1->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                        "-o $fault_detector1_ior " .
                                        "-l $location1 -q");
 
 $DET2 = $fault_detector2->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                        "-o $fault_detector1_ior " .
                                        "-l $location2 -q");
diff --git a/orbsvcs/tests/FT_App/run_test_detector.pl b/orbsvcs/tests/FT_App/run_test_detector.pl
index 694895a5c81..f1c992aa1f9 100755
--- a/orbsvcs/tests/FT_App/run_test_detector.pl
+++ b/orbsvcs/tests/FT_App/run_test_detector.pl
@@ -179,12 +179,12 @@ $REP2 = $ft_replica2->CreateProcess (".$build_directory/ft_replica" ,
                                      "-l loc2 -i type1 -q -p $ft_replica2_client_data");
 
 $DET = $fault_detector->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                        "-o $fault_detector_ior -q");
 
 $NOT = $fault_notifier->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Notifier" .
-                                       "$build_directory/Fault_Notifier" ,
+                                       "$build_directory/tao_fault_notifier" ,
                                         "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                         "-o $fault_notifier_ior -q " .
                                         "-d file://$notifier_detector_ior " .
diff --git a/orbsvcs/tests/FT_App/run_test_fault_consumer.pl b/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
index 66329347408..ae538957384 100755
--- a/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
+++ b/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
@@ -203,7 +203,7 @@ $REP2 = $ft_replica2->CreateProcess (".$build_directory/ft_replica" ,
                                      "-l loc2 -i type1 -q -p $ft_replica2_client_data");
 
 $DET = $fault_detector->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-r " .
                                        "-o $fault_detector_ior -q");
 
diff --git a/orbsvcs/tests/FT_App/run_test_notifier.pl b/orbsvcs/tests/FT_App/run_test_notifier.pl
index 6e1a692b23c..f7c64ef1da6 100755
--- a/orbsvcs/tests/FT_App/run_test_notifier.pl
+++ b/orbsvcs/tests/FT_App/run_test_notifier.pl
@@ -200,12 +200,12 @@ $REP2 = $ft_replica2->CreateProcess (".$build_directory/ft_replica" ,
                                      "-l loc2 -i type1 -q -p $ft_replica2_client_data");
 
 $DET = $fault_detector->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-r " .
                                        "-o $fault_detector_ior -q");
 
 $NOT = $fault_notifier->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Notifier" .
-                                       "$build_directory/Fault_Notifier" ,
+                                       "$build_directory/tao_fault_notifier" ,
                                         "-r " .
                                         "-o $fault_notifier_ior -q");
 
diff --git a/orbsvcs/tests/FT_App/run_test_registry.pl b/orbsvcs/tests/FT_App/run_test_registry.pl
index 6948b684dd2..ef7689ddce0 100755
--- a/orbsvcs/tests/FT_App/run_test_registry.pl
+++ b/orbsvcs/tests/FT_App/run_test_registry.pl
@@ -306,7 +306,7 @@ $hostname = $rp_manager->HostName ();
 $port = $rp_manager->RandomPort ();
 
 $RM = $rp_manager->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager" .
-                                  "$build_directory/FT_ReplicationManager",
+                                  "$build_directory/tao_ft_replicationmanager",
                                   "-o $rp_manager_ior " .
                                   "-ORBEndpoint iiop://$hostname:$port");
 my($RMC);
diff --git a/orbsvcs/tests/FT_App/run_test_rmnotifier.pl b/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
index 2dd3ac6a488..de1938d0a3c 100755
--- a/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
+++ b/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
@@ -203,7 +203,7 @@ $client->DeleteFile ($replica2_ior);
 
 ### Create process
 $RM = $rp_manager->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager" .
-                                  "$build_directory/FT_ReplicationManager",
+                                  "$build_directory/tao_ft_replicationmanager",
                                   "-o $rp_manager_ior " .
                                   "-ORBEndpoint iiop://$hostname:$port");
 
@@ -222,12 +222,12 @@ $REP2 = $ft_replica2->CreateProcess (".$build_directory/ft_replica" ,
                                      "-l loc2 -i type1 -q -p $ft_replica2_client_data");
 
 $DET = $fault_detector->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                        "-o $fault_detector_ior -q");
 
 $NOT = $fault_notifier->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Notifier" .
-                                       "$build_directory/Fault_Notifier" ,
+                                       "$build_directory/tao_fault_notifier" ,
                                         "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                         "-o $fault_notifier_ior -q");
 
diff --git a/orbsvcs/tests/FT_App/run_test_rmregistry.pl b/orbsvcs/tests/FT_App/run_test_rmregistry.pl
index f0b28c6240e..95b802a8f10 100755
--- a/orbsvcs/tests/FT_App/run_test_rmregistry.pl
+++ b/orbsvcs/tests/FT_App/run_test_rmregistry.pl
@@ -257,7 +257,7 @@ $client3->DeleteFile ($replica6_ior);
 $client3->DeleteFile ($replica3_iogr);
 
 $RM = $rp_manager->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager" .
-                                  "$build_directory/FT_ReplicationManager",
+                                  "$build_directory/tao_ft_replicationmanager",
                                   "-o $rp_manager_ior " .
                                   "-ORBEndpoint iiop://$hostname:$port");
 
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
deleted file mode 100644
index 57b1109aacb..00000000000
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
+++ /dev/null
@@ -1,155 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.GroupRef_Manipulation_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -DCORBA3 $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.GroupRef_Manipulation_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.GroupRef_Manipulation_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index 9dea6f91d01..fe9454b050f 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -1,12 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Server_Request_Interceptor.h"
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 496a3d40a98..053d4054198 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_Request_Interceptor.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -7,10 +8,6 @@
 #include "tao/CDR.h"
 #include "testS.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_Request_Interceptor,
-           "$Id$")
-
 static const CORBA::ULong expected_version = 5;
 
 Server_Request_Interceptor::Server_Request_Interceptor (void)
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 6b8b91aa288..b10636850e8 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
@@ -6,10 +7,6 @@
 #include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 
-ACE_RCSID (Group_Ref_Manip,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = 0;
 
 
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 9e33bcc9650..428c66100ee 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
@@ -14,10 +15,6 @@
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 
-ACE_RCSID (ForwardRequest,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_file = 0;
 
 int
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index b25a7d02ce9..a845f0270e1 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (ForwardRequest,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::Short num,
                 CORBA::ORB_ptr orb)
   : number_ (num),
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
index 5b95112cdf1..38db7554b84 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
+++ b/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    test
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    A helper class for the client
-//
-// = AUTHOR
-//     Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.h
+ *
+ *  $Id$
+ *
+ *  A helper class for the client
+ *
+ *
+ *  @author  Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TEST_FT_IOGR_CLIENT_I_H
 #define TEST_FT_IOGR_CLIENT_I_H
@@ -30,11 +27,11 @@
 class Client_i
 {
 public:
+  /// Our constructor
   Client_i (CORBA::ORB_ptr orb);
-  // Our constructor
 
+  /// Initialize the ORB etc.
   void init (void);
-  // Initialize the ORB etc.
 
 private:
   CORBA::ORB_var orb_;
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
deleted file mode 100644
index ea307be2674..00000000000
--- a/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
+++ /dev/null
@@ -1,149 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.FaultTolerance_IOGR_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.FaultTolerance_IOGR_Manager.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Manager
-
-Manager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Manager_SOURCES = \
-  Manager.cpp \
-  testC.cpp \
-  Manager.h
-
-Manager_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FaultTolerance_IOGR_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 47fe59c26fc..a70dbe81524 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -51,7 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
index b674782986f..e46b0ad131e 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ b/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
@@ -1,22 +1,18 @@
-//$Id$
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   test
-//
-// = FILENAME
-//    Manager.h
-//
-// = DESCRIPTION
-//    A manager class that merger IORS and designates primary
-//
-// = AUTHOR
-//     Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Manager.h
+ *
+ *  $Id$
+ *
+ *  A manager class that merger IORS and designates primary
+ *
+ *
+ *  @author  Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 #ifndef TEST_FT_IOGR_MANAGER_H
 #define TEST_FT_IOGR_MANAGER_H
 
@@ -36,29 +32,29 @@ public:
 
   // Initialize the ORB, POA etc.
 
+  /// Merges the different IORS
   int make_merged_iors (void);
-  // Merges the different IORS
 
+  /// Sets the properties for the profiles
   int set_properties (void);
-  // Sets the properties for the profiles
 
+  /// Run the  ORB event loop..
   int run (void);
-  // Run the  ORB event loop..
 
+  /// Write the merged IOR to a file
   int write_to_file (void);
-  // Write the merged IOR to a file
 
+  /// Return the pointer to the copy of our ORB
   CORBA::ORB_ptr orb (void);
-  // Return the pointer to the copy of our ORB
 private:
   CORBA::Object_var object_primary_;
   CORBA::Object_var object_secondary_;
 
+  /// The merged IOR set
   CORBA::Object_var merged_set_;
-  // The merged IOR set
 
+  /// Our ORB
   CORBA::ORB_var orb_;
-  // Our ORB
 };
 
 #endif /*TEST_FT_IOGR_MANAGER_H */
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index c98be431d71..1d08ce00953 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 65f59b5c21d..ed8c1b4122d 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -6,7 +6,7 @@
 //#include "test_i.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Client, test_i, "$Id$")
+
 
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
index 47adea6b740..43c11edfb1e 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ b/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
@@ -1,37 +1,35 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/FaultTolerance/IOGR
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_FT_IOGR_TEST_I_H
 #define TAO_FT_IOGR_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// ctor
   Simple_Server_i (void);
-  // ctor
 
   // = The Simple_Server methods.
   void remote_call (void);
diff --git a/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 45141f4d2c3..29d8bf5eead 100644
--- a/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -1,30 +1,22 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//   tests/FaultTolerance/IOGRManipulation
-//
-//
-// = FILENAME
-//     IOGRTest.cpp
-//
-// = DESCRIPTION
-//   This program tests the basic functionality FT IOGR implementation
-//
-// = AUTHOR
-//     Bala Natarajan <bala@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     IOGRTest.cpp
+ *
+ *  $Id$
+ *
+ * This program tests the basic functionality FT IOGR implementation
+ *
+ *
+ *  @author  Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 
-ACE_RCSID(IOGRManipluation,
-          IOGRTest,
-          "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
deleted file mode 100644
index f446221ab9c..00000000000
--- a/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IOGRTest.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = IOGRTest
-
-IOGRTest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-IOGRTest_SOURCES = \
-  IOGRTest.cpp
-
-IOGRTest_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FaultTolerance/Makefile.am b/orbsvcs/tests/FaultTolerance/Makefile.am
deleted file mode 100644
index fdc9d775202..00000000000
--- a/orbsvcs/tests/FaultTolerance/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        GroupRef_Manipulation \
-        IOGR \
-        IOGRManipulation
-
diff --git a/orbsvcs/tests/FtRtEvent/Makefile.am b/orbsvcs/tests/FtRtEvent/Makefile.am
deleted file mode 100644
index 895035c4bad..00000000000
--- a/orbsvcs/tests/FtRtEvent/Makefile.am
+++ /dev/null
@@ -1,128 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.FtRtEvent_Consumer.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-consumer_SOURCES = \
-  PushConsumer.cpp \
-  consumer.cpp \
-  PushConsumer.h
-
-consumer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FtRtEvent_Supplier.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-supplier_SOURCES = \
-  PushSupplier.cpp \
-  supplier.cpp \
-  PushSupplier.h
-
-supplier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index 1cbdb689a45..dd1428179db 100644
--- a/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (FtRtEvent,
-           PushConsumer,
-           "$Id$")
-
 PushConsumer_impl::PushConsumer_impl(CORBA::ORB_ptr orb)
 : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 693fe30f472..1be4464c3b5 100644
--- a/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -9,10 +9,6 @@
 #include "tao/Stub.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 
-ACE_RCSID (FtRtEvent,
-           PushSupplier,
-           "$Id$")
-
 int
 PushSupplier_impl::ReactorTask::svc (void)
 {
diff --git a/orbsvcs/tests/FtRtEvent/consumer.cpp b/orbsvcs/tests/FtRtEvent/consumer.cpp
index 7992c1dbe64..653956af79b 100644
--- a/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -15,10 +15,6 @@
 /// include this file to statically linked with Transaction Depth
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
-ACE_RCSID (FtRtEvent,
-           consumer,
-           "$Id$")
-
 CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
@@ -71,7 +67,7 @@ get_event_channel(int argc, ACE_TCHAR** argv)
 
     if (use_gateway)
     {
-      ACE_AUTO_PTR_RESET (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in()), TAO_FTRTEC::FTEC_Gateway);
+      ACE_auto_ptr_reset (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in()));
       return gateway->_this();
     }
     else
diff --git a/orbsvcs/tests/FtRtEvent/supplier.cpp b/orbsvcs/tests/FtRtEvent/supplier.cpp
index a17ddeb4ba1..38239fbc6b7 100644
--- a/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -14,10 +14,6 @@
 /// include this file to statically linked with Transaction Depth
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
-ACE_RCSID (FtRtEvent,
-           supplier,
-           "$Id$")
-
 ACE_Time_Value timer_interval(1,0);
 CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
@@ -77,7 +73,7 @@ get_event_channel(int argc, ACE_TCHAR** argv)
     if (use_gateway)
     {
       // use local gateway to communicate with FTRTEC
-      ACE_AUTO_PTR_RESET (gateway, new TAO_FTRTEC::FTEC_Gateway (orb.in (), channel.in ()), TAO_FTRTEC::FTEC_Gateway);
+      ACE_auto_ptr_reset (gateway, new TAO_FTRTEC::FTEC_Gateway (orb.in (), channel.in ()));
       return gateway->_this ();
     }
     else
diff --git a/orbsvcs/tests/HTIOP/AMI/Makefile.am b/orbsvcs/tests/HTIOP/AMI/Makefile.am
deleted file mode 100644
index 3e75798249d..00000000000
--- a/orbsvcs/tests/HTIOP/AMI/Makefile.am
+++ /dev/null
@@ -1,172 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.HTIOP_AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.HTIOP_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-client_SOURCES = \
-  Test_Output.cpp \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.HTIOP_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-server_SOURCES = \
-  Test_Output.cpp \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  server.cpp \
-  ami_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.HTIOP_AMI_Simple_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += simple_client
-
-simple_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-simple_client_SOURCES = \
-  Test_Output.cpp \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  simple_client.cpp \
-  ami_test_i.h
-
-simple_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/HTIOP/AMI/ami_test.idl b/orbsvcs/tests/HTIOP/AMI/ami_test.idl
index df28b53177a..c4d33f656f8 100644
--- a/orbsvcs/tests/HTIOP/AMI/ami_test.idl
+++ b/orbsvcs/tests/HTIOP/AMI/ami_test.idl
@@ -1,24 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    ami_test.idl
-//
-// = DESCRIPTION
-//    IDL description of the AMI Test interface
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
-
-
-module A 
+
+//=============================================================================
+/**
+ *  @file    ami_test.idl
+ *
+ *  $Id$
+ *
+ *  IDL description of the AMI Test interface
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
+
+
+module A
   {
     exception DidTheRightThing {
       long id;
@@ -27,13 +24,13 @@ module A
 
     interface AMI_Test
       {
-        long foo (out long out_l, 
+        long foo (out long out_l,
                   in long in_l,
                   in string in_str)
           raises (DidTheRightThing);
-  
+
         attribute long yadda;
-        
+
         oneway void shutdown ();
       };
 
diff --git a/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
index d5e5ea40f22..ea0980fbae4 100644
--- a/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
+++ b/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
@@ -1,26 +1,23 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    ami_test_i.cpp
-//
-// = DESCRIPTION
-//    Implementation of the AMI Test interface.
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ami_test_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the AMI Test interface.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "ami_test_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
+
 
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
index edc62b03212..c68c30c50c8 100644
--- a/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
+++ b/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/AMI
-//
-// = FILENAME
-//   ami_test_i.h
-//
-// = AUTHOR
-//   Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   ami_test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #ifndef TAO_AMI_TEST_I_H
 #define TAO_AMI_TEST_I_H
 
 #include "ami_testS.h"
 
+/**
+ * @class AMI_Test_i
+ *
+ * @brief AMI Test implementation
+ *
+ * Implements the AMI_Test interface in test.idl
+ */
 class AMI_Test_i : public POA_A::AMI_Test
 {
-  // = TITLE
-  //   AMI Test implementation
-  //
-  // = DESCRIPTION
-  //   Implements the AMI_Test interface in test.idl
-  //
 public:
+  /// ctor
   AMI_Test_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l,
diff --git a/orbsvcs/tests/HTIOP/AMI/client.cpp b/orbsvcs/tests/HTIOP/AMI/client.cpp
index 872febf29b6..29025fc16a1 100644
--- a/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    A client which uses the AMI callback model.
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  A client which uses the AMI callback model.
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/Get_Opt.h"
@@ -23,7 +19,7 @@
 #include "ami_testC.h"
 #include "ami_testS.h"
 
-ACE_RCSID(AMI, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
@@ -64,34 +60,35 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * @class Client
+ *
+ * @brief Run the client thread
+ *
+ * Use the ACE_Task_Base class to run the client threads.
+ */
 class Client : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
 public:
+  /// ctor
   Client (A::AMI_Test_ptr server, int niterations);
-  // ctor
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
   // private:
+  /// Var for the AMI_Test object.
   A::AMI_Test_var ami_test_var_;
-  // Var for the AMI_Test object.
 
+  /// The number of iterations on each client thread.
   int niterations_;
-  // The number of iterations on each client thread.
 
+  /// Var for AMI_AMI_Test_ReplyHandler object.
   A::AMI_AMI_TestHandler_var the_handler_var_;
-  // Var for AMI_AMI_Test_ReplyHandler object.
 };
 
 class Handler : public POA_A::AMI_AMI_TestHandler
diff --git a/orbsvcs/tests/HTIOP/AMI/exclusive.conf b/orbsvcs/tests/HTIOP/AMI/exclusive.conf
index 37d1ecd17d9..75cf010d3f9 100644
--- a/orbsvcs/tests/HTIOP/AMI/exclusive.conf
+++ b/orbsvcs/tests/HTIOP/AMI/exclusive.conf
@@ -1,9 +1,10 @@
+# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
         "-inside 1"
 
 static Client_Strategy_Factory
-        "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST"
+        "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"
 
 static Resource_Factory "-ORBProtocolFactory HTIOP_Factory"
diff --git a/orbsvcs/tests/HTIOP/AMI/muxed.conf b/orbsvcs/tests/HTIOP/AMI/muxed.conf
index 99322cdc625..18ed71ce0ef 100644
--- a/orbsvcs/tests/HTIOP/AMI/muxed.conf
+++ b/orbsvcs/tests/HTIOP/AMI/muxed.conf
@@ -1,9 +1,10 @@
+# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
         "-inside 1"
 
 static Client_Strategy_Factory
-        "-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST"
+        "-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"
 
 static Resource_Factory "-ORBProtocolFactory HTIOP_Factory"
diff --git a/orbsvcs/tests/HTIOP/AMI/server.cpp b/orbsvcs/tests/HTIOP/AMI/server.cpp
index f4b50e9c0bd..c3f615b3802 100644
--- a/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Implementation of the server.
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the server.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "ami_test_i.h"
 
@@ -23,7 +20,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_socket.h"
 
-ACE_RCSID(AMI, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = 0;
 
@@ -51,7 +48,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index e3fefcf0c4b..8d23e53976b 100644
--- a/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    simple_client.cpp
-//
-// = DESCRIPTION
-//    A very simple client which uses the AMI callback model.
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    simple_client.cpp
+ *
+ *  $Id$
+ *
+ *  A very simple client which uses the AMI callback model.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "../test_config.h"
 
@@ -26,7 +23,7 @@
 #include "ami_testC.h"
 #include "ami_testS.h"
 
-ACE_RCSID(AMI, simple_client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
@@ -65,18 +62,18 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
+  /// Constructor.
   Handler (void) {};
-  // Constructor.
 
+  /// Destructor.
     ~Handler (void) {};
-  // Destructor.
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l)
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
deleted file mode 100644
index 9fef0dfb4de..00000000000
--- a/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
+++ /dev/null
@@ -1,117 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.HTIOP_BiDirectional_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.HTIOP_BiDirectional_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.HTIOP_BiDirectional_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index e73deb4202f..667b818d227 100644
--- a/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -5,7 +5,7 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl b/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl
index 0aa55173539..7b86d30207f 100755
--- a/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl
+++ b/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl
@@ -37,14 +37,14 @@ $client->DeleteFile($iorbase);
 
 $hostname = $server->HostName();
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndPoint htiop://$hostname: " .
                               "-ORBSvcConf $server_conf " .
                               "-i $iterations " .
                               "-o $server_iorfile");
 
-                              
+
 $CL = $client->CreateProcess ("client",
                               "-ORBSvcConf $client_conf " .
                               "-k file://$client_iorfile");
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index 6459299e22c..fe74f720fe2 100644
--- a/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -6,7 +6,7 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
@@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index ae60fd04171..d2bdb7e602e 100644
--- a/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -11,7 +11,7 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(BiDirectional, test_i, "$Id$")
+
 
 void
 Callback_i::shutdown (void)
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
index cc4725dc141..3914ef78a3e 100644
--- a/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+++ b/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
@@ -1,59 +1,58 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_BIDIRECTIONAL_TEST_I_H
 #define TAO_BIDIRECTIONAL_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Callback_i
+ *
+ * @brief A callback object to the "client"
+ *
+ * To test that the server can call the client on the same
+ * connection that was established by the client
+ */
 class Callback_i : public POA_Callback
 {
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
 public:
+  /// ctor
   Callback_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// Safe way to shutdown
   void shutdown (void);
-  // Safe way to shutdown
 
+  /// The callback method
   void callback_method (void);
-  // The callback method
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback);
@@ -65,17 +64,17 @@ public:
   int call_client (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Flag to indicate, whether we are ready for a remote call.
   int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
 
+  /// Callback Object
   Callback_var callback_;
-  // Callback Object
 
+  /// Number of times the callback needs to be called
   int no_iterations_;
-  // Number of times the callback needs to be called
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/orbsvcs/tests/HTIOP/HT_Config.conf b/orbsvcs/tests/HTIOP/HT_Config.conf
index 353b30b2af8..722033221ce 100644
--- a/orbsvcs/tests/HTIOP/HT_Config.conf
+++ b/orbsvcs/tests/HTIOP/HT_Config.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 [htbp]
 # The Proxy_port and proxy_host values control how the HTIOP "inside" peers
 # to connect to "outside" peers. In situations where the process inside a
diff --git a/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index dd1638af6b2..085f99d3e35 100644
--- a/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/HTIOP/Hello/Makefile.am b/orbsvcs/tests/HTIOP/Hello/Makefile.am
deleted file mode 100644
index 59105f25917..00000000000
--- a/orbsvcs/tests/HTIOP/Hello/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.HTIOP_Hello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.HTIOP_Hello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-client_SOURCES = \
-  TestC.cpp \
-  Test_Output.cpp \
-  client.cpp \
-  ../test_config.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.HTIOP_Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Test_Output.cpp \
-  server.cpp \
-  ../test_config.h \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/HTIOP/Hello/client.cpp b/orbsvcs/tests/HTIOP/Hello/client.cpp
index f7a982b8175..55c56357743 100644
--- a/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -4,7 +4,7 @@
 #include <ace/Get_Opt.h>
 
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/Hello/run_test.pl b/orbsvcs/tests/HTIOP/Hello/run_test.pl
index 3d43aaa7419..ec0de31327f 100755
--- a/orbsvcs/tests/HTIOP/Hello/run_test.pl
+++ b/orbsvcs/tests/HTIOP/Hello/run_test.pl
@@ -49,7 +49,7 @@ foreach $i (@ARGV) {
     }
 }
 
-$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service",
+$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                                   "-ORBSvcConf $ns_service_srv_conf -ORBEndpoint \"iiop://;".
                                   "htiop://$host:$name_port\" -o $ns_service_ns_ior");
 
diff --git a/orbsvcs/tests/HTIOP/Hello/server.cpp b/orbsvcs/tests/HTIOP/Hello/server.cpp
index 742f0526599..8b81e46ec7f 100644
--- a/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -6,10 +6,6 @@
 #include "tao/IORTable/IORTable.h"
 #include "orbsvcs/CosNamingC.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/Makefile.am b/orbsvcs/tests/HTIOP/Makefile.am
deleted file mode 100644
index 8493fa2444c..00000000000
--- a/orbsvcs/tests/HTIOP/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMI \
-        BiDirectional \
-        Hello
-
diff --git a/orbsvcs/tests/IOR_MCast/MCast.idl b/orbsvcs/tests/IOR_MCast/MCast.idl
index bd46594a6f4..44e31968528 100644
--- a/orbsvcs/tests/IOR_MCast/MCast.idl
+++ b/orbsvcs/tests/IOR_MCast/MCast.idl
@@ -2,7 +2,7 @@
 
 module MCast
 {
-  
+
   interface Server
   {
     // = TITLE
@@ -11,9 +11,9 @@ module MCast
     //     Prints out the status.
 
     boolean connect_server ();
-    // Return <true> if the server received the 
+    // Return <true> if the server received the
     // request from the client.
-    
+
   };
 
 };
diff --git a/orbsvcs/tests/IOR_MCast/Makefile.am b/orbsvcs/tests/IOR_MCast/Makefile.am
deleted file mode 100644
index 46caee6f32b..00000000000
--- a/orbsvcs/tests/IOR_MCast/Makefile.am
+++ /dev/null
@@ -1,125 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IOR_MCast_Idl.am
-
-BUILT_SOURCES = \
-  MCastC.cpp \
-  MCastC.h \
-  MCastC.inl \
-  MCastS.cpp \
-  MCastS.h \
-  MCastS.inl
-
-CLEANFILES = \
-  MCast-stamp \
-  MCastC.cpp \
-  MCastC.h \
-  MCastC.inl \
-  MCastS.cpp \
-  MCastS.h \
-  MCastS.inl
-
-MCastC.cpp MCastC.h MCastC.inl MCastS.cpp MCastS.h MCastS.inl: MCast-stamp
-
-MCast-stamp: $(srcdir)/MCast.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MCast.idl
-	@touch $@
-
-noinst_HEADERS = \
-  MCast.idl
-
-## Makefile.IOR_MCast_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  MCastC.cpp \
-  MCastS.cpp \
-  MCast_Server_i.cpp \
-  client.cpp \
-  ior_mcast_client_i.cpp \
-  server_i.cpp \
-  MCast_Server_i.h \
-  ior_mcast_client_i.h \
-  server_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IOR_MCast_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  MCastC.cpp \
-  MCastS.cpp \
-  MCast_Server_i.cpp \
-  server.cpp \
-  server_i.cpp \
-  MCast_Server_i.h \
-  server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/IOR_MCast/client.cpp b/orbsvcs/tests/IOR_MCast/client.cpp
index 6764fe26742..f70cc79d142 100644
--- a/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/orbsvcs/tests/IOR_MCast/client.cpp
@@ -8,8 +8,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       ior_mcast_Client_i client;
 
-      int init_result;
-      init_result = client.init (argc, argv);
+      int status = client.init (argc, argv);
+      ACE_UNUSED_ARG (status);
 
       return 0;
     }
diff --git a/orbsvcs/tests/IOR_MCast/server_i.cpp b/orbsvcs/tests/IOR_MCast/server_i.cpp
index 311f9c1aa48..95d01f170db 100644
--- a/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -164,6 +164,6 @@ Server_i::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am
deleted file mode 100644
index 0314c21e1b6..00000000000
--- a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2604_Idl.am
-
-BUILT_SOURCES = \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES = \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Messenger.idl
-
-## Makefile.Bug_2604_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MessengerClient
-
-MessengerClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-MessengerClient_SOURCES = \
-  MessengerC.cpp \
-  MessengerClient.cpp \
-  Messenger_i.h
-
-MessengerClient_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2604_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MessengerServer
-
-MessengerServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-MessengerServer_SOURCES = \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  MessengerServer.cpp \
-  Messenger_i.cpp \
-  Messenger_i.h
-
-MessengerServer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
index 68051ed2221..1d60a35a43d 100644
--- a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
+++ b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl
index 915aedadd47..7db496ad976 100755
--- a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl
@@ -26,8 +26,8 @@ my $DEBUG_LEVEL = 2;
 my $OBJ_REF_STYLE = "-ORBObjRefStyle url";
 
 my $implrepo_server =
-    "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service";
-my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImR_Activator";
+    "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator";
+my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator";
 my $tao_imr = "$ENV{ACE_ROOT}/bin/tao_imr";
 
 my $imriorfile = "imr.ior";
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am b/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am
deleted file mode 100644
index b58761ff065..00000000000
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_689_Regression_Idl.am
-
-BUILT_SOURCES = \
-  bug_689_regressionC.cpp \
-  bug_689_regressionC.h \
-  bug_689_regressionC.inl \
-  bug_689_regressionS.cpp \
-  bug_689_regressionS.h \
-  bug_689_regressionS.inl
-
-CLEANFILES = \
-  bug_689_regression-stamp \
-  bug_689_regressionC.cpp \
-  bug_689_regressionC.h \
-  bug_689_regressionC.inl \
-  bug_689_regressionS.cpp \
-  bug_689_regressionS.h \
-  bug_689_regressionS.inl
-
-bug_689_regressionC.cpp bug_689_regressionC.h bug_689_regressionC.inl bug_689_regressionS.cpp bug_689_regressionS.h bug_689_regressionS.inl: bug_689_regression-stamp
-
-bug_689_regression-stamp: $(srcdir)/bug_689_regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/bug_689_regression.idl
-	@touch $@
-
-noinst_HEADERS = \
-  bug_689_regression.idl
-
-## Makefile.Bug_689_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  bug_689_regressionC.cpp \
-  client.cpp \
-  bug_689_regression_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_689_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  bug_689_regressionC.cpp \
-  bug_689_regressionS.cpp \
-  bug_689_regression_i.cpp \
-  server.cpp \
-  bug_689_regression_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
index 22f0cd1a530..bb278211006 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
@@ -4,5 +4,6 @@
 
 interface bug_689_regression
 {
+  void noop ();
   oneway void shutdown ();
 };
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
index 21c140d56a3..0dd9ad68b58 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
@@ -15,3 +15,7 @@ bug_689_regression_i::shutdown (void)
 {
   this->orb_->shutdown (0);
 }
+
+void bug_689_regression_i::noop (void)
+{
+}
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
index eda0fe6f835..b215bd5224d 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
@@ -12,6 +12,8 @@ public:
 
   virtual void shutdown (void);
 
+  virtual void noop (void);
+
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp b/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
index 504f91cd53d..6475eb4fd19 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Argv_Type_Converter.h"
 
-ACE_RCSID(Bug_689_Regression,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -61,6 +57,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                             1);
         }
 
+      servant->noop ();
       servant->shutdown ();
 
       ACE_Time_Value tv (0, 500);
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl b/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
index be6c0529a55..c0814c6973d 100755
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
@@ -42,26 +42,26 @@ $act->DeleteFile ($actiorfile);
 $srv->DeleteFile ($srviorfile);
 $cli->DeleteFile ($srviorfile);
 
-$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service", 
+$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator",
                             "-o $imr_imriorfile");
-$ACT = $act->CreateProcess ("../../../ImplRepo_Service/ImR_Activator", 
+$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator",
                             "-o $act_actiorfile ".
                             "-ORBInitRef ImplRepoService=file://$act_imriorfile");
 $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 $CLI = $cli->CreateProcess ("client",
-                            "-k file://$cli_srviorfile");
+                            "-k file://$cli_srviorfile -ORBDebugLevel $debug_level");
 $SRV = $srv->CreateProcess ("server");
 
 my $server_cmd = $SRV->Executable();
 my $srv_server_cmd = $imr->LocalFile ($server_cmd);
 
-$TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". 
+$TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
                 "add test_server -c \"$srv_server_cmd ".
                 "-ORBInitRef ImplRepoService=file://$imr_imriorfile ".
-                "-ORBUseIMR 1 ".
+                "-ORBUseIMR 1 -ORBDebugLevel $debug_level ".
                 "-o $srv_srviorfile\"");
-                            
-                            
+
+
 # We want the tao_imr executable to be found exactly in the path
 # given, without being modified by the value of -ExeSubDir.
 # So, we tell its Process object to ignore the setting of -ExeSubDir.
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp b/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
index 43174ea972c..85218e307d6 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
@@ -8,10 +8,6 @@
 
 #include "bug_689_regression_i.h"
 
-ACE_RCSID (Bug_689_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 
 int
@@ -36,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/ImplRepo/Makefile.am b/orbsvcs/tests/ImplRepo/Makefile.am
deleted file mode 100644
index abf5d112994..00000000000
--- a/orbsvcs/tests/ImplRepo/Makefile.am
+++ /dev/null
@@ -1,208 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        Bug_2604_Regression \
-        Bug_689_Regression \
-        NameService \
-        scale
-
-noinst_PROGRAMS =
-
-## Makefile.airplane_idl.am
-
-BUILT_SOURCES = \
-  AirplaneC.cpp \
-  AirplaneC.h \
-  AirplaneC.inl \
-  AirplaneS.cpp \
-  AirplaneS.h \
-  AirplaneS.inl
-
-CLEANFILES = \
-  Airplane-stamp \
-  AirplaneC.cpp \
-  AirplaneC.h \
-  AirplaneC.inl \
-  AirplaneS.cpp \
-  AirplaneS.h \
-  AirplaneS.inl
-
-AirplaneC.cpp AirplaneC.h AirplaneC.inl AirplaneS.cpp AirplaneS.h AirplaneS.inl: Airplane-stamp
-
-Airplane-stamp: $(srcdir)/Airplane.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Airplane.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Airplane.idl
-
-## Makefile.airplane_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += airplane_client
-
-airplane_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-airplane_client_SOURCES = \
-  AirplaneC.cpp \
-  AirplaneS.cpp \
-  airplane_client.cpp \
-  airplane_client_i.cpp \
-  airplane_client_i.h
-
-airplane_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.airplane_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += airplane_server
-
-airplane_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-airplane_server_SOURCES = \
-  AirplaneC.cpp \
-  AirplaneS.cpp \
-  airplane_i.cpp \
-  airplane_server.cpp \
-  airplane_server_i.cpp \
-  airplane_i.h \
-  airplane_server_i.h
-
-airplane_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.nestea_idl.am
-
-BUILT_SOURCES += \
-  NesteaC.cpp \
-  NesteaC.h \
-  NesteaC.inl \
-  NesteaS.cpp \
-  NesteaS.h \
-  NesteaS.inl
-
-CLEANFILES += \
-  Nestea-stamp \
-  NesteaC.cpp \
-  NesteaC.h \
-  NesteaC.inl \
-  NesteaS.cpp \
-  NesteaS.h \
-  NesteaS.inl
-
-NesteaC.cpp NesteaC.h NesteaC.inl NesteaS.cpp NesteaS.h NesteaS.inl: Nestea-stamp
-
-Nestea-stamp: $(srcdir)/Nestea.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Nestea.idl
-	@touch $@
-
-noinst_HEADERS += \
-  Nestea.idl
-
-## Makefile.nestea_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += nestea_client
-
-nestea_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-nestea_client_SOURCES = \
-  NesteaC.cpp \
-  NesteaS.cpp \
-  nestea_client.cpp \
-  nestea_client_i.cpp \
-  nestea_client_i.h
-
-nestea_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.nestea_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += nestea_server
-
-nestea_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-nestea_server_SOURCES = \
-  NesteaC.cpp \
-  NesteaS.cpp \
-  nestea_i.cpp \
-  nestea_server.cpp \
-  nestea_server_i.cpp \
-  nestea_i.h \
-  nestea_server_i.h
-
-nestea_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ImplRepo/NameService/Makefile.am b/orbsvcs/tests/ImplRepo/NameService/Makefile.am
deleted file mode 100644
index 8ced4a626dc..00000000000
--- a/orbsvcs/tests/ImplRepo/NameService/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ImplRepo_NameService.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-test_SOURCES = \
-  test.cpp
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/orbsvcs/tests/ImplRepo/NameService/run_test.pl
index 5cfc27fd95a..aa6e68e3414 100755
--- a/orbsvcs/tests/ImplRepo/NameService/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/NameService/run_test.pl
@@ -38,11 +38,11 @@ my $act_actiorfile = $act->LocalFile ($actiorfile);
 my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
 my $test_nsiorfile = $test->LocalFile ($nsiorfile);
 
-$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service");
+$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator");
 
-$ACT = $act->CreateProcess ("../../../ImplRepo_Service/ImR_Activator");
+$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator");
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service");
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming");
 my $ns_cmd = $NS->Executable();
 my $ns_ns_cmd = $imr->LocalFile ($ns_cmd);
 
diff --git a/orbsvcs/tests/ImplRepo/Nestea.idl b/orbsvcs/tests/ImplRepo/Nestea.idl
index b101254bfe4..4528c671079 100644
--- a/orbsvcs/tests/ImplRepo/Nestea.idl
+++ b/orbsvcs/tests/ImplRepo/Nestea.idl
@@ -7,7 +7,7 @@ interface Nestea_Bookshelf
   // Add a number of cans to the bookshelf.
 
   void crush (in long cans);
-  // Crush some of those cans. 
+  // Crush some of those cans.
 
   long bookshelf_size ();
   // How many cans are in the collection?
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
index 948d9e7102f..b54d49e1e3d 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
@@ -9,9 +9,6 @@
 #include "ORB_Task.h"
 #include "tao/Environment.h"
 
-ACE_RCSID (ReconnectServer,
-           ORB_Task, "$Id$")
-
 ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
index 4efc786b6a0..bc61035a1b9 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
@@ -3,12 +3,11 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include <ace/Task.h>
-#include <ace/OS.h>
-
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR *ior_input_file = ACE_TEXT ("file://serverA.ior");
 int test_duration_sec = 15;
-bool expect_object_not_exist = false; 
+bool expect_object_not_exist = false;
 
 class Client_Task : public ACE_Task_Base
 {
@@ -23,7 +22,7 @@ class Client_Task : public ACE_Task_Base
     virtual int svc (void)
     {
       ACE_Time_Value start = ACE_OS::gettimeofday ();
-      ACE_Time_Value elapsed; 
+      ACE_Time_Value elapsed;
       int i = 0;
       while (elapsed < ACE_Time_Value (test_duration_sec))
       {
@@ -45,7 +44,7 @@ class Client_Task : public ACE_Task_Base
           caught_object_not_exist_ = true;
           ACE_OS::sleep (1);
         }
-        catch (const CORBA::Exception & /*ex*/) 
+        catch (const CORBA::Exception & /*ex*/)
         {
           //ex._tao_print_exception ("Exception caught:");
           communication_failed_ = true;
@@ -54,7 +53,7 @@ class Client_Task : public ACE_Task_Base
         ++i;
         elapsed = ACE_OS::gettimeofday () - start;
       }
-          
+
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Client thread exit \n")));
       return 0;
     }
@@ -102,14 +101,14 @@ parse_args (int argc, ACE_TCHAR* argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-  try 
+  try
   {
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
@@ -137,7 +136,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     Client_Task task (test.in ());
     task.activate (THR_NEW_LWP | THR_JOINABLE, 1, 1);
-    
+
     ACE_Time_Value tv(test_duration_sec);
     orb->run (&tv);
 
@@ -156,7 +155,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t)Client test failed.\n")), 1);
     }
   }
-  catch (const CORBA::Exception &ex) 
+  catch (const CORBA::Exception &ex)
   {
     ex._tao_print_exception ("Exception caught by client:");
     return 1;
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl b/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
index dc0bf0c1061..9d89fcd08cf 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
@@ -67,7 +67,7 @@ $srvb->DeleteFile ($srvbiorfile);
 $cli->DeleteFile ($srvaiorfile);
 
 
-$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service",
+$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator",
                             "-ORBEndpoint "."$protocol"."://:".$port." ".
                             "-UnregisterIfAddressReused ".
                             "-d $imr_debug_level ".
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
index 5ec4ae92f9b..e42e5b9f394 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  
+
   return 0;
 }
 
@@ -51,7 +51,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       rootPOA->the_POAManager ();
 
     CORBA::PolicyList policies (5);
-    policies.length (5); 
+    policies.length (5);
 
     // Lifespan policy
     policies[0] =
@@ -116,7 +116,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     rootPOA->destroy (1, 1);
     orb->destroy ();
   }
-  catch (const CORBA::Exception &ex) 
+  catch (const CORBA::Exception &ex)
   {
     ex._tao_print_exception ("Exception caught by serverA:");
     return 1;
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
index 2049cc94590..06f6c1fe2a2 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
@@ -4,7 +4,7 @@
 #include "tao/ImR_Client/ImR_Client.h"
 #include <ace/Task.h>
 #include <ace/Get_Opt.h>
-#include <ace/OS.h>
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR * ior_output_file = ACE_TEXT ("serverB.ior");
 // server_notify_delay between resolving RootPOA init ref and create_POA.
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  
+
   return 0;
 }
 
@@ -64,7 +64,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       rootPOA->the_POAManager ();
 
     CORBA::PolicyList policies (5);
-    policies.length (5); 
+    policies.length (5);
 
     // Lifespan policy
     policies[0] =
@@ -131,7 +131,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     rootPOA->destroy (1, 1);
     orb->destroy ();
   }
-  catch (const CORBA::Exception &ex) 
+  catch (const CORBA::Exception &ex)
   {
     ex._tao_print_exception ("Exception caught by serverB:");
     return 1;
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
index ccb9c6c524c..4c0e0ef2ceb 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
@@ -13,12 +13,12 @@ class  Test_Dummy_i
   : public virtual POA_Test::Dummy
 {
 public:
-  // Constructor 
+  // Constructor
   Test_Dummy_i (void);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_Dummy_i (void);
-  
+
   virtual  char * getMessage (void);
 };
 
@@ -26,17 +26,17 @@ class  Test_Time_i
   : public virtual POA_Test::Time
 {
 public:
-  // Constructor 
+  // Constructor
   Test_Time_i (void);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_Time_i (void);
-  
+
   virtual
   ::CORBA::Long current_time (
       void
     );
-  
+
   virtual
   void shutdown (
       void
diff --git a/orbsvcs/tests/ImplRepo/airplane_client.cpp b/orbsvcs/tests/ImplRepo/airplane_client.cpp
index 7bfd7b75f2f..dec10fef0a1 100644
--- a/orbsvcs/tests/ImplRepo/airplane_client.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_client.cpp
@@ -4,10 +4,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ImplRepo,
-           airplane_client,
-           "$Id$")
-
 // This function runs the test.
 
 int
diff --git a/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 5b0f945c09d..df7a00e9391 100644
--- a/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -6,7 +6,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/ACE.h"
 
-ACE_RCSID(ImplRepo, airplane_client_i, "$Id$")
+
 
 // Constructor.
 Airplane_Client_i::Airplane_Client_i (void)
diff --git a/orbsvcs/tests/ImplRepo/airplane_i.cpp b/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 34a220acb2b..a10f3868cab 100644
--- a/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -5,13 +5,8 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID (ImplRepo,
-           airplane_i,
-           "$Id$")
-
 // Constructor
-
-  Airplane_i::Airplane_i ()
+Airplane_i::Airplane_i ()
 {
   // Seed the random number generator
   ACE_OS::srand (static_cast<u_int> (ACE_OS::time (0L)));
diff --git a/orbsvcs/tests/ImplRepo/airplane_server.cpp b/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 55b71a4297e..a7323cc4414 100644
--- a/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -2,10 +2,6 @@
 
 #include "airplane_server_i.h"
 
-ACE_RCSID (ImplRepo,
-           airplane_server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 9ed10ba34ef..58dd5d3959e 100644
--- a/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -12,10 +12,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (ImplRepo,
-           airplane_server_i,
-           "$Id$")
-
 // The server name of the Aiprlane Server
 const char SERVER_NAME[] = "airplane_server";
 
diff --git a/orbsvcs/tests/ImplRepo/locked/run_test.pl b/orbsvcs/tests/ImplRepo/locked/run_test.pl
index 2965e83a10e..ce09e2aa427 100755
--- a/orbsvcs/tests/ImplRepo/locked/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/locked/run_test.pl
@@ -35,7 +35,7 @@ $ti->DeleteFile ($imriorfile);
 $imr->DeleteFile ($imrpfile);
 
 
-$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service");
+$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator");
 $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 
 # We want the tao_imr executable to be found exactly in the path
diff --git a/orbsvcs/tests/ImplRepo/nestea_client.cpp b/orbsvcs/tests/ImplRepo/nestea_client.cpp
index 2951b0b1106..dc1cbfb2509 100644
--- a/orbsvcs/tests/ImplRepo/nestea_client.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_client.cpp
@@ -4,10 +4,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ImplRepo,
-           nestea_client,
-           "$Id$")
-
 // This function runs the test.
 
 int
diff --git a/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index bce2b51d639..0372682f06b 100644
--- a/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -6,7 +6,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/ACE.h"
 
-ACE_RCSID(ImplRepo, nestea_client_i, "$Id$")
+
 
 // Constructor.
 Nestea_Client_i::Nestea_Client_i (void)
diff --git a/orbsvcs/tests/ImplRepo/nestea_i.cpp b/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 13363307324..c508ff5f744 100644
--- a/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -11,7 +11,7 @@
 
 const size_t MAX_UINT32_STR_LEN = 11;  // Largest UINT32 is 8589934591 + NUL is 11 characters
 
-ACE_RCSID(ImplRepo, nestea_i, "$Id$")
+
 
 Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename)
 : cans_ (0)
diff --git a/orbsvcs/tests/ImplRepo/nestea_server.cpp b/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 1177d965430..c382406ccd3 100644
--- a/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -2,7 +2,7 @@
 
 #include "nestea_server_i.h"
 
-ACE_RCSID(ImplRepo, nestea_server, "$Id$")
+
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 7c07ae8c949..b64dffa1938 100644
--- a/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -11,7 +11,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(ImplRepo, nestea_server_i, "$Id$")
+
 
 // The file to save the persistent state to.
 const ACE_TCHAR NESTEA_DATA_FILENAME[] = ACE_TEXT("nestea.dat");
diff --git a/orbsvcs/tests/ImplRepo/run_test.pl b/orbsvcs/tests/ImplRepo/run_test.pl
index 40404e87ddd..318943a5fc9 100755
--- a/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/run_test.pl
@@ -49,8 +49,8 @@ my $imr_host = $imr->HostName ();
 my $port = 12345;
 my $endpoint = "-ORBEndpoint " . "$protocol" . "://:" . $port;
 
-$IMR = $imr->CreateProcess ("../../ImplRepo_Service/ImplRepo_Service");
-$ACT = $act->CreateProcess ("../../ImplRepo_Service/ImR_Activator");
+$IMR = $imr->CreateProcess ("../../ImplRepo_Service/tao_imr_locator");
+$ACT = $act->CreateProcess ("../../ImplRepo_Service/tao_imr_activator");
 $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 
 # We want the tao_imr executable to be found exactly in the path
@@ -284,8 +284,8 @@ sub nt_service_test
 
     # To avoid having to ensure that they LocalSystem account has the correct path
     # we simply copy the imr executables to the same directory as the DLL's.
-    my $BIN_IMR = $bin_imr->CreateProcess ("$ENV{ACE_ROOT}/lib/ImplRepo_Service","");
-    my $BIN_ACT = $bin_act->CreateProcess ("$ENV{ACE_ROOT}/lib/ImR_Activator","");
+    my $BIN_IMR = $bin_imr->CreateProcess ("$ENV{ACE_ROOT}/lib/tao_imr_locator","");
+    my $BIN_ACT = $bin_act->CreateProcess ("$ENV{ACE_ROOT}/lib/tao_imr_activator","");
     $BIN_IMR->IgnoreExeSubDir(1);
     $BIN_ACT->IgnoreExeSubDir(1);
 
@@ -331,7 +331,7 @@ sub nt_service_test
         print STDERR "ERROR: BIN ImR Service returned $BIN_IMR_status\n";
     }
 
-    print "Removing ImplRepo_Service copy.\n";
+    print "Removing tao_imr_locator copy.\n";
     $bin_imr->DeleteFile ($BIN_IMR->Executable ());
     $bin_act->DeleteFile ($BIN_ACT->Executable ());
 
diff --git a/orbsvcs/tests/ImplRepo/scale/Makefile.am b/orbsvcs/tests/ImplRepo/scale/Makefile.am
deleted file mode 100644
index 93f63101b2e..00000000000
--- a/orbsvcs/tests/ImplRepo/scale/Makefile.am
+++ /dev/null
@@ -1,111 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.scaletest_idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.scaletest_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  server_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.scaletest_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  server_i.cpp \
-  testC.cpp \
-  testS.cpp \
-  server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ImplRepo/scale/client.conf b/orbsvcs/tests/ImplRepo/scale/client.conf
index 87e77efbd29..2a50e68f218 100644
--- a/orbsvcs/tests/ImplRepo/scale/client.conf
+++ b/orbsvcs/tests/ImplRepo/scale/client.conf
@@ -1,4 +1,6 @@
+# $Id$
+
 # This file is here just in case you want to run some of the tests manually
-# and don't want the client to jump back in the reactor during the 
-# invocation. 
+# and don't want the client to jump back in the reactor during the
+# invocation.
 static Client_Strategy_Factory "-ORBClientConnectionHandler rw"
diff --git a/orbsvcs/tests/ImplRepo/scale/run_test.pl b/orbsvcs/tests/ImplRepo/scale/run_test.pl
index 1e373359210..c71955fc0a6 100755
--- a/orbsvcs/tests/ImplRepo/scale/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/scale/run_test.pl
@@ -46,8 +46,8 @@ my $act_actiorfile = $act->LocalFile ($actiorfile);
 my $imr_persistxml = $imr->LocalFile ($persistxml);
 my $imr_persistdat = $imr->LocalFile ($persistdat);
 
-$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service");
-$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImR_Activator");
+$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator");
+$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator");
 $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 $SRV = $srv->CreateProcess ("server");
 $CLI = $cli->CreateProcess ("client");
@@ -67,7 +67,7 @@ $imr->DeleteFile ($persistdat);
 sub scale_test
 {
     print "Running scale test with $servers_count servers and $obj_count objects.\n";
-    
+
     my $result = 0;
     my $start_time = time();
 
@@ -104,7 +104,7 @@ sub scale_test
     }
 
     if ($use_activator) {
-    
+
         $ACT->Arguments ("-d 1 -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile");
         $ACT_status = $ACT->Spawn ();
         if ($ACT_status != 0) {
@@ -135,7 +135,7 @@ sub scale_test
                 }
             }
         }
-        
+
         $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile list");
         $result = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
         if ($TI_status != 0) {
@@ -145,9 +145,9 @@ sub scale_test
             return 1;
         }
     }
-    
+
     for(my $i = 0; $i < $servers_count; $i++ ) {
-    
+
         my $startfile = $objprefix . "_$i.status";
         my $srv_startfile = $srv->LocalFile ($startfile);
         $srv->DeleteFile ($objprefix . "_$i.status");
@@ -203,7 +203,7 @@ sub scale_test
                 last;
             }
         }
-        
+
         if ($status == 1) {
             last;
         }
@@ -216,7 +216,7 @@ sub scale_test
             $status = 1;
         }
     }
-    
+
     my $IMR_status = $IMR->TerminateWaitKill ($imr->ProcessStopWaitInterval());
     if ($IMR_status != 0) {
         print STDERR "ERROR: IMR returned $IMR_status\n";
@@ -225,7 +225,7 @@ sub scale_test
 
     my $test_time = time() - $start_time;
     my $total_objs = $obj_count * $servers_count;
-    
+
     print "\nFinished. The test took $test_time seconds for $total_objs imr-ified objects.\n";
 
     return $status;
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
deleted file mode 100644
index 4aaef665047..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IFR_Application_Test_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  ifr_dii_client.cpp \
-  ifr_dii_client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.IFR_Application_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index e50a8aa33f6..c579d5e1fc3 100644
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -3,10 +3,6 @@
 
 #include "ifr_dii_client.h"
 
-ACE_RCSID (Application_Test,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index 06b8431f84c..04f3971aef5 100644
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -4,10 +4,6 @@
 #include "ifr_dii_client.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Application_Test,
-           ifr_dii_client,
-           "$Id$")
-
 IFR_DII_Client::IFR_DII_Client (void)
   : namespace_name (CORBA::string_dup ("warehouse")),
     interface_name (CORBA::string_dup ("inventory")),
@@ -88,7 +84,7 @@ IFR_DII_Client::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt opts (argc, argv, ACE_TEXT("k:nd"));
   int c;
-  
+
   while ((c = opts ()) != -1)
     switch (c)
       {
@@ -325,7 +321,7 @@ IFR_DII_Client::invoke_and_display (void)
 
       ACE_ASSERT ((*args->item (2)->value () >>= price) == true);
 
-      ACE_ASSERT (price == 13.49f);
+      ACE_ASSERT (ACE::is_equal (price, 13.49f));
 
       if (this->debug_)
         {
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
index 883b60c38cc..59de7ee6a6c 100755
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
@@ -57,7 +57,7 @@ my $client_ior2file = $client->LocalFile ($ior2file);
 $client->DeleteFile($ior1file);
 $client->DeleteFile($ior2file);
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-o $server1_ior1file");
 
 
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 9407a53a1da..8470b696545 100644
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -6,7 +6,7 @@
 #include "orbsvcs/Shutdown_Utilities.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Application_Test, server, "$Id$")
+
 
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("iorfile");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index 08a803ea8d8..f8ba51d221b 100644
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -5,12 +5,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (Application_Test,
-           test_i,
-           "$Id$")
-
-
 CORBA::Boolean
 inventory_i::getCDinfo (const char * artist,
                         char *& title,
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am
deleted file mode 100644
index c997324070e..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2962_Regression.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
index 89b8e9873c6..7183a29b2a1 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
@@ -36,7 +36,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
index d4637db8784..2704eabe9bf 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
@@ -2,9 +2,10 @@
 #ifndef __IFR_NESTING_ARRAY_TEST_DEFINED
 #define __IFR_NESTING_ARRAY_TEST_DEFINED
 
+typedef short ShortArray_1[1];
 struct MyStruct
 {
-  short innerArray[1];             // Must NOT be [2] to show up the problem.
+  ShortArray_1 innerArray;             // Must NOT be [2] to show up the problem.
 };
 
 typedef MyStruct arrayOfStruct[2]; // Must be arrayOfStruct[2] to pass client.cpp test
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am
deleted file mode 100644
index 73594351b9d..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3155_Regression_Test_Idl.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = test_idl
-
-test_idl_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/include
-
-test_idl_SOURCES = \
-  test_idl.cpp
-
-test_idl_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
index 964366267d1..904b0962e00 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
@@ -36,7 +36,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
index 19207b58862..8230f0955fb 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
@@ -8,15 +8,15 @@ module C1
 };
 
 module M1
-{ 
+{
   valuetype VT; // Forward declare
 };
 
 module M1
-{ 
+{
   valuetype VT :  // Full definition
    ::C1::EB
-  {   
+  {
     public long id;
   };
 };
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
index 851a4413e21..ed87bdd9215 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
@@ -49,7 +49,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         }
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am
deleted file mode 100644
index 7939f5049c2..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3174_Regression_Test_Idl.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = test_idl
-
-test_idl_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_idl_SOURCES = \
-  test_idl.cpp
-
-test_idl_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
index c5e6b022b7c..da59c80ef20 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
@@ -36,7 +36,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
index f53a114a07d..d6af0b90df0 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
@@ -45,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         }
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
index ba4780cedca..3775c2138e2 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
@@ -38,7 +38,7 @@ $client1->DeleteFile($ior1file);
 my $client2_ior1file = $client2->LocalFile ($ior1file);
 $client2->DeleteFile($ior1file);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "$nice " .
                               "-o $server_ior1file " .
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile.am
deleted file mode 100644
index 3ab4a032327..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3495_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3495_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch "$@"
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_3495_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestImpl.cpp \
-  TestS.cpp \
-  server.cpp \
-  TestImpl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
index c0bf60dfe90..6e5d83ab0fc 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
@@ -27,7 +27,7 @@ module Test {
     } thisonly;
   };
 
-  exception exceptionOne 
+  exception exceptionOne
   {
     union ExceptionUnion switch (ErrorType)
     {
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
index 4fd7f422bbd..4c7e5147a03 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // .\be\be_codegen.cpp:1179
 
 #include "TestImpl.h"
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
index 4a4bc5670dd..e3e10eea60e 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
@@ -17,12 +17,12 @@ class  Test_interfaceOne_i
   : public virtual POA_Test::interfaceOne
 {
 public:
-  // Constructor 
+  // Constructor
   Test_interfaceOne_i (void);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_interfaceOne_i (void);
-  
+
   virtual void getstruct (::Test::structOne_out tester);
 };
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
index 0585d1bc80c..a6763a1a819 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
 
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl
index 5573c301189..8b9cf6f3503 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl
@@ -48,7 +48,7 @@ $client->DeleteFile($ior1file);
 $client->DeleteFile($ior2file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
index fb4470ea53f..42753283c2b 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl
index d221f710a57..9416cb1dbb6 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl
@@ -33,7 +33,7 @@ $server->DeleteFile($iorfile);
 my $client_iorfile = $client->LocalFile ($iorfile);
 $client->DeleteFile($iorfile);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "$nice " .
                               "-o $server_iorfile " .
diff --git a/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl
index ade44a59b4a..af326620b2d 100755
--- a/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl
@@ -23,7 +23,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               " -o $server_iorfile " .
                               " $locking");
@@ -113,7 +113,7 @@ $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               " -o $server_iorfile " .
                               " $locking");
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
deleted file mode 100644
index 471b2f19e9a..00000000000
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IFR_IDL3_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = IDL3_Test
-
-IDL3_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-IDL3_Test_SOURCES = \
-  client.cpp \
-  idl3_client.cpp \
-  idl3_client.h
-
-IDL3_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index f43536c1139..a4e9f470c67 100644
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -3,10 +3,6 @@
 
 #include "idl3_client.h"
 
-ACE_RCSID (Application_Test,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 28de390cbe2..5bb899c36d5 100644
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -6,10 +6,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Application_Test,
-           ifr_dii_client,
-           "$Id$")
-
 // All the magic quantities are here at the top.
 
 const char *COMPONENT_ID = "IDL:mod/test_component:1.0";
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
index 16f3ebafd93..d11a20d1309 100644
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
+++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
@@ -1,53 +1,52 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/InterfaceRepo
-//
-// = FILENAME
-//    idl3_client.h
-//
-// = DESCRIPTION
-//    This class tests the IFR support for CCM-related types.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    idl3_client.h
+ *
+ *  $Id$
+ *
+ *  This class tests the IFR support for CCM-related types.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDL3_CLIENT_H
 #define IDL3_CLIENT_H
 
 #include "tao/IFR_Client/IFR_ComponentsC.h"
 
+/**
+ * @class IDL3_Client
+ *
+ * @brief Component-aware IFR Client Implementation
+ *
+ * Class wrapper for a client which tests the Interface Repository
+ * support for the OMG IDL3 extensions.
+ */
 class IDL3_Client
 {
-  // = TITLE
-  //     Component-aware IFR Client Implementation
-  //
-  // = DESCRIPTION
-  //     Class wrapper for a client which tests the Interface Repository
-  //     support for the OMG IDL3 extensions.
 public:
+  /// Constructor
   IDL3_Client (void);
-  // Constructor
 
+  /// Destructor
   ~IDL3_Client (void);
-  // Destructor
 
+  /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the ORB and get the IFR object reference.
 
+  /// Execute test code.
   int run (void);
-  // Execute test code.
 
 private:
+  /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
-  // Process the command line arguments.
 
   int component_test (void);
   int home_test (void);
@@ -104,14 +103,14 @@ private:
   int home_finder_test (CORBA::ComponentIR::HomeDescription *);
 
 private:
+  /// Flag to output detailed error messages.
   bool debug_;
-  // Flag to output detailed error messages.
 
+  /// Storage of the ORB reference.
   CORBA::ORB_var orb_;
-  // Storage of the ORB reference.
 
+  /// Storage of the IFR reference.
   CORBA::Repository_var repo_;
-  // Storage of the IFR reference.
 };
 
 #endif /* IDL3_CLIENT_H */
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
index 4f5376f4174..5a00c31e3dc 100755
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
@@ -42,7 +42,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl
index d03196aeee2..0e65910adfb 100755
--- a/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl
@@ -34,7 +34,7 @@ sub idl_filenames {
 # Input: array of idl file names
 # Output: array of idl file names that had a failure
 sub phase1 {
-    my $SVC = $ifr_service->CreateProcess ("../../../IFR_Service/IFR_Service",
+    my $SVC = $ifr_service->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                                            "-o $ifr_service_iorfile");
 
     my $CMP = $tao_ifr->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_ifr",
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
deleted file mode 100644
index 10fb0b1efaa..00000000000
--- a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IFR_Inheritance_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = IFR_Inheritance_Test
-
-IFR_Inheritance_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-IFR_Inheritance_Test_SOURCES = \
-  main.cpp
-
-IFR_Inheritance_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
index 9709b6e5e76..261138e3244 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
@@ -6,10 +6,6 @@
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/ORB.h"
 
-ACE_RCSID (IFR_Inheritance_Test,
-           main,
-           "$Id$")
-
 void printContents (const CORBA::ContainedSeq& cont)
 {
   try
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
index 42b85861cf6..db72c527087 100755
--- a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
@@ -56,22 +56,22 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed
 my $iorbase = "if_repo.ior";
 my $testoutputfilename = "IFR_Inheritance_test.output";
 
-my $log1 = "server1.log"; 
+my $log1 = "server1.log";
 my $log2 = "server2.log";
 my $log3 = "client.log";
 
 my $log1_test = $test->LocalFile ($log1);
-my $log2_test = $test->LocalFile ($log2); 
+my $log2_test = $test->LocalFile ($log2);
 my $log3_test = $test->LocalFile ($log3);
 
 $test->DeleteFile ($log1);
-$test->DeleteFile ($log2); 
+$test->DeleteFile ($log2);
 $test->DeleteFile ($log3);
 
 my $test_iorfile = $test->LocalFile ($iorbase);
 $test->DeleteFile($iorbase);
 
-$SV1 = $test->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $test->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " -o $test_iorfile " .
                               "-ORBLogFile $log1_test");
 
@@ -79,10 +79,10 @@ $SV2 = $test->CreateProcess ("$tao_ifr",
                               " IFR_Inheritance_Test.idl " .
                               "-ORBInitRef InterfaceRepository=file://$test_iorfile " .
                               "-ORBLogFile $log2_test");
-                              
+
 $CL = $test->CreateProcess ("IFR_Inheritance_Test",
                               "-ORBInitRef InterfaceRepository=file://$test_iorfile " .
-                              "-ORBLogFile $log3_test"); 
+                              "-ORBLogFile $log3_test");
 
 $server_status = $SV1->Spawn ();
 
@@ -162,7 +162,7 @@ if ($server_status != 0) {
 }
 
 $test->DeleteFile ($log1);
-$test->DeleteFile ($log2); 
+$test->DeleteFile ($log2);
 $test->DeleteFile ($log3);
 $test->DeleteFile($iorbase);
 
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am
deleted file mode 100644
index 6bbf5b89144..00000000000
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IFR_Self_Recursive_IDL_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch "$@"
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.IFR_Self_Recursive_IDL_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  GoodDay.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  GoodDay.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IFR_Self_Recursive_IDL_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  GoodDay.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
index 7eec6e81c13..2ede1277b90 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
@@ -20,13 +20,13 @@ module Test
      * This method is used to simplify the test shutdown process
      */
     oneway void shutdown ();
-    
+
     struct RoughWeek
     {
       BadDay isitok;
       SeqBadDay bad;
     };
-    
+
     RoughWeek this_week ();
   };
 };
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
index 69c98cebb82..b2c994851b7 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl
index cbcc3d17844..730bbad28a0 100755
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl
@@ -49,7 +49,7 @@ my $client_ior2file = $client->LocalFile ($ior2file);
 $client->DeleteFile($ior1file);
 $client->DeleteFile($ior2file);
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-o $server1_ior1file");
 
 
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
index 0e2399a8d78..5df03c2b300 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index afb0049f33a..079010fab3b 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -9,10 +9,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 
-ACE_RCSID (IFR_Test,
-           Admin_Client,
-           "$Id$")
-
 Admin_Client::Admin_Client (void)
   : debug_ (0),
     all_tests_ (1),
@@ -2034,7 +2030,7 @@ Admin_Client::constant_test (void)
                   out_double_val));
     }
 
-  ACE_ASSERT (out_double_val == double_val);
+  ACE_ASSERT (ACE::is_equal (out_double_val, double_val));
 
   ivar = this->repo_->get_primitive (CORBA::pk_short);
   cvar->type_def (ivar.in ());
@@ -2090,7 +2086,7 @@ Admin_Client::constant_test (void)
                   out_float_val));
     }
 
-  ACE_ASSERT (out_float_val == float_val);
+  ACE_ASSERT (ACE::is_equal (out_float_val, float_val));
 
   ivar = this->repo_->get_primitive (CORBA::pk_ulonglong);
   cvar->type_def (ivar.in ());
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
index a550a1a9809..882e2ca3242 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/InterfaceRepo
-//
-// = FILENAME
-//    Admin_Client.h
-//
-// = DESCRIPTION
-//    This class tests the functionality of the IFR methods by inserting
-//    IR objects into the repository by hand, querying them, moving them,
-//    and destroying them.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Admin_Client.h
+ *
+ *  $Id$
+ *
+ *  This class tests the functionality of the IFR methods by inserting
+ *  IR objects into the repository by hand, querying them, moving them,
+ *  and destroying them.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #if !defined (ADMIN_CLIENT_H)
 #define ADMIN_CLIENT_H
@@ -27,29 +24,32 @@
 
 const CORBA::ULong NUMBER_OF_TESTS = 11;
 
+/**
+ * @class Admin_Client
+ *
+ * @brief Administrating IFR Client Implementation
+ *
+ * Class wrapper for a client which puts the Interface Repository
+ * methods through their paces.
+ */
 class Admin_Client
 {
-  // = TITLE
-  //     Administrating IFR Client Implementation
-  //
-  // = DESCRIPTION
-  //     Class wrapper for a client which puts the Interface Repository
-  //     methods through their paces.
 public:
+  /// Constructor
   Admin_Client (void);
-  // Constructor
 
+  /// Destructor
   ~Admin_Client (void);
-  // Destructor
 
+  /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the ORB and get the IFR object reference.
 
+  /// Execute test code.
   int run (void);
-  // Execute test code.
 
 private:
+  /// The various IFR tests.
   void array_test (void);
   void enum_test (void);
   void alias_test (void);
@@ -61,35 +61,34 @@ private:
   void interface_test (void);
   void move_test (void);
   void module_test (void);
-  // The various IFR tests.
 
+  /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
-  // Process the command line arguments.
 
+  /// Array of pointers to the test functions.
   void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(void);
-  // Array of pointers to the test functions.
 
+  /// Array of test names used in selection of one test.
   static const char *test_names_[];
-  // Array of test names used in selection of one test.
 
+  /// Flag to output results of IFR queries.
   CORBA::Boolean debug_;
-  // Flag to output results of IFR queries.
 
+  /// Are we running all the tests or just one?
   CORBA::Boolean all_tests_;
-  // Are we running all the tests or just one?
 
+  /// Array index of the selected test function.
   CORBA::ULong which_test_;
-  // Array index of the selected test function.
 
+  /// # of times to run each test.
   CORBA::ULong iterations_;
-  // # of times to run each test.
 
+  /// Storage of the ORB reference.
   CORBA::ORB_var orb_;
-  // Storage of the ORB reference.
 
+  /// Storage of the IFR reference.
   CORBA::Repository_var repo_;
-  // Storage of the IFR reference.
 };
 
 #endif /* ADMIN_CLIENT_H */
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
deleted file mode 100644
index d97df280f9a..00000000000
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IFR_IFR_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = IFR_Test
-
-IFR_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-IFR_Test_SOURCES = \
-  Admin_Client.cpp \
-  client.cpp \
-  Admin_Client.h
-
-IFR_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
index 3c1af54c6b7..eec00db242d 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
@@ -3,10 +3,6 @@
 
 #include "Admin_Client.h"
 
-ACE_RCSID (IFR_Test,
-           client,
-           "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Admin_Client admin_client;
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
index 71038761a52..671dea8d432 100755
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
@@ -43,7 +43,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               " -o $server_iorfile " .
                               " $locking");
diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index bf95c26b6c8..8369b482eb0 100644
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -8,10 +8,6 @@
 #include "ace/Throughput_Stats.h"
 #include "ace/Sample_History.h"
 
-ACE_RCSID (Latency_Test,
-           Latency_Query_Client,
-           "$Id$")
-
 const CORBA::ULong DEFAULT_NUMCALLS = 20000;
 
 Latency_Query_Client::Latency_Query_Client (void)
diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
index 4e0c3bf6c4f..97c5eaa6b4e 100644
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
+++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/InterfaceRepo
-//
-// = FILENAME
-//    Latency_Query_Client.h
-//
-// = DESCRIPTION
-//    This class tests the latency of queries made on the IFR.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Latency_Query_Client.h
+ *
+ *  $Id$
+ *
+ *  This class tests the latency of queries made on the IFR.
+ *
+ *
+ *  @author Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #if !defined (LATENCY_QUERY_CLIENT_H)
 #define LATENCY_QUERY_CLIENT_H
@@ -23,55 +20,57 @@
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/ORB.h"
 
+/**
+ * @class Latency_Query_Client
+ *
+ * @brief Querying IFR Client Implementation
+ *
+ * Class wrapper for a client which queries the Interface Repository.
+ */
 class Latency_Query_Client
 {
-  // = TITLE
-  //     Querying IFR Client Implementation
-  //
-  // = DESCRIPTION
-  //     Class wrapper for a client which queries the Interface Repository.
 public:
+  /// Constructor
   Latency_Query_Client (void);
-  // Constructor
 
+  /// Destructor
   ~Latency_Query_Client (void);
-  // Destructor
 
+  /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the ORB and get the IFR object reference.
 
+  /// Execute test code.
   int run (void);
-  // Execute test code.
 private:
+  /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
-  // Process the command line arguments.
 
+  /// Put in something to query about.
   int populate_ifr (void);
-  // Put in something to query about.
 
 private:
+  /// Toggle debugging output.
   bool debug_;
-  // Toggle debugging output.
 
+  /// Toggle saving of dump history.
   bool do_dump_history_;
-  // Toggle saving of dump history.
 
+  /// Number of queries in a run.
   CORBA::ULong iterations_;
-  // Number of queries in a run.
 
+  /// Storage of the ORB reference.
   CORBA::ORB_var orb_;
-  // Storage of the ORB reference.
 
+  /// Storage of the IFR reference.
   CORBA::Repository_var repo_;
-  // Storage of the IFR reference.
 
 //  CORBA::AliasDef_var tdef_;
   // Storage of the typedef definition that we will query.
 
+  /// Storage of the attribute definition we will query.
   CORBA::AttributeDef_var attr_;
-  // Storage of the attribute definition we will query.
 };
 
 #endif /* LATENCY_QUERY_CLIENT_H */
diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
deleted file mode 100644
index 5cd0c3a6029..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Latency_Test.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Latency_Query_Client.cpp \
-  client.cpp \
-  Latency_Query_Client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
index 3561ace0f15..4e919008a6b 100644
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
@@ -3,17 +3,12 @@
 
 #include "Latency_Query_Client.h"
 
-ACE_RCSID (Latency__Test,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Latency_Query_Client client;
 
-  int retval = client.init (argc,
-                            argv);
+  int retval = client.init (argc, argv);
 
   if (retval == -1)
     {
diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl
index f262590cf39..8c5b05b1f78 100755
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl
@@ -42,7 +42,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               " -o $server_iorfile");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Makefile.am b/orbsvcs/tests/InterfaceRepo/Makefile.am
deleted file mode 100644
index 771e756d881..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Application_Test \
-        Bug_2962_Regression \
-        Bug_3155_Regression \
-        Bug_3174_Regression \
-        Bug_3495_Regression \
-        IDL3_Test \
-        IFR_Inheritance_Test \
-        IFR_Self_Recursive_IDL_Test \
-        IFR_Test \
-        Latency_Test \
-        Persistence_Test
-
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
deleted file mode 100644
index 434c936a151..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IFR_Persistence_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Persistence_Test
-
-Persistence_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Persistence_Test_SOURCES = \
-  Ptest.cpp \
-  test.cpp \
-  Ptest.h
-
-Persistence_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index fc7606b14ea..b1a5fab848f 100644
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -5,7 +5,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Persistence_Test, Ptest, "$Id$")
+
 
 Ptest::Ptest (void)
   : debug_ (0),
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
index 7c2477dbb1b..a8936af2dd0 100644
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/InterfaceRepo
-//
-// = FILENAME
-//    Ptest.h
-//
-// = DESCRIPTION
-//    This code tests the persistence of the IFR by inserting
-//    IR objects into the repository with one function, and querying the
-//    repository with another, with a repository shutdown in between.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Ptest.h
+ *
+ *  $Id$
+ *
+ *  This code tests the persistence of the IFR by inserting
+ *  IR objects into the repository with one function, and querying the
+ *  repository with another, with a repository shutdown in between.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #if !defined (PTEST_H)
 #define PTEST_H
@@ -25,50 +22,52 @@
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/ORB.h"
 
+/**
+ * @class Ptest
+ *
+ * @brief IFR Persistence test Implementation
+ *
+ * Class wrapper for code which either populates or queries the
+ * Interface Repository. Designed to be used with a Perl script
+ * which can start and stop both this process and the repository
+ * process in the necessary order.
+ */
 class Ptest
 {
-  // = TITLE
-  //     IFR Persistence test Implementation
-  //
-  // = DESCRIPTION
-  //     Class wrapper for code which either populates or queries the
-  //     Interface Repository. Designed to be used with a Perl script
-  //     which can start and stop both this process and the repository
-  //     process in the necessary order.
 public:
+  /// Constructor
   Ptest (void);
-  // Constructor
 
+  /// Destructor
   ~Ptest (void);
-  // Destructor
 
+  /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the ORB and get the IFR object reference.
 
+  /// Execute test code.
   int run (void);
-  // Execute test code.
 
 private:
+  /// The two IFR tests.
   void populate (void);
   int query (void);
-  // The two IFR tests.
 
+  /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
-  // Process the command line arguments.
 
+  /// Flag to output results of IFR queries.
   CORBA::Boolean debug_;
-  // Flag to output results of IFR queries.
 
+  /// Are we populating a new IFR or querying a persistent one?
   CORBA::Boolean query_;
-  // Are we populating a new IFR or querying a persistent one?
 
+  /// Storage of the ORB reference.
   CORBA::ORB_var orb_;
-  // Storage of the ORB reference.
 
+  /// Storage of the IFR reference.
   CORBA::Repository_var repo_;
-  // Storage of the IFR reference.
 };
 
 #endif /* PTEST_H */
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
index 98575290ded..de3b93855ef 100755
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
@@ -38,7 +38,7 @@ $server->DeleteFile($iorbase);
 $server->DeleteFile($backing_file);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " -o $server_iorfile " .
                               " $persistent");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf b/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf
index ea66c67064d..b6856698e51 100644
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
index 77a52ea4f66..e55bfc1f40e 100644
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
@@ -3,10 +3,6 @@
 
 #include "Ptest.h"
 
-ACE_RCSID (Persistence_Test,
-           test,
-           "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Ptest ptest;
diff --git a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
index f26859c4528..b88aec910d0 100644
--- a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
@@ -12,7 +12,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-  TAO_IFR_Client_Adapter *ifr_client = 
+  TAO_IFR_Client_Adapter *ifr_client =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
       TAO_ORB_Core::ifr_client_adapter_name ());
 
@@ -32,11 +32,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                          "get interface returned nil ref\n"),
                         1);
     }
-  
+
   CORBA::ContainedSeq_var attributes =
     intDef->contents (CORBA::dk_Attribute, 1);
   CORBA::ULong n_ats = attributes->length ();
-  
+
   CORBA::ULong index = 0UL;
   CORBA::String_var name = attributes[index]->name ();
   ACE_DEBUG ((LM_DEBUG,
diff --git a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl
index f13eba613c8..5b23ca74b7b 100755
--- a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl
@@ -39,7 +39,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file " .
diff --git a/orbsvcs/tests/Interoperable_Naming/Makefile.am b/orbsvcs/tests/Interoperable_Naming/Makefile.am
deleted file mode 100644
index 99599451fa6..00000000000
--- a/orbsvcs/tests/Interoperable_Naming/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Interoperable_Naming.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl
-
-CLEANFILES = \
-  Web_Server-stamp \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl
-
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl: Web_Server-stamp
-
-Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Web_ServerC.cpp \
-  Web_ServerS.cpp \
-  client.cpp \
-  ncontextext_client_i.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  ncontextext_client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Interoperable_Naming/Web_Server.idl b/orbsvcs/tests/Interoperable_Naming/Web_Server.idl
index 97bda28066e..dc209bd7343 100644
--- a/orbsvcs/tests/Interoperable_Naming/Web_Server.idl
+++ b/orbsvcs/tests/Interoperable_Naming/Web_Server.idl
@@ -1,21 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Interoperable_Naming/
-//
-// = FILENAME
-//    Web_Server.idl
-//
-// = DESCRIPTION
-//     IDL schema definition for Web server interface.
-//
-// = AUTHORS
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Web_Server.idl
+ *
+ *  $Id$
+ *
+ *   IDL schema definition for Web server interface.
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 module Web_Server
 {
diff --git a/orbsvcs/tests/Interoperable_Naming/client.cpp b/orbsvcs/tests/Interoperable_Naming/client.cpp
index b55b30aedb2..4d634bee99d 100644
--- a/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -1,22 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Interoperable_Naming/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//     This implements a simple CORBA client for the
-//     CosNaming::NamingContextExt example
-//
-// = AUTHORS
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *   This implements a simple CORBA client for the
+ *   CosNaming::NamingContextExt example
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ncontextext_client_i.h"
 
diff --git a/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index e682b3a7ade..949beb9c17c 100644
--- a/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -1,23 +1,19 @@
-// $Id$
-//
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/ORBSVCS/tests/SimpleNaming
-//
-// = FILENAME
-//    ncontextext_client_i.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple CORBA client which
-//    converts a Name to a string and viceversa, forms a IIOPNAME
-//    url address and can resolve a stringified name.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ncontextext_client_i.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements a simple CORBA client which
+ *  converts a Name to a string and viceversa, forms a IIOPNAME
+ *  url address and can resolve a stringified name.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ncontextext_client_i.h"
 #include "tao/debug.h"
diff --git a/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 7c3743c0230..b5c4c253a7e 100644
--- a/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/ORBSVCS/tests/SimpleNaming
-//
-// = FILENAME
-//    ncontextext_client_i.h
-//
-// = DESCRIPTION
-//    This class implements a simple CORBA client which
-//    converts a Name to a string and viceversa, forms a IIOPNAME
-//    url address and can resolve a stringified name.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ncontextext_client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements a simple CORBA client which
+ *  converts a Name to a string and viceversa, forms a IIOPNAME
+ *  url address and can resolve a stringified name.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 
 #if !defined (NCONTEXTEXT_CLIENT_I_H)
@@ -26,55 +23,58 @@
 #include "Web_ServerC.h"
 #include "orbsvcs/CosNamingC.h"
 
+/**
+ * @class NContextExt_Client_i
+ *
+ * @brief NContextExt Client Implementation
+ *
+ */
 class NContextExt_Client_i
 {
-  // = TITLE
-  //     NContextExt Client Implementation
-  //
-  // = DESCRIPTION
-  //
 
  public:
   // = COnstructor and destructor.
   NContextExt_Client_i (void);
   ~NContextExt_Client_i (void);
 
+  /// Execute the client example code.
   int run (void);
-  // Execute the client example code.
 
+  /// Initialize the client communication endpoint with the server.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with the server.
 
  private:
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /**
+   * Prints the values of the original name, strigified name and
+   * destringified name. Also, prints the value of the address of the
+   * naming context, a name that identifies a binding in that naming
+   * context and the corresponding iioploc URL
+   * representation.
+   */
   void print_values (CosNaming::Name name,
                      CORBA::String_var str_name,
                      CosNaming::Name nm,
                      CORBA::String_var obj_name,
                      CORBA::String_var url_string);
-  // Prints the values of the original name, strigified name and
-  // destringified name. Also, prints the value of the address of the
-  // naming context, a name that identifies a binding in that naming
-  // context and the corresponding iioploc URL
-  // representation.
 
+  /// Generates a random name
   char * get_name (void);
-  // Generates a random name
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// Naming context
   CosNaming::NamingContextExt_var naming_context_;
-  // Naming context
 
+  /// Flag to check if '-v' option is set.
   CORBA::Boolean view_;
-  // Flag to check if '-v' option is set.
 
 };
 
diff --git a/orbsvcs/tests/Interoperable_Naming/run_test.pl b/orbsvcs/tests/Interoperable_Naming/run_test.pl
index eb89e694837..3d21cdd25f0 100755
--- a/orbsvcs/tests/Interoperable_Naming/run_test.pl
+++ b/orbsvcs/tests/Interoperable_Naming/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../Naming_Service/Naming_Service",
+$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 $CL = $client->CreateProcess ("client", "-s -ORBInitRef NameService=file://$client_iorfile");
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index f6b1b39ac23..8d733337167 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "Basic.h"
 #include "LB_server.h"
 
-
-ACE_RCSID (Application_Controlled,
-           Basic,
-           "$Id$")
-
-
 Basic::Basic (CORBA::Object_ptr object_group,
               CosLoadBalancing::LoadManager_ptr lm,
               CORBA::ORB_ptr orb,
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index aedbaa8910d..0ffd18e95b9 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 
 #include "TestC.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Application_Controlled,
-           LB_server,
-           "$Id$")
-
 LB_server::LB_server (int argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
@@ -93,7 +91,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
deleted file mode 100644
index cf8c8ca4ca1..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
+++ /dev/null
@@ -1,146 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Application_Controlled_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Application_Controlled_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Basic.h \
-  LB_server.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Application_Controlled_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Basic.cpp \
-  LB_server.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Basic.h \
-  LB_server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
index 738a237d01f..a167ce93a54 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Application_Controlled,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
index 46b8699f5f0..23770a7b286 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
@@ -44,7 +44,7 @@ my $client_ior2file = $client->LocalFile ($ior2file);
 $client->DeleteFile($ior2file);
 
 
-$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
+$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file " .
                               ($^O eq 'MSWin32' ?
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index d03bc0f5895..88bc5f6819e 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 
-ACE_RCSID (Application_Controlled,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf
index ea66c67064d..b6856698e51 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
index 06c425e3ecf..e02d5089fce 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
@@ -1,3 +1,3 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
index e876ece085c..eeb61688925 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
@@ -1,11 +1,8 @@
+// $Id$
+
 #include "Basic.h"
 #include "LB_server.h"
-#include "ace/OS.h"
-
-
-ACE_RCSID (DeadMemberDetection_App_Ctrl,
-           Basic,
-           "$Id$")
+#include "ace/OS_NS_unistd.h"
 
 extern int pong_delay;
 
@@ -29,7 +26,7 @@ Basic::Basic (CORBA::Object_ptr object_group,
 
 
 /// Default _non_existent: always returns false.
-CORBA::Boolean 
+CORBA::Boolean
 Basic::_non_existent (void)
 {
   if (pong_delay > 0)
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
index 3841887fb5f..c0aede26ecc 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 
 #include "TestC.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (DeadMemberDetection_App_Ctrl,
-           LB_server,
-           "$Id$")
-
 extern const ACE_TCHAR *group_file;
 extern const ACE_TCHAR *group_ior;
 extern const ACE_TCHAR *direct_obj_file;
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Makefile.am
deleted file mode 100755
index cf8c8ca4ca1..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Makefile.am
+++ /dev/null
@@ -1,146 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Application_Controlled_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Application_Controlled_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Basic.h \
-  LB_server.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Application_Controlled_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Basic.cpp \
-  LB_server.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Basic.h \
-  LB_server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
index 5d68484928e..e7749681cc7 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
@@ -1,11 +1,10 @@
+// $Id$
+
 #include "TestC.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Vector_T.h"
-
-ACE_RCSID (DeadMemberDetection_App_Ctrl,
-           client,
-           "$Id$")
+#include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR *group_file = ACE_TEXT("group.ior");
 const ACE_TCHAR *group_ior = ACE_TEXT("file://group.ior");
@@ -46,14 +45,14 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 
 
-int dead_member_rr_test (CORBA::ORB_ptr orb, 
-                         const ACE_TCHAR *group_ior, 
+int dead_member_rr_test (CORBA::ORB_ptr orb,
+                         const ACE_TCHAR *group_ior,
                          Test::Basic_ptr direct_basic)
 {
   int status = 0;
@@ -92,7 +91,7 @@ int dead_member_rr_test (CORBA::ORB_ptr orb,
 
         basic->exit ();
       }
-      else 
+      else
         direct_basic->exit ();
 
       if (iter == 3)
@@ -125,8 +124,8 @@ int dead_member_rr_test (CORBA::ORB_ptr orb,
 }
 
 
-int hang_member_rr_test (CORBA::ORB_ptr orb, 
-                         const ACE_TCHAR *group_ior, 
+int hang_member_rr_test (CORBA::ORB_ptr orb,
+                         const ACE_TCHAR *group_ior,
                          Test::Basic_ptr /*direct_basic*/)
 {
   int status = 0;
@@ -186,7 +185,7 @@ int hang_member_rr_test (CORBA::ORB_ptr orb,
     catch (const ::CORBA::COMM_FAILURE& /*ex*/)
     {
       // It is possible that the LB has not detected the server 2 exit as it hangs
-      // and returns the reference to the hang server(server 2) for 4th iteration. 
+      // and returns the reference to the hang server(server 2) for 4th iteration.
       // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions.
       if (iter != 3)
       {
@@ -214,8 +213,8 @@ int hang_member_rr_test (CORBA::ORB_ptr orb,
 }
 
 
-int dead_member_rand_test (CORBA::ORB_ptr orb, 
-                           const ACE_TCHAR *group_ior, 
+int dead_member_rand_test (CORBA::ORB_ptr orb,
+                           const ACE_TCHAR *group_ior,
                            Test::Basic_ptr /*direct_basic*/)
 {
   int status = 0;
@@ -247,7 +246,7 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
       ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Client request handled by object at <%s>\n",
         the_string.in ()));
 
-      // Any picked member will not be picked again since they exit right after 
+      // Any picked member will not be picked again since they exit right after
       // this request.
       for (size_t j = 0; j < locations.size (); ++j)
       {
@@ -255,8 +254,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
         {
           status = 1;
         }
-      }    
-     
+      }
+
       if (status == 0)
         locations.push_back (the_string.in ());
 
@@ -291,8 +290,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
 }
 
 
-int hang_member_rand_test (CORBA::ORB_ptr orb, 
-                           const ACE_TCHAR *group_ior, 
+int hang_member_rand_test (CORBA::ORB_ptr orb,
+                           const ACE_TCHAR *group_ior,
                            Test::Basic_ptr /*direct_basic*/)
 {
   int status = 0;
@@ -330,11 +329,11 @@ int hang_member_rand_test (CORBA::ORB_ptr orb,
         {
           status = 1;
         }
-      }    
-     
+      }
+
       if (status == 0)
         locations.push_back (the_string.in ());
-     
+
      if (iter == 3)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Request %d should not complete\n"), iter));
@@ -359,7 +358,7 @@ int hang_member_rand_test (CORBA::ORB_ptr orb,
     catch (const ::CORBA::COMM_FAILURE& /*ex*/)
     {
       // It is possible that the LB has not detected the server 2 exit as it hangs
-      // and returns the reference to the hang server(server 2) for 4th iteration. 
+      // and returns the reference to the hang server(server 2) for 4th iteration.
       // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions.
       if (iter != 3)
       {
@@ -439,7 +438,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         else
           status = dead_member_rand_test (orb.in (), group_ior, direct_basic.in ());
       else
-      {    
+      {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Invalid strategy \n")));
         status = 1;
       }
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf
index ceefb555c38..687382aac65 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf
@@ -1,4 +1,4 @@
-# $Id $
+# $Id$
 
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
index 3b495f39dfa..1a4e8ea13ed 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
@@ -24,28 +24,28 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
 
 
 @tests =
-    (   {   
+    (   {
          description => "Dead Member Detection",
          strategy  => "RoundRobin",
          svr1_args => "$init_ref -n 1 -o $ior2file",
          svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file",
          svr3_args => "$init_ref -n 3 -k file://$ior2file",
          client_args => "-k file://$ior2file -j file://$ior3file -s RoundRobin",
-        }, {   
+        }, {
          description => "Hang Member Detection",
          strategy  => "RoundRobin",
          svr1_args => "$init_ref -n 1 -o $ior2file",
          svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file -l 2",
          svr3_args => "$init_ref -n 3 -k file://$ior2file",
          client_args => "-k file://$ior2file -j file://$ior3file -s RoundRobin -l",
-        }, {   
+        }, {
          description => "Dead Member Detection",
          strategy  => "Random",
          svr1_args => "$init_ref -n 1 -o $ior2file",
          svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file",
          svr3_args => "$init_ref -n 3 -k file://$ior2file",
          client_args => "-k file://$ior2file -j file://$ior3file -s Random",
-        }, {   
+        }, {
          description => "Hang Member Detection",
          strategy  => "Random",
          svr1_args => "$init_ref -n 1 -o $ior2file",
@@ -75,21 +75,21 @@ for $test (@tests) {
     $server2->DeleteFile($ior3file);
 
     $status = 0;
-    #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log 
-    $LM = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
-                                "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" 
+    #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log
+    $LM = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
+                                "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3"
                                 . " -ORBSvcConf $lm_conf");
     $SV1 = $server2->CreateProcess ("server", $test->{svr1_args});
     $SV2 = $server3->CreateProcess ("server", $test->{svr2_args});
     $SV3 = $server4->CreateProcess ("server", $test->{svr3_args});
     $CL = $client->CreateProcess ("client", $test->{client_args});
-    
+
     print STDERR "\n\n======== $test->{description} with $test->{strategy} ================\n";
     print STDERR "\n";
 
     print STDERR "== Start Load Banlancer.\n";
     print STDERR $LM->CommandLine () . "\n";
-    
+
     $LM->Spawn ();
 
     if ($server1->WaitForFileTimed ($ior1file, $server1->ProcessStartWaitInterval()) == -1) {
@@ -97,13 +97,13 @@ for $test (@tests) {
         $LM->Kill (); $LM->TimedWait (1);
         exit 1;
     }
-    
+
     if ($server1->GetFile ($ior1file) == -1) {
         print STDERR "ERROR: cannot retrieve file <$server1_ior1file>\n";
         $LM->Kill (); $LM->TimedWait (1);
         exit 1;
     }
- 
+
     if ($server2->PutFile ($ior2file) == -1) {
         print STDERR "ERROR: cannot set file <$server2_ior2file>\n";
         $LM->Kill (); $LM->TimedWait (1);
@@ -120,7 +120,7 @@ for $test (@tests) {
         $SV1->Kill (); $SV1->TimedWait (1);
         exit 1;
     }
-    
+
     if ($server2->GetFile ($ior2file) == -1) {
         print STDERR "ERROR: cannot retrieve file <$server2_ior2file>\n";
         $LM->Kill ();
@@ -147,7 +147,7 @@ for $test (@tests) {
         $SV2->Kill (); $SV2->TimedWait (1);
         exit 1;
     }
-    
+
     if ($server3->GetFile ($ior3file) == -1) {
         print STDERR "ERROR: cannot retrieve file <$server3_ior1file>\n";
         $LM->Kill ();
@@ -173,7 +173,7 @@ for $test (@tests) {
         $status = 1;
     }
 
-    $server = $SV3->WaitKill ($server2->ProcessStopWaitInterval()); 
+    $server = $SV3->WaitKill ($server2->ProcessStopWaitInterval());
 
     if ($server != 0) {
         print STDERR "ERROR: server 3 returned $server\n";
@@ -203,7 +203,7 @@ for $test (@tests) {
     $server1->DeleteFile($ior1file);
     $server2->DeleteFile($ior2file);
     $server3->DeleteFile($ior3file);
-    
+
     if ($status == 0) {
       print STDERR "$description test passed.\n";
     }
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
index c3a2cc28124..546d0c60179 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Task.h"
 
-ACE_RCSID (DeadMemberDetection_App_Ctrl,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *group_file = ACE_TEXT("group.ior");
 const ACE_TCHAR *group_ior = ACE_TEXT("file://group.ior");
 
@@ -51,7 +48,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -82,7 +79,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       const char ** location = 0;
-      
+
       switch (server_id)
       {
         case 1:
@@ -115,7 +112,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                              server_id),
                       1);
       PortableServer::ServantBase_var owner_transfer(basic_servant);
-    
+
       if (lb_server.register_servant (basic_servant, *location) == -1)
         {
           (void) lb_server.destroy ();
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf
index 4521e5070db..0cc4559a431 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf
@@ -1,4 +1,4 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
index 66afe43d0b1..bcb1292951f 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
@@ -1,11 +1,10 @@
+// $Id$
+
 #include "Factory.h"
 #include "Simple.h"
 
 #include "TestC.h"
-
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           Factory,
-           "$Id$")
+#include "ace/OS_NS_unistd.h"
 
 Factory::Factory (int id)
 : id_ (id)
@@ -60,12 +59,9 @@ Factory::create_object (
   return obj_._retn ();
 }
 
-#include <ace/OS.h>
-
 void
 Factory::delete_object (
-    const PortableGroup::GenericFactory::FactoryCreationId &
-      fcid)
+    const PortableGroup::GenericFactory::FactoryCreationId & fcid)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T delete_object \n"));
   ACE_OS::sleep (10);
@@ -95,7 +91,7 @@ Factory::delete_object (
 }
 
 
-CORBA::Object_ptr 
+CORBA::Object_ptr
 Factory::get_object () const
 {
   return this->obj_.in ();
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
index dea1b129921..24553e7f9eb 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
@@ -1,9 +1,6 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Factory_Map.h"
 
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           Factory_Map,
-           "$Id$")
-
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
index 1dbc2b3c9bd..3b9f3ed923c 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
@@ -1,5 +1,4 @@
+// $Id$
+
 #include "Factory_Struct.h"
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           Factory_Struct,
-           "$Id$")
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
index a2ce2a65d0e..a7367b2f44b 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "LB_Factory_Server.h"
 #include "Simple.h"
 #include "Factory.h"
@@ -6,10 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           LB_Factory_Server,
-           "$Id$")
-
 const ACE_TCHAR* factory1_file = ACE_TEXT ("factory1.ior");
 const ACE_TCHAR* factory2_file = ACE_TEXT ("factory2.ior");
 const ACE_TCHAR* factory3_file = ACE_TEXT ("factory3.ior");
@@ -124,7 +122,7 @@ LB_Factory_Server::parse_args (int& argc, ACE_TCHAR **& argv)
       }
 
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -164,16 +162,16 @@ LB_Factory_Server::init (void)
                            " (%P|%t) Unable to get Load Manager Reference\n"),
                           1);
 
-     
+
       Factory* servant = new Factory(server_id_);
       PortableServer::ServantBase_var owner_transfer(servant);
       obj = servant->_this ();
-      PortableGroup::GenericFactory_var factory_obj 
+      PortableGroup::GenericFactory_var factory_obj
         = PortableGroup::GenericFactory::_narrow (obj.in ());
       CORBA::String_var ior =
         this->orb_->object_to_string (factory_obj.in ());
 
-      this->write_ior_to_file (ior.in (), 
+      this->write_ior_to_file (ior.in (),
         ACE_TEXT_ALWAYS_CHAR (this->factory_ior_file_.c_str ()));
 
       if (this->server_id_ == 2)
@@ -188,7 +186,7 @@ LB_Factory_Server::init (void)
 
         CORBA::Object_var obj = simple_servant->_this ();
         CORBA::String_var ior = this->orb_->object_to_string (obj.in ());
-        this->write_ior_to_file (ior.in (), 
+        this->write_ior_to_file (ior.in (),
           ACE_TEXT_ALWAYS_CHAR (direct_obj2_file));
       }
     }
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
index 0a9e7731251..6bbc51ac1fc 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Simple.h"
 #include "Factory.h"
@@ -6,10 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           LB_server,
-           "$Id$")
-
 const char *location1 = "MyLocation 1";
 const char *location2 = "MyLocation 2";
 const char *location3 = "MyLocation 3";
@@ -124,7 +122,7 @@ LB_server::parse_args (int& argc, ACE_TCHAR **& argv)
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -184,15 +182,15 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2, const char
       const char *repository_id = "IDL:Test/Simple:1.0";
 
       CORBA::Object_var obj = this->orb_->string_to_object (factory1_ior);
-      PortableGroup::GenericFactory_var factory1_obj = 
+      PortableGroup::GenericFactory_var factory1_obj =
         PortableGroup::GenericFactory::_narrow (obj.in ());
 
       obj = this->orb_->string_to_object (factory2_ior);
-      PortableGroup::GenericFactory_var factory2_obj = 
+      PortableGroup::GenericFactory_var factory2_obj =
         PortableGroup::GenericFactory::_narrow (obj.in ());
 
       obj = this->orb_->string_to_object (factory3_ior);
-      PortableGroup::GenericFactory_var factory3_obj = 
+      PortableGroup::GenericFactory_var factory3_obj =
         PortableGroup::GenericFactory::_narrow (obj.in ());
 
       PortableGroup::FactoriesValue  factory_infos;
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Makefile.am
deleted file mode 100755
index 94dc1c8ff17..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Makefile.am
+++ /dev/null
@@ -1,153 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Infrastructure_Controlled_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Infrastructure_Controlled_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Factory.h \
-  Factory_Map.h \
-  Factory_Struct.h \
-  LB_server.h \
-  Simple.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Infrastructure_Controlled_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Factory.cpp \
-  Factory_Map.cpp \
-  Factory_Struct.cpp \
-  LB_server.cpp \
-  Simple.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Factory.h \
-  Factory_Map.h \
-  Factory_Struct.h \
-  LB_server.h \
-  Simple.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
index 37b7d6b5046..feb230318fa 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
@@ -1,10 +1,7 @@
-#include "Simple.h"
-#include "ace/OS.h"
-
+// $Id$
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           Simple,
-           "$Id$")
+#include "Simple.h"
+#include "ace/OS_NS_unistd.h"
 
 extern int pong_delay;
 
@@ -18,7 +15,7 @@ Simple::Simple (int server_id)
 }
 
 /// Default _non_existent: always returns false.
-CORBA::Boolean 
+CORBA::Boolean
 Simple::_non_existent (void)
 {
   if (pong_delay > 0)
@@ -53,7 +50,7 @@ Simple::get_string (void)
   }
 }
 
-void 
+void
 Simple::exit (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Simple::exit  server %d exit \n",
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
index 065d913e181..7de73d898a5 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "TestC.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Vector_T.h"
-
-
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           client,
-           "$Id$")
-
+#include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR* group_ior = ACE_TEXT ("file:://group.ior");
 const ACE_TCHAR* direct_obj2_ior = ACE_TEXT ("file://direct_obj2.ior");
@@ -45,13 +42,13 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 
-int dead_member_rr_test (CORBA::ORB_ptr orb, 
-                         const ACE_TCHAR* group_ior, 
+int dead_member_rr_test (CORBA::ORB_ptr orb,
+                         const ACE_TCHAR* group_ior,
                          Test::Simple_ptr direct_simple)
 {
   int status = 0;
@@ -90,7 +87,7 @@ int dead_member_rr_test (CORBA::ORB_ptr orb,
 
         simple->exit ();
       }
-      else 
+      else
         direct_simple->exit ();
 
       if (iter == 3)
@@ -123,8 +120,8 @@ int dead_member_rr_test (CORBA::ORB_ptr orb,
 }
 
 
-int hang_member_rr_test (CORBA::ORB_ptr orb, 
-                         const ACE_TCHAR* group_ior, 
+int hang_member_rr_test (CORBA::ORB_ptr orb,
+                         const ACE_TCHAR* group_ior,
                          Test::Simple_ptr /*direct_simple*/)
 {
   int status = 0;
@@ -185,7 +182,7 @@ int hang_member_rr_test (CORBA::ORB_ptr orb,
     catch (const ::CORBA::COMM_FAILURE& /*ex*/)
     {
       // It is possible that the LB has not detected the server 2 exit as it hangs
-      // and returns the reference to the hang server(server 2) for 4th iteration. 
+      // and returns the reference to the hang server(server 2) for 4th iteration.
       // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions.
       if (iter != 3)
       {
@@ -208,13 +205,13 @@ int hang_member_rr_test (CORBA::ORB_ptr orb,
       throw;
     }
   }
- 
+
   return status;
 }
 
 
-int dead_member_rand_test (CORBA::ORB_ptr orb, 
-                           const ACE_TCHAR* group_ior, 
+int dead_member_rand_test (CORBA::ORB_ptr orb,
+                           const ACE_TCHAR* group_ior,
                            Test::Simple_ptr /*direct_simple*/)
 {
   int status = 0;
@@ -246,7 +243,7 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client request handled by object at <%s>\n",
         the_string.in ()));
 
-      // Any picked member will not be picked again since they exit right after 
+      // Any picked member will not be picked again since they exit right after
       // this request.
       for (size_t j = 0; j < locations.size (); ++j)
       {
@@ -254,8 +251,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
         {
           status = 1;
         }
-      }    
-     
+      }
+
       if (status == 0)
         locations.push_back (the_string.in ());
 
@@ -290,8 +287,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
 }
 
 
-int hang_member_rand_test (CORBA::ORB_ptr orb, 
-                           const ACE_TCHAR* group_ior, 
+int hang_member_rand_test (CORBA::ORB_ptr orb,
+                           const ACE_TCHAR* group_ior,
                            Test::Simple_ptr /*direct_simple*/)
 {
   int status = 0;
@@ -329,11 +326,11 @@ int hang_member_rand_test (CORBA::ORB_ptr orb,
         {
           status = 1;
         }
-      }    
-     
+      }
+
       if (status == 0)
         locations.push_back (the_string.in ());
-     
+
      if (iter == 3)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Request %d should not complete\n"), iter));
@@ -358,7 +355,7 @@ int hang_member_rand_test (CORBA::ORB_ptr orb,
     catch (const ::CORBA::COMM_FAILURE& /*ex*/)
     {
       // It is possible that the LB has not detected the server 2 exit as it hangs
-      // and returns the reference to the hang server(server 2) for 4th iteration. 
+      // and returns the reference to the hang server(server 2) for 4th iteration.
       // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions.
       if (iter != 3)
       {
@@ -426,7 +423,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         else
           status = dead_member_rand_test (orb.in (),group_ior, direct_simple.in ());
       else
-      {    
+      {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Invalid strategy \n")));
         status = 1;
       }
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
index 0695d186eb7..e7b491f6c55 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "LB_Factory_Server.h"
 #include "Factory.h"
 #include "Simple.h"
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf
index ceefb555c38..687382aac65 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf
@@ -1,4 +1,4 @@
-# $Id $
+# $Id$
 
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
index 323d1de9d0e..1f868f756c5 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
@@ -27,7 +27,7 @@ $lm_conf = $^O eq 'MSWin32' ? "windows$PerlACE::svcconf_ext"
 $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
 
 
-@tests = ({   
+@tests = ({
             description => "Dead Member Detection",
             strategy  => "RoundRobin",
             svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -35,7 +35,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
             svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file",
             svr3_args => "$init_ref -n 3 -o $ior5file",
             client_args => "-k file://$ior2file -j file://$ior6file -s RoundRobin",
-          },{   
+          },{
             description => "Hang Member Detection",
             strategy  => "RoundRobin",
             svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -43,7 +43,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
             svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file -l 2",
             svr3_args => "$init_ref -n 3 -o $ior5file",
             client_args => "-k file://$ior2file -j file://$ior6file -s RoundRobin -l",
-          },{   
+          },{
             description => "Dead Member Detection",
             strategy  => "Random",
             svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -51,7 +51,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
             svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file",
             svr3_args => "$init_ref -n 3 -o $ior5file",
             client_args => "-k file://$ior2file -j file://$ior6file -s Random",
-          },{ 
+          },{
             description => "Hang Member Detection",
             strategy  => "Random",
             svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -88,9 +88,9 @@ for $test (@tests) {
     $server5->DeleteFile($ior5file);
 
     $status = 0;
-    #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log 
-    $LM = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
-                                "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" 
+    #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log
+    $LM = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
+                                "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3"
                                 . " -ORBSvcConf $lm_conf");
     $SV = $server2->CreateProcess ("server", $test->{svr_args});
     $SV1 = $server3->CreateProcess ("factory_server", $test->{svr1_args});
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
index 154eb412484..2158e314e99 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Factory.h"
 #include "Simple.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf
index 4521e5070db..0cc4559a431 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf
@@ -1,4 +1,4 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 6e0079fac75..5615e8b55cb 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -1,12 +1,10 @@
+// $Id$
+
 #include "Factory.h"
 #include "Simple.h"
 
 #include "TestC.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           Factory,
-           "$Id$")
-
 Factory::Factory (void)
 {
    this->fcid_ = 0;
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
index 375784f2fd3..99a52abe6ae 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
@@ -1,9 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Factory_Map.h"
 
-
-ACE_RCSID (Infrastructure_Controlled,
-           Factory_Map,
-           "$Id$")
-
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
index 4459fe3e227..3b9f3ed923c 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
@@ -1,5 +1,4 @@
+// $Id$
+
 #include "Factory_Struct.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           Factory_Struct,
-           "$Id$")
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index 86b6fd95662..8a6c30869a8 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Simple.h"
 #include "Factory.h"
@@ -5,10 +7,6 @@
 #include "TestC.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           LB_server,
-           "$Id$")
-
 LB_server::LB_server (int argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
@@ -103,7 +101,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
deleted file mode 100644
index 94dc1c8ff17..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
+++ /dev/null
@@ -1,153 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Infrastructure_Controlled_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Infrastructure_Controlled_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Factory.h \
-  Factory_Map.h \
-  Factory_Struct.h \
-  LB_server.h \
-  Simple.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Infrastructure_Controlled_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Factory.cpp \
-  Factory_Map.cpp \
-  Factory_Struct.cpp \
-  LB_server.cpp \
-  Simple.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Factory.h \
-  Factory_Map.h \
-  Factory_Struct.h \
-  LB_server.h \
-  Simple.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
index 1b3a9a3a99a..22d5988dafb 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
@@ -1,10 +1,6 @@
-#include "Simple.h"
-
-
-ACE_RCSID (Infrastructure_Controlled,
-           Simple,
-           "$Id$")
+// $Id$
 
+#include "Simple.h"
 
 Simple::Simple (void)
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index ac7013e0e2e..4b7b468b90c 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-
-ACE_RCSID (Infrastructure_Controlled,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior");
 
 int
@@ -31,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
index 338e3e858a3..d3adbd6af18 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
@@ -44,7 +44,7 @@ my $client_ior2file = $client->LocalFile ($ior2file);
 $client->DeleteFile($ior2file);
 
 
-$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
+$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file " .
                               ($^O eq 'MSWin32' ?
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
index 844e2ebe789..85c32ae81d4 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Factory.h"
 #include "Simple.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
index 06c425e3ecf..e02d5089fce 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
@@ -1,3 +1,3 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
deleted file mode 100644
index 94ee8bc71d4..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Application_Controlled \
-        Infrastructure_Controlled \
-        Manage_Object_Group
-
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index dee11993c13..abf25b3e295 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "Basic.h"
 #include "LB_server.h"
 
-
-ACE_RCSID (Application_Controlled,
-           Basic,
-           "$Id$")
-
-
 Basic::Basic (CORBA::Object_ptr object_group,
               CosLoadBalancing::LoadManager_ptr lm,
               CORBA::ORB_ptr orb,
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index d60e020d6f5..1f3f96e5155 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 #include "Simple.h"
@@ -5,10 +7,6 @@
 #include "TestC.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Application_Controlled,
-           LB_server,
-           "$Id$")
-
 LB_server::LB_server (int argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
deleted file mode 100644
index 41dcd1e8545..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
+++ /dev/null
@@ -1,102 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Manage_Object_Group_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Basic.cpp \
-  LB_server.cpp \
-  Simple.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Basic.h \
-  LB_server.h \
-  Simple.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index 323bbfa3662..6e779f63ad8 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "Simple.h"
 #include "LB_server.h"
 
-
-ACE_RCSID (Application_Controlled,
-           Simple,
-           "$Id$")
-
-
 Simple::Simple (CORBA::Object_ptr object_group,
                 CosLoadBalancing::LoadManager_ptr lm,
                 CORBA::ORB_ptr orb,
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
index b4d1827cd86..65b12717476 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
@@ -25,7 +25,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../../LoadBalancer/LoadManager",
+$SV = $server->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
                               "-o $server_iorfile " .
                               ($^O eq 'MSWin32' ?
                                            " -ORBSvcConf $lm_conf" : ''));
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 10414746f55..6aeca31a7e0 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 #include "Simple.h"
 
-ACE_RCSID (Manage_object_group,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
index 06c425e3ecf..e02d5089fce 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
@@ -1,3 +1,3 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
deleted file mode 100644
index 1caa1b015f9..00000000000
--- a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.LoadMonitorCPU_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
index 3efdbb0d9e3..f3b3f015ab1 100644
--- a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
@@ -5,10 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (CPU,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *location = ACE_TEXT("MyLocation");
 
 const int MAX_RETRIES = 10;
diff --git a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl
index f7ae1f2ca6c..8a2495f4e98 100755
--- a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl
@@ -38,11 +38,11 @@ my $client_iorfile = $client->LocalFile ($iorfile);
 $client->DeleteFile($iorfile);
 
 
-$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
+$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_iorfile");
 
-$SV2 = $server2->CreateProcess ("../../../../LoadBalancer/LoadMonitor",
+$SV2 = $server2->CreateProcess ("../../../../LoadBalancer/tao_loadmonitor",
                               "-ORBdebuglevel $debug_level " .
                               "-l $location " .
                               "-t CPU -s PULL " .
diff --git a/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am b/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
deleted file mode 100644
index cc16d67d6f5..00000000000
--- a/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        CPU
-
diff --git a/orbsvcs/tests/LoadBalancing/Makefile.am b/orbsvcs/tests/LoadBalancing/Makefile.am
deleted file mode 100644
index aa65f76e141..00000000000
--- a/orbsvcs/tests/LoadBalancing/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        GenericFactory \
-        LoadMonitor
-
diff --git a/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 6f494c4f02b..c6ad51dd4e8 100644
--- a/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Basic_Log_Test.h"
 
 #include "tao/debug.h"
@@ -8,15 +10,9 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-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";
 
-
 BasicLog_Test::BasicLog_Test(void)
   : logServiceIor_ (0)
 {
@@ -305,6 +301,8 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
         CORBA::String_var t(str.c_str ());
         record[0] <<= t.in ();
         basicLog_->write_records(record);
+        if (l == 0)
+          break; // silence an 'infinite loop' warning
     }
   }
   else
diff --git a/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am b/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
deleted file mode 100644
index 004410c7c11..00000000000
--- a/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Log_Basic_Log_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Basic_Log_Test.cpp \
-  client.cpp \
-  Basic_Log_Test.h
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
index f0336387ac3..d3a01e870dd 100644
--- a/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
+++ b/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "Basic_Log_Test.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (Basic_Log_Test,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
@@ -13,106 +11,120 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_DEBUG((LM_DEBUG, "\nBasic Log test \n\n"));
 
-  if (log_test.init(argc, argv) == -1)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "xx - Failed initializing BasicLog_Test.\n"),-1);
-    }
+  try
+    {
+      if (log_test.init(argc, argv) == -1)
+        {
+          ACE_ERROR_RETURN((LM_ERROR,
+                            "xx - Failed initializing BasicLog_Test.\n"),
+                           -1);
+        }
 
-  // We may want to replace this with a run on the BasicLog_Test.
-  // If we cannot create a log, there is no use continuing.
-  // Create a log with max size (octets) of 1000.
-  if (log_test.test_CreateLog(1000) == -1)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "xx - Failed creating log and bailing out.\n"),-1);
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The creating log test succeeded.\n\n"));
-    }
+      // We may want to replace this with a run on the BasicLog_Test.
+      // If we cannot create a log, there is no use continuing.
+      // Create a log with max size (octets) of 1000.
+      if (log_test.test_CreateLog(1000) == -1)
+        {
+          ACE_ERROR_RETURN((LM_ERROR,
+                            "xx - Failed creating log and bailing out.\n"),
+                           -1);
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,
+                     "** - The creating log test succeeded.\n\n"));
+        }
 
-  // go easy until this works
-  //@@ use ACE_U64_TO_U32 to convert ULongLong to ULong
-  //in call to test_retrieval
-/*  if (log_test.test_retrieval(10) == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"The test of retrieval failed.\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"The test of retrieval succeeded.\n"));
-    }
-*/
-        if (log_test.test_log_destroy() == -1)
-           {
-           ACE_ERROR_RETURN((LM_ERROR,
-           "xx - Failed destroying  log.\n\n"),-1);
-           }
-           else
-           {
-           ACE_DEBUG((LM_ERROR,"** - The destroying log test succeeded.\n\n"));
-           }
+      // go easy until this works
+      //@@ use ACE_U64_TO_U32 to convert ULongLong to ULong
+      //in call to test_retrieval
+    /*  if (log_test.test_retrieval(10) == -1)
+        {
+          ACE_DEBUG((LM_ERROR,"The test of retrieval failed.\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_ERROR,"The test of retrieval succeeded.\n"));
+        }
+    */
+      if (log_test.test_log_destroy() == -1)
+        {
+          ACE_ERROR_RETURN((LM_ERROR,
+                            "xx - Failed destroying  log.\n\n"),
+                           -1);
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,
+                     "** - The destroying log test succeeded.\n\n"));
+        }
 
-           if (log_test.test_CreateLog(1000) == -1)
-           {
-           ACE_ERROR_RETURN((LM_ERROR,
-           "xx - Failed creating log and bailing out.\n\n"),-1);
-           }
+      if (log_test.test_CreateLog(1000) == -1)
+        {
+          ACE_ERROR_RETURN((LM_ERROR,
+                            "xx - Failed creating log and bailing out.\n\n"),
+                           -1);
+        }
 
-  if (log_test.test_capacity_alarm_threshold() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The capacity alarm threshold test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The capacity alarm threshold test succeeded.\n\n"));
-    }
+      if (log_test.test_capacity_alarm_threshold() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The capacity alarm threshold test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The capacity alarm threshold test succeeded.\n\n"));
+        }
 
-  if (log_test.test_LogAction() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The log action test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The log action test succeeded.\n\n"));
-    }
+      if (log_test.test_LogAction() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The log action test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The log action test succeeded.\n\n"));
+        }
 
-  if (log_test.test_adminState() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The administration test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The administration test succeeded.\n\n"));
-    }
+      if (log_test.test_adminState() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The administration test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The administration test succeeded.\n\n"));
+        }
 
-  if (log_test.test_logSize() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The log size test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The log size test succeeded.\n\n"));
-    }
+      if (log_test.test_logSize() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The log size test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The log size test succeeded.\n\n"));
+        }
 
-  /* if (log_test.test_logCompaction(30) == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The test of log compaction failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The test of log compaction succeeded.\n\n"));
-    }
-  */
+      /* if (log_test.test_logCompaction(30) == -1)
+        {
+          ACE_DEBUG((LM_ERROR,"xx - The test of log compaction failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_ERROR,"** - The test of log compaction succeeded.\n\n"));
+        }
+      */
 
-  if (log_test.test_week_mask() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The week mask test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The week mask test succeeded.\n\n"));
+      if (log_test.test_week_mask() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The week mask test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The week mask test succeeded.\n\n"));
+        }
+    }
+  catch (const ::CORBA::Exception &e)
+    {
+      e._tao_print_exception("Caught CORBA exception");
+      return 1;
     }
 
   return 0;
diff --git a/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl b/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl
index 923dc36f9fc..f4f800fa36c 100755
--- a/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl
+++ b/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl
@@ -20,7 +20,7 @@ foreach $i (@ARGV) {
 my $ns_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $lg_service = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 my $client = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
- 
+
 my $iorbase = "ns.ior";
 my $ns_iorfile = $ns_service->LocalFile ($iorbase);
 my $lg_iorfile = $lg_service->LocalFile ($iorbase);
@@ -29,9 +29,9 @@ $ns_service->DeleteFile ($iorbase);
 $lg_service->DeleteFile ($iorbase);
 $client->DeleteFile ($iorbase);
 
-$NS = $ns_service->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns_service->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                                   "-o $ns_iorfile");
-$LS = $lg_service->CreateProcess ("../../../Logging_Service/Basic_Logging_Service/Basic_Logging_Service",
+$LS = $lg_service->CreateProcess ("../../../Logging_Service/Basic_Logging_Service/tao_tls_basic",
                                   "-ORBInitRef NameService=file://$lg_iorfile");
 $CL = $client->CreateProcess ("client", "-ORBInitRef NameService=file://$client_iorfile");
 
@@ -79,7 +79,7 @@ if ($process_status != 0) {
     exit 1;
 }
 
-# Give time for logging service to initialize and install its object 
+# Give time for logging service to initialize and install its object
 # reference in the nameing service.
 sleep (10);
 
diff --git a/orbsvcs/tests/Log/Makefile.am b/orbsvcs/tests/Log/Makefile.am
deleted file mode 100644
index af99ab0bd2b..00000000000
--- a/orbsvcs/tests/Log/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Basic_Log_Test
-
diff --git a/orbsvcs/tests/Makefile.am b/orbsvcs/tests/Makefile.am
deleted file mode 100644
index 5c41ef319fc..00000000000
--- a/orbsvcs/tests/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AVStreams \
-        BiDir_CORBALOC \
-        Bug_1334_Regression \
-        Bug_1393_Regression \
-        Bug_1395_Regression \
-        Bug_1630_Regression \
-        Bug_2074_Regression \
-        Bug_2137_Regression \
-        Bug_2247_Regression \
-        Bug_2248_Regression \
-        Bug_2285_Regression \
-        Bug_2287_Regression \
-        Bug_2316_Regression \
-        Bug_2377_Regression \
-        Bug_2615_Regression \
-        Bug_2709_Regression \
-        Bug_2800_Regression \
-        Bug_2925_Regression \
-        Bug_3215_Regression \
-        Bug_3216_Regression \
-        COIOP_Naming_Test \
-        Concurrency \
-        CosEvent \
-        EC_Custom_Marshal \
-        EC_MT_Mcast \
-        EC_Mcast \
-        EC_Multiple \
-        EC_Throughput \
-        Event \
-        FT_App \
-        FaultTolerance \
-        FtRtEvent \
-        HTIOP \
-        IOR_MCast \
-        ImplRepo \
-        InterfaceRepo \
-        Interoperable_Naming \
-        LoadBalancing \
-        Log \
-        Miop \
-        Notify \
-        Property \
-        Redundant_Naming \
-        Sched \
-        Sched_Conf \
-        Security \
-        Simple_Naming \
-        Time \
-        Trading \
-        ior_corbaname \
-        tests_svc_loader \
-        unit
-
diff --git a/orbsvcs/tests/Miop/Makefile.am b/orbsvcs/tests/Miop/Makefile.am
deleted file mode 100644
index 2cf8fffb790..00000000000
--- a/orbsvcs/tests/Miop/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        McastHello
-
diff --git a/orbsvcs/tests/Miop/McastHello/Makefile.am b/orbsvcs/tests/Miop/McastHello/Makefile.am
deleted file mode 100644
index 914981d4fa6..00000000000
--- a/orbsvcs/tests/Miop/McastHello/Makefile.am
+++ /dev/null
@@ -1,129 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.McastHello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.McastHello_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  McastHello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.McastHello_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  McastHello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  McastHello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 10dd672650c..f195a6e5c9a 100644
--- a/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -3,7 +3,7 @@
 //
 #include "McastHello.h"
 
-ACE_RCSID(McastHello, McastHello, "$Id$")
+
 
 McastHello::McastHello (CORBA::ORB_ptr orb,
                         int instance)
diff --git a/orbsvcs/tests/Miop/McastHello/client.cpp b/orbsvcs/tests/Miop/McastHello/client.cpp
index a012ab1bfa6..a84044b4085 100644
--- a/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -5,7 +5,7 @@
 #include "tao/Object_T.h"
 #include "orbsvcs/PortableGroup/MIOP.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 #define MAX_MIOP_OCTET_SEQUENCE  (ACE_MAX_DGRAM_SIZE - 272 /* MIOP_MAX_HEADER_SIZE */)
 
diff --git a/orbsvcs/tests/Miop/McastHello/server.cpp b/orbsvcs/tests/Miop/McastHello/server.cpp
index c09b7a55253..c29b43793c7 100644
--- a/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/PortableGroup/MIOP.h"
 #include "orbsvcs/PortableGroup/GOA.h"
 
-ACE_RCSID (McastHello,
-           server,
-           "$Id$")
-
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 // Use a multicast address in the administrative "site local" range, 239.255.0.0 to
@@ -45,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -84,7 +80,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
                            1);
-      ACE_OS::fprintf (output_file, "%s", group_ior);
+      ACE_OS::fprintf (output_file, "%s", ACE_TEXT_ALWAYS_CHAR (group_ior));
       ACE_OS::fclose (output_file);
 
       PortableServer::ObjectId_var id =
diff --git a/orbsvcs/tests/Miop/McastHello/svc.conf b/orbsvcs/tests/Miop/McastHello/svc.conf
index 91cae79b5a3..84ef77cf1c6 100644
--- a/orbsvcs/tests/Miop/McastHello/svc.conf
+++ b/orbsvcs/tests/Miop/McastHello/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 #static PortableGroup_Loader ""
diff --git a/orbsvcs/tests/Notify/Basic/AdminProperties.h b/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 9a74a888f9c..d0fac5425c6 100644
--- a/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   AdminProperties.h
-//
-// = DESCRIPTION
-//   Test for EC Admin QoS properties.
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   AdminProperties.h
+ *
+ *  $Id$
+ *
+ * Test for EC Admin QoS properties.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ADMINPROPERTIES
 #define ADMINPROPERTIES
@@ -41,26 +41,27 @@ protected:
 };
 
 
+/**
+ * @class AdminProperties_Task
+ *
+ * @brief Run a thread to dispatch events.
+ *
+ * Use the ACE_Task_Base class.
+ */
 class AdminProperties_Task : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a thread to dispatch events.
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class.
-  //
 
 public:
+  /// Constructor.
   AdminProperties_Task (void);
-  // Constructor.
 
   /// Init this object.
   void init (TAO_Notify_Tests_StructuredPushSupplier *supplier, AdminProperties* client);
 
   virtual int init (int argc, ACE_TCHAR *argv []);
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
 private:
   /// Supplier
@@ -72,18 +73,19 @@ private:
 
 /***************************************************************************/
 
+/**
+ * @class AdminProperties
+ *
+ * @brief AdminProperties
+ *
+ * Test for Notify EC properties -
+ * max_queue_length
+ * max_consumers
+ * max_suppliers
+ * reject_new_events
+ */
 class AdminProperties : public Notify_Test_Client
 {
-  // = TITLE
-  //   AdminProperties
-  //
-  // = DESCRIPTION
-  //   Test for Notify EC properties -
-  //   max_queue_length
-  //   max_consumers
-  //   max_suppliers
-  //   reject_new_events
-  //
 
   friend class AdminProperties_StructuredPushConsumer;
   friend class AdminProperties_Task;
@@ -96,8 +98,8 @@ public:
 
   // Initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
 private:
   void create_suppliers (void);
@@ -111,20 +113,20 @@ private:
   void test_max_queue_length (bool reject);
 
   // Data Members
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Values for Admin Properties supplied by user.
   CORBA::Long max_queue_length_;
   CORBA::Long max_consumers_;
   CORBA::Long max_suppliers_;
   CORBA::Boolean reject_new_events_;
-  // Values for Admin Properties supplied by user.
 
   /// Number of consumers to connect to check MaxConsumers property.
   CORBA::Long consumers_;
@@ -132,8 +134,8 @@ private:
   /// Number of suppliers to connect to check MaxSuppliers property.
   CORBA::Long suppliers_;
 
+  /// Number of events to send to the channel.
   CORBA::Long event_count_;
-  // Number of events to send to the channel.
 
   /// Count of consumers successfully connect to the EC.
   int suppliers_connected_count_;
diff --git a/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index e041818db73..6891dcd7cd1 100644
--- a/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "ConnectDisconnect.h"
 
-ACE_RCSID (Notify_Tests, ConnectDisconnect, "$Id$")
+
 
 #define CD_IMPLEMENT_ENTITY(X)\
 \
diff --git a/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index ecb0315ab1e..3c00ffca5d1 100644
--- a/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   ConnectDisconnect.h
-//
-// = DESCRIPTION
-//   Test connect-disconnect methods of Notify.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   ConnectDisconnect.h
+ *
+ *  $Id$
+ *
+ * Test connect-disconnect methods of Notify.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_CONNECT_DISCONNECT_H
 #define NOTIFY_CONNECT_DISCONNECT_H
@@ -31,9 +31,12 @@
 
 class ConnectDisconnect;
 
+/**
+ * @class CD_Entity
+ The entity that connects/disconnects.
+ */
 class CD_Entity
 {
-  // The entity that connects/disconnects.
 public:
   CD_Entity (ConnectDisconnect* cd, int id);
   ~CD_Entity ();
@@ -66,64 +69,64 @@ public:
   ConnectDisconnect (void);
   virtual ~ConnectDisconnect ();
 
+  /// Keeps track of how many objects were destroyed.
   void on_entity_destroyed (void);
-  // Keeps track of how many objects were destroyed.
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
+  /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// Check if we got the expected results.
   int check_results (void);
-  // Check if we got the expected results.
 
 protected:
+  /// Create EC.
   void create_EC (void);
-  // Create EC.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Arrays of Consumers.
   TAO_Notify_Tests_PushConsumer** any_consumer_;
   TAO_Notify_Tests_StructuredPushConsumer** structured_consumer_;
   TAO_Notify_Tests_SequencePushConsumer** sequence_consumer_;
-  // Arrays of Consumers.
 
+  /// arrays of Suppliers
   TAO_Notify_Tests_PushSupplier** any_supplier_;
   TAO_Notify_Tests_StructuredPushSupplier** structured_supplier_;
   TAO_Notify_Tests_SequencePushSupplier** sequence_supplier_;
-  // arrays of Suppliers
 
+  /// Count of clients destroyed. for c consumers, s suppliers and for t times.
+  /// this should be (s+c)*t.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
-  // Count of clients destroyed. for c consumers, s suppliers and for t times.
-  // this should be (s+c)*t.
 
   int expected_count_; // (s+c)*t
 
   // = command line params
 
+  /// The number of iterations to connect disconnect.
   int count_;
-  // The number of iterations to connect disconnect.
 
+  /// The number of counsumers to create.
   int consumers_;
-  // The number of counsumers to create.
 
+  /// The number of suppliers to create.
   int suppliers_;
-  // The number of suppliers to create.
 };
 
 /***************************************************************************/
diff --git a/orbsvcs/tests/Notify/Basic/Events.cpp b/orbsvcs/tests/Notify/Basic/Events.cpp
index 2adf54c8439..5ec7883937c 100644
--- a/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "Events.h"
 
-ACE_RCSID (Notify_Tests, Events, "$Id$")
+
 
 /***************************************************************************/
 
diff --git a/orbsvcs/tests/Notify/Basic/Events.h b/orbsvcs/tests/Notify/Basic/Events.h
index cfde51db870..1d60ed55ce0 100644
--- a/orbsvcs/tests/Notify/Basic/Events.h
+++ b/orbsvcs/tests/Notify/Basic/Events.h
@@ -1,18 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Events.h
-//
-// = DESCRIPTION
-//   Test to check if events are received by all 3 types of consumers.
-//   This is intended to be a simple test without any filters with default subscription (all events).
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Events.h
+ *
+ *  $Id$
+ *
+ * Test to check if events are received by all 3 types of consumers.
+ * This is intended to be a simple test without any filters with default subscription (all events).
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_EventS_H
 #define NOTIFY_TESTS_EventS_H
@@ -31,8 +31,8 @@ class Events;
 class Event_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
+  /// Contructor.
   Event_StructuredPushConsumer (Events *test_client);
-  // Contructor.
 
   // = StructuredPushSupplier methods.
   virtual void push_structured_event (
@@ -48,11 +48,11 @@ protected:
 class Event_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier
 {
 public:
+  /// Constructor.
   Event_StructuredPushSupplier (Events * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Event_StructuredPushSupplier (void);
-  // Destructor.
 
 protected:
   Events* test_client_;
@@ -70,49 +70,49 @@ public:
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
 
+  /// Initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // Initialization.
 
+  /// Called when an event is received.
   void on_event_received (void);
-  // Called when an event is received.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// check if we got the expected results.
   int check_results (void);
-  // check if we got the expected results.
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
+  /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
-  // Number of events received so far.
 
   /// Use the default admins.
   int use_default_admin_;
 
+  /// Number of events to send
   int event_count_;
-  // Number of events to send
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer
   TAO_Notify_Tests_StructuredPushConsumer* consumer_;
-  // Consumer
 
+  /// Supplier
   TAO_Notify_Tests_StructuredPushSupplier* supplier_;
-  // Supplier
 
 private:
   friend class Event_StructuredPushSupplier;
diff --git a/orbsvcs/tests/Notify/Basic/Filter.cpp b/orbsvcs/tests/Notify/Basic/Filter.cpp
index 754a6e91714..904a3a3a3f5 100644
--- a/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "Filter.h"
 
-ACE_RCSID (Notify_Tests, Filter, "$Id$")
+
 
 Filter::Filter (void)
   : event_count_ (5)
diff --git a/orbsvcs/tests/Notify/Basic/Filter.h b/orbsvcs/tests/Notify/Basic/Filter.h
index d12e786693d..bb862c1830a 100644
--- a/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/orbsvcs/tests/Notify/Basic/Filter.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Filter.h
-//
-// = DESCRIPTION
-//   Filter test any supplier to any consumer.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Filter.h
+ *
+ *  $Id$
+ *
+ * Filter test any supplier to any consumer.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_FILTER_H
 #define NOTIFY_TESTS_FILTER_H
@@ -34,16 +34,16 @@ public:
   Filter (void);
   virtual ~Filter (void);
 
+  /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
   /// Run some tests to check the filters.
   void run_filter_test (CosNotifyFilter::FilterAdmin_ptr);
@@ -60,26 +60,26 @@ protected:
   /// The default filter factory.
   CosNotifyFilter::FilterFactory_var ffact_;
 
+  /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
-  // Number of events received so far.
 
+  /// Number of events to send
   int event_count_;
-  // Number of events to send
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer.
   TAO_Notify_Tests_PushConsumer* consumer_;
-  // Consumer.
 
+  /// Supplier.
   TAO_Notify_Tests_PushSupplier* supplier_;
-  // Supplier.
 };
 
 /***************************************************************************/
diff --git a/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 6ca0434e2b7..290f38aded1 100644
--- a/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "IdAssignment.h"
 
-ACE_RCSID (Notify_Tests,
-           IdAssignment,
-           "$Id$")
-
 IdAssignment::IdAssignment (void)
   : iter_ (3),
     ec_count_ (3),
diff --git a/orbsvcs/tests/Notify/Basic/IdAssignment.h b/orbsvcs/tests/Notify/Basic/IdAssignment.h
index d9e97907f28..4efd019fedf 100644
--- a/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   IdAssignment.h
-//
-// = DESCRIPTION
-//   Test to check if ec, admin  are assigned id's correctly.
-//
-// = AUTHORS
-//   Chanaka Liyanaarachchi <chanaka@ociweb.com> and Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   IdAssignment.h
+ *
+ *  $Id$
+ *
+ * Test to check if ec, admin  are assigned id's correctly.
+ *
+ *
+ *  @author Chanaka Liyanaarachchi <chanaka@ociweb.com> and Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDASSIGNMENT_H
 #define IDASSIGNMENT_H
@@ -53,17 +53,17 @@ private:
   // = Data members.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
 
+  /// Number of iterations for the test.
   int iter_;
-  // Number of iterations for the test.
 
+  /// Numbers of EC's to create.
   int ec_count_;
-  // Numbers of EC's to create.
 
+  /// Number of consumer admins to create per ec.
   int consumer_admin_count_;
-  // Number of consumer admins to create per ec.
 
+  /// Number of consumer admins to create per ec.
   int supplier_admin_count_;
-  // Number of consumer admins to create per ec.
 };
 
 #endif /* IDASSIGNMENT_H */
diff --git a/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 4bb5813dbb1..2de58de6f29 100644
--- a/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -9,10 +9,6 @@
 
 #include "LifeCycle.h"
 
-ACE_RCSID (Notify_Tests,
-           LifeCycle,
-           "$Id$")
-
 LifeCycle::LifeCycle (void)
   : count_ (10)
 {
diff --git a/orbsvcs/tests/Notify/Basic/LifeCycle.h b/orbsvcs/tests/Notify/Basic/LifeCycle.h
index 87150f7377c..93cbd9a134d 100644
--- a/orbsvcs/tests/Notify/Basic/LifeCycle.h
+++ b/orbsvcs/tests/Notify/Basic/LifeCycle.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   LifeCycle.h
-//
-// = DESCRIPTION
-//   Test to check it ec and admin objects are destroyed.
-//
-// = AUTHOR
-//   Chanaka Liyanaarachchi <chanaka@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   LifeCycle.h
+ *
+ *  $Id$
+ *
+ * Test to check it ec and admin objects are destroyed.
+ *
+ *
+ *  @author Chanaka Liyanaarachchi <chanaka@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_LIFECYCLETST_H
 #define NOTIFY_LIFECYCLETST_H
@@ -41,8 +41,8 @@ private:
    CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
    CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
 
+  /// Number of times to create destroy.
   int count_;
-  // Number of times to create destroy.
 };
 
 #endif /* NOTIFY_LIFECYCLETST_H */
diff --git a/orbsvcs/tests/Notify/Basic/Makefile.am b/orbsvcs/tests/Notify/Basic/Makefile.am
deleted file mode 100644
index 19f235d8ea3..00000000000
--- a/orbsvcs/tests/Notify/Basic/Makefile.am
+++ /dev/null
@@ -1,554 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Basic_Notify_AdminProperties.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += AdminProperties
-
-AdminProperties_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-AdminProperties_SOURCES = \
-  AdminProperties.cpp \
-  AdminProperties.h
-
-AdminProperties_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-AdminProperties_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_ConnectDisconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ConnectDisconnect
-
-ConnectDisconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ConnectDisconnect_SOURCES = \
-  ConnectDisconnect.cpp \
-  ConnectDisconnect.h
-
-ConnectDisconnect_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-ConnectDisconnect_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Events.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Events
-
-Events_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Events_SOURCES = \
-  Events.cpp \
-  Events.h
-
-Events_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Events_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Filter.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Filter
-
-Filter_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Filter_SOURCES = \
-  Filter.cpp \
-  Filter.h
-
-Filter_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Filter_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_IdAssignment.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += IdAssignment
-
-IdAssignment_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-IdAssignment_SOURCES = \
-  IdAssignment.cpp \
-  IdAssignment.h
-
-IdAssignment_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-IdAssignment_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_LifeCycle.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += LifeCycle
-
-LifeCycle_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-LifeCycle_SOURCES = \
-  LifeCycle.cpp \
-  LifeCycle.h
-
-LifeCycle_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-LifeCycle_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_MultiTypes.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MultiTypes
-
-MultiTypes_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-MultiTypes_SOURCES = \
-  MultiTypes.cpp \
-  MultiTypes.h
-
-MultiTypes_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-MultiTypes_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Sequence.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence
-
-Sequence_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_SOURCES = \
-  Sequence.cpp \
-  Sequence.h
-
-Sequence_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Simple.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Simple
-
-Simple_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Simple_SOURCES = \
-  Simple.cpp \
-  Simple.h
-
-Simple_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Simple_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Updates.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Updates
-
-Updates_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Updates_SOURCES = \
-  Updates.cpp \
-  Updates.h
-
-Updates_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Updates_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index aebb3cf1a7b..382a27887f1 100644
--- a/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "MultiTypes.h"
 
-ACE_RCSID (Notify_Tests, MultiTypes, "$Id$")
+
 
 //*****************************************************************************************************
 
diff --git a/orbsvcs/tests/Notify/Basic/MultiTypes.h b/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 758913b46df..30b5e3c1154 100644
--- a/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   MultiTypes.h
-//
-// = DESCRIPTION
-//   Test connect-disconnect methods of Notify.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   MultiTypes.h
+ *
+ *  $Id$
+ *
+ * Test connect-disconnect methods of Notify.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_MULTI_TYPES_H
 #define NOTIFY_MULTI_TYPES_H
@@ -92,44 +92,44 @@ public:
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
+  /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// Check if we got the expected results.
   int check_results (void);
-  // Check if we got the expected results.
 
 protected:
   // Wait to receive events.
   void wait_for_all_consumers (int expected_count_per_consumer);
 
+  /// Create EC.
   void create_EC (void);
-  // Create EC.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumers.
   TAO_Notify_Tests_PushConsumer* any_consumer_;
   TAO_Notify_Tests_StructuredPushConsumer* structured_consumer_;
   TAO_Notify_Tests_SequencePushConsumer* sequence_consumer_;
-  // Consumers.
 
+  /// Suppliers
   TAO_Notify_Tests_PushSupplier* any_supplier_;
   TAO_Notify_Tests_StructuredPushSupplier* structured_supplier_;
   TAO_Notify_Tests_SequencePushSupplier* sequence_supplier_;
-  // Suppliers
 
   // Count of Any events received;
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> any_event_count_;
diff --git a/orbsvcs/tests/Notify/Basic/Sequence.cpp b/orbsvcs/tests/Notify/Basic/Sequence.cpp
index ef04ba96627..6b345e31871 100644
--- a/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -6,7 +6,7 @@
 #include "tao/debug.h"
 #include "Sequence.h"
 
-ACE_RCSID (Notify_Tests, Sequence, "$Id$")
+
 
 /***************************************************************************/
 
diff --git a/orbsvcs/tests/Notify/Basic/Sequence.h b/orbsvcs/tests/Notify/Basic/Sequence.h
index 1a049c46c81..1fc734e51a8 100644
--- a/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Events.h
-//
-// = DESCRIPTION
-//   Test Sequence support in Notification.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Sequence.h
+ *
+ *  $Id$
+ *
+ * Test Sequence support in Notification.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_SEQUENCE_H
 #define NOTIFY_TESTS_SEQUENCE_H
@@ -47,11 +47,11 @@ protected:
 class SequencePushSupplier : public TAO_Notify_Tests_SequencePushSupplier
 {
 public:
+  /// Constructor.
   SequencePushSupplier (Sequence * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~SequencePushSupplier (void);
-  // Destructor.
 
 protected:
   Sequence* test_client_;
@@ -69,28 +69,28 @@ public:
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
 
+  /// Initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // Initialization.
 
+  /// Called when an event is received.
   void on_event_received (void);
-  // Called when an event is received.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// check if we got the expected results.
   int check_results (void);
-  // check if we got the expected results.
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
+  /// Number of events to send
   int event_count_;
-  // Number of events to send
 
   /// Batch size send by supplier.
   CORBA::ULong supplier_batch_size_;
@@ -107,20 +107,20 @@ protected:
 
   ACE_Time_Value consumer_delay_;
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer
   TAO_Notify_Tests_SequencePushConsumer* consumer_;
-  // Consumer
 
+  /// Supplier
   TAO_Notify_Tests_SequencePushSupplier* supplier_;
-  // Supplier
 
 private:
   friend class SequencePushSupplier;
diff --git a/orbsvcs/tests/Notify/Basic/Simple.cpp b/orbsvcs/tests/Notify/Basic/Simple.cpp
index 919c22d568f..5cc9b2df6ec 100644
--- a/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "Simple.h"
 
-ACE_RCSID (Notify_Tests, Simple, "$Id$")
+
 
 //***************************************************************************
 
diff --git a/orbsvcs/tests/Notify/Basic/Simple.h b/orbsvcs/tests/Notify/Basic/Simple.h
index 697b0762258..1c6c8b04d9f 100644
--- a/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/orbsvcs/tests/Notify/Basic/Simple.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Simple_Test.h
-//
-// = DESCRIPTION
-//   Simple test any supplier to any consumer.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Simple.h
+ *
+ *  $Id$
+ *
+ * Simple test any supplier to any consumer.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_SIMPLE_H
 #define NOTIFY_TESTS_SIMPLE_H
@@ -32,8 +32,8 @@ class Simple_Test;
 class Event_AnyPushConsumer : public TAO_Notify_Tests_PushConsumer
 {
 public:
+  /// Contructor.
   Event_AnyPushConsumer (Simple_Test *test_client);
-  // Contructor.
 
   // = PushSupplier methods
   virtual void push (
@@ -49,11 +49,11 @@ protected:
 class Event_AnyPushSupplier : public TAO_Notify_Tests_PushSupplier
 {
 public:
+  /// Constructor.
   Event_AnyPushSupplier (Simple_Test * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Event_AnyPushSupplier (void);
-  // Destructor.
 
 protected:
   Simple_Test* test_client_;
@@ -71,46 +71,46 @@ public:
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
 
+  /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Called when an event is received.
   void on_event_received (void);
-  // Called when an event is received.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// check if we got the expected results.
   int check_results (void);
-  // check if we got the expected results.
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
+  /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
-  // Number of events received so far.
 
+  /// Number of events to send
   int event_count_;
-  // Number of events to send
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer.
   TAO_Notify_Tests_PushConsumer* consumer_;
-  // Consumer.
 
+  /// Supplier.
   TAO_Notify_Tests_PushSupplier* supplier_;
-  // Supplier.
 
 private:
   friend class Event_AnyPushSupplier;
diff --git a/orbsvcs/tests/Notify/Basic/Updates.cpp b/orbsvcs/tests/Notify/Basic/Updates.cpp
index 426f2f2525e..cb23b49b2b2 100644
--- a/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "Updates.h"
 
-ACE_RCSID (Notify_Tests, Updates, "$Id$")
+
 
 Updates_StructuredPushConsumer::Updates_StructuredPushConsumer (Updates *test_client)
   : test_client_ (test_client)
diff --git a/orbsvcs/tests/Notify/Basic/Updates.h b/orbsvcs/tests/Notify/Basic/Updates.h
index 8dc9988396c..238a4d22a6c 100644
--- a/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/orbsvcs/tests/Notify/Basic/Updates.h
@@ -1,18 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Updates.h
-//
-// = DESCRIPTION
-//   Test to check if <offer_change> and <subscription_change> messages are
-//   received correctly.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Updates.h
+ *
+ *  $Id$
+ *
+ * Test to check if <offer_change> and <subscription_change> messages are
+ * received correctly.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_UPDATES_H
 #define NOTIFY_TESTS_UPDATES_H
@@ -31,12 +31,12 @@ class Updates;
 class Updates_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
+  /// Contructor.
   Updates_StructuredPushConsumer (Updates *test_client);
-  // Contructor.
 
+  /// Offer change is conveyed here.
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
                              const CosNotification::EventTypeSeq & removed);
-  // Offer change is conveyed here.
 
 protected:
   Updates * test_client_;
@@ -47,17 +47,17 @@ protected:
 class Updates_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier
 {
 public:
+  /// Constructor.
   Updates_StructuredPushSupplier (Updates * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Updates_StructuredPushSupplier ();
-  // Destructor.
 
+  /// Subscription change is conveyed here.
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
     );
-  // Subscription change is conveyed here.
 
 protected:
   Updates* test_client_;
@@ -72,11 +72,11 @@ public:
   Updates (void);
   virtual ~Updates ();
 
+  /// initialization.
   int init (int argc, ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
   /// print_event_types
   void print_event_types (const CosNotification::EventTypeSeq &types);
@@ -88,8 +88,8 @@ public:
   void wait_for_updates (int expected_added, int expected_removed);
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
   /// Helper to add types.
   void add_type (CosNotification::EventTypeSeq& type_seq, const char* type);
@@ -110,23 +110,23 @@ protected:
   int added_count_;
 
   /// Count of removed updates received
+  /// Check if these are equal to <update_count_> at the end of the test.
   int removed_count_;
-  // Check if these are equal to <update_count_> at the end of the test.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer
   TAO_Notify_Tests_StructuredPushConsumer* consumer_;
-  // Consumer
 
+  /// Supplier
   TAO_Notify_Tests_StructuredPushSupplier* supplier_;
-  // Supplier
 
 private:
   friend class Updates_StructuredPushSupplier;
diff --git a/orbsvcs/tests/Notify/Basic/notify.mt.conf b/orbsvcs/tests/Notify/Basic/notify.mt.conf
index 1ed64ed8d98..c29d66b76e5 100644
--- a/orbsvcs/tests/Notify/Basic/notify.mt.conf
+++ b/orbsvcs/tests/Notify/Basic/notify.mt.conf
@@ -1,2 +1,3 @@
 ##$Id$
+
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 2"
diff --git a/orbsvcs/tests/Notify/Basic/notify.reactive.conf b/orbsvcs/tests/Notify/Basic/notify.reactive.conf
index ca5144bd072..dff4aaaa23e 100644
--- a/orbsvcs/tests/Notify/Basic/notify.reactive.conf
+++ b/orbsvcs/tests/Notify/Basic/notify.reactive.conf
@@ -1,2 +1,3 @@
 ##$Id$
+
 static Notify_Default_Event_Manager_Objects_Factory ""
diff --git a/orbsvcs/tests/Notify/Basic/notify.rt.conf b/orbsvcs/tests/Notify/Basic/notify.rt.conf
index 50faf80e5ee..66d57097409 100644
--- a/orbsvcs/tests/Notify/Basic/notify.rt.conf
+++ b/orbsvcs/tests/Notify/Basic/notify.rt.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
diff --git a/orbsvcs/tests/Notify/Basic/run_test.pl b/orbsvcs/tests/Notify/Basic/run_test.pl
index d932d53a3d1..18bb43b7e11 100755
--- a/orbsvcs/tests/Notify/Basic/run_test.pl
+++ b/orbsvcs/tests/Notify/Basic/run_test.pl
@@ -88,7 +88,7 @@ else {
     @test_configs = @ARGV;
 }
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-o $ns_nsiorfile");
 
 $NS_status = $NS->Spawn ();
@@ -130,7 +130,7 @@ for $config (@test_configs) {
 
     my $nfs_config = $nfs->LocalFile ($config);
 
-    $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+    $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                                 ' '.$dispatch_opt.' '.
                                 "-ORBInitRef NameService=file://$nfs_nsiorfile " .
                                 "-IORoutput $nfs_nfsiorfile " .
diff --git a/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
index 77fa68d147b..fd4cf5dd974 100755
--- a/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
+++ b/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
@@ -88,7 +88,7 @@ else {
     @test_configs = @ARGV;
 }
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-o $ns_nsiorfile");
 
 $NS_status = $NS->Spawn ();
@@ -130,7 +130,7 @@ for $config (@test_configs) {
 
     my $nfs_config = $nfs->LocalFile ($config);
 
-    $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+    $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                                 ' '.$dispatch_opt.' '.
                                 "-ORBInitRef NameService=file://$nfs_nsiorfile " .
                                 "-IORoutput $nfs_nfsiorfile " .
diff --git a/orbsvcs/tests/Notify/Blocking/Makefile.am b/orbsvcs/tests/Notify/Blocking/Makefile.am
deleted file mode 100644
index 38bdbffa469..00000000000
--- a/orbsvcs/tests/Notify/Blocking/Makefile.am
+++ /dev/null
@@ -1,165 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Blocking_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Blocking_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Blocking_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
index afc3eff9095..4a57491090c 100644
--- a/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index 2b96ae1eb14..575f3ef3a49 100644
--- a/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -65,7 +65,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 5950b53d657..9b566741411 100644
--- a/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -103,7 +103,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Blocking/notify.conf b/orbsvcs/tests/Notify/Blocking/notify.conf
index f15e4999f71..4b52ccb153a 100644
--- a/orbsvcs/tests/Notify/Blocking/notify.conf
+++ b/orbsvcs/tests/Notify/Blocking/notify.conf
@@ -1,7 +1,7 @@
 ## $Id$
 #
 ## Load the static Cos Notification Service
-## The BlockingPolicy requires the notify service to use the following settings to prevent 
+## The BlockingPolicy requires the notify service to use the following settings to prevent
 ## dispatch threads from handling supplier-side requests. This would allow dispatch threads
 ## to block on the condition variables used for the blocking feature, which would prevent
 ## the thread from handling the consumer response, resulting in deadlock.
diff --git a/orbsvcs/tests/Notify/Blocking/run_test.pl b/orbsvcs/tests/Notify/Blocking/run_test.pl
index 920ae28ce41..c8049870a7b 100755
--- a/orbsvcs/tests/Notify/Blocking/run_test.pl
+++ b/orbsvcs/tests/Notify/Blocking/run_test.pl
@@ -45,10 +45,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am
deleted file mode 100644
index 165bfe4f544..00000000000
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am
+++ /dev/null
@@ -1,165 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1385_Regression_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Bug_1385_Regression_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1385_Regression_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
index cc1f4b56d33..3b2206a0a7c 100644
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
@@ -56,7 +56,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
             argv [0]),
             -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
index 2ce242dca15..320d9f2849f 100644
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
@@ -105,7 +105,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf b/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf
index f15e4999f71..4b52ccb153a 100644
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf
+++ b/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf
@@ -1,7 +1,7 @@
 ## $Id$
 #
 ## Load the static Cos Notification Service
-## The BlockingPolicy requires the notify service to use the following settings to prevent 
+## The BlockingPolicy requires the notify service to use the following settings to prevent
 ## dispatch threads from handling supplier-side requests. This would allow dispatch threads
 ## to block on the condition variables used for the blocking feature, which would prevent
 ## the thread from handling the consumer response, resulting in deadlock.
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl
index a3dfdb4af87..3bcef988967 100755
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl
@@ -45,10 +45,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/common.h b/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
index 3520155bf02..4ba52e0064b 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
@@ -5,7 +5,7 @@
 #include <iostream>
 const char *ior = "file://ecf.ior";
 
-CosNotifyChannelAdmin::EventChannel_var 
+CosNotifyChannelAdmin::EventChannel_var
 get_event_channel(CORBA::ORB_ptr orb)
 
 {
@@ -20,8 +20,8 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if (CORBA::is_nil(obj.in ()))
   {
-    std::cerr << "Bad ec_fact.ior " << std::endl; 
-    ACE_OS::exit (1);    
+    std::cerr << "Bad ec_fact.ior " << std::endl;
+    ACE_OS::exit (1);
   }
 
   CosNotifyChannelAdmin::EventChannelFactory_var factory =
@@ -40,20 +40,20 @@ get_event_channel(CORBA::ORB_ptr orb)
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during get_all_channels: " 
+    std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
     throw;
   }
 
   if( channelIdSeq->length() == 0 )
   {
-    try 
+    try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during find_channel: " 
+      std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
       throw;
     }
@@ -65,14 +65,14 @@ get_event_channel(CORBA::ORB_ptr orb)
     }
     catch (CosNotifyChannelAdmin::ChannelNotFound& )
     {
-      std::cerr << "ChannelNotFound: " 
+      std::cerr << "ChannelNotFound: "
         << channelIdSeq[0] << std::endl;
       throw;
     }
 
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during get_event_channel: " 
+      std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
       throw;
     }
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
index ed839a353d0..571c229299c 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
@@ -9,7 +9,7 @@ int runtime = 5; //sec
 
 
 namespace CosNotifyCommImpl{
-  class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer 
+  class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer
   {
   public:
     StructuredPushConsumer () : received_ (false) {};
@@ -20,24 +20,24 @@ namespace CosNotifyCommImpl{
     {
       received_ = true;
       std::cout << "Received an event...," << std::endl;
-      std::cout << "event.header.fixed_header.event_type.domain_name = " 
-        << event.header.fixed_header.event_type.domain_name 
+      std::cout << "event.header.fixed_header.event_type.domain_name = "
+        << event.header.fixed_header.event_type.domain_name
         << std::endl;
-      std::cout << "event.header.fixed_header.event_type.type_name = " 
+      std::cout << "event.header.fixed_header.event_type.type_name = "
         << event.header.fixed_header.event_type.type_name
         << std::endl;
 
     };
 
     void disconnect_structured_push_consumer()
-    {};         
+    {};
 
     void offer_change (
       const CosNotification::EventTypeSeq &,
       const CosNotification::EventTypeSeq &)
     {};
 
-    bool received_events () 
+    bool received_events ()
     {
       return this->received_;
     };
@@ -61,8 +61,8 @@ int parse_args (int argc, ACE_TCHAR *argv[])
 
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("usage:  %s -t <runtime>\n"), 
-                         argv [0]), 
+                         ACE_TEXT ("usage:  %s -t <runtime>\n"),
+                         argv [0]),
                         -1);
   }
 
@@ -81,7 +81,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     PortableServer::POA_var root_poa = PortableServer::POA::_narrow(poa_obj.in());
 
     poa_manager = root_poa->the_POAManager();
-    
+
     if (parse_args (argc, argv) != 0)
       return 1;
 
@@ -92,7 +92,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Consumer
-    CosNotifyComm::StructuredPushConsumer_var spc = 
+    CosNotifyComm::StructuredPushConsumer_var spc =
       CosNotifyComm::StructuredPushConsumer::_nil();
 
     CosNotifyCommImpl::StructuredPushConsumer *pImpl_spc = new CosNotifyCommImpl::StructuredPushConsumer;
@@ -128,7 +128,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
     //Attaching a filter to pps
-    CosNotifyFilter::FilterFactory_var dff = 
+    CosNotifyFilter::FilterFactory_var dff =
       ec->default_filter_factory();
 
     ACE_ASSERT(!CORBA::is_nil(dff.in()));
@@ -150,7 +150,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     constraints[0].constraint_expr = CORBA::string_dup(
       "");
 
-    filter->add_constraints(constraints);                                       
+    filter->add_constraints(constraints);
 
     pps->add_filter(filter.in());
 
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf b/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf
index 8c29f3485b8..8a700d63f50 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory()  "-save_base_path ./persistency.notif  -load_base_path  ./persistency.notif  -backup_count 1 -v"
 
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
index 538dcf9abe0..8c3ac52b03a 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -8,7 +8,7 @@
 
 const char *ior = "file://ecf.ior";
 
-CosNotifyChannelAdmin::EventChannel_var 
+CosNotifyChannelAdmin::EventChannel_var
 get_event_channel(CORBA::ORB_ptr orb)
 
 {
@@ -25,7 +25,7 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if (CORBA::is_nil(obj.in ()))
   {
-    std::cerr << "Bad ec_fact.ior " << std::endl; 
+    std::cerr << "Bad ec_fact.ior " << std::endl;
     exit(1);
   }
 
@@ -46,7 +46,7 @@ get_event_channel(CORBA::ORB_ptr orb)
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during get_all_channels: " 
+    std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
     exit(1);
   }
@@ -54,13 +54,13 @@ get_event_channel(CORBA::ORB_ptr orb)
   if( channelIdSeq->length() == 0 )
   {
 
-    try 
+    try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during find_channel: " 
+      std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
       exit(1);
     }
@@ -72,14 +72,14 @@ get_event_channel(CORBA::ORB_ptr orb)
     }
     catch (CosNotifyChannelAdmin::ChannelNotFound&)
     {
-      std::cerr << "ChannelNotFound: " 
+      std::cerr << "ChannelNotFound: "
         << channelIdSeq[0] << std::endl;
       exit(1);
     }
 
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during get_event_channel: " 
+      std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
       exit(1);
     }
@@ -89,9 +89,9 @@ get_event_channel(CORBA::ORB_ptr orb)
   return ec._retn();
 }
 
-   
-void match_structure_test (const CosNotifyFilter::Filter_var& filter, 
-                           const CosNotification::StructuredEvent& event, 
+
+void match_structure_test (const CosNotifyFilter::Filter_var& filter,
+                           const CosNotification::StructuredEvent& event,
                            bool & expected_result)
 {
   bool bResult = false;
@@ -104,7 +104,7 @@ void match_structure_test (const CosNotifyFilter::Filter_var& filter,
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during match_structured: " 
+    std::cerr << "System exception occurred during match_structured: "
       << se << std::endl;
     exit(1);
   }
@@ -141,22 +141,22 @@ void update_constraints (const CosNotifyFilter::Filter_var& filter,
     constraints[0].event_types = event_types;
     constraints[0].constraint_expr = CORBA::string_dup("");
 
-    CosNotifyFilter::ConstraintInfoSeq_var cons_info 
-      = filter->add_constraints(constraints);                                   
+    CosNotifyFilter::ConstraintInfoSeq_var cons_info
+      = filter->add_constraints(constraints);
 
     std::cout << "Constructing a filter..." << std::endl;
 
     for (CORBA::ULong i = 0; i < event_types.length(); ++i)
     {
-      std::cout << "\tevent_types[" << i << "].domain_name=" 
+      std::cout << "\tevent_types[" << i << "].domain_name="
         << event_types[i].domain_name
         << std::endl;
-      std::cout << "\tevent_types[" << i << "].type_name=" 
+      std::cout << "\tevent_types[" << i << "].type_name="
         << event_types[i].type_name
         << std::endl;
     }
 
-    std::cout << "\tIts constraint =" 
+    std::cout << "\tIts constraint ="
       << constraints[0].constraint_expr.in ()
       << std::endl;
 }
@@ -182,7 +182,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Attaching a filter to pps
-    CosNotifyFilter::FilterFactory_var dff = 
+    CosNotifyFilter::FilterFactory_var dff =
       ec->default_filter_factory();
 
     ACE_ASSERT(!CORBA::is_nil(dff.in()));
@@ -201,10 +201,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     event.remainder_of_body <<= "";
 
     std::cout << "Constructing a test event" << std::endl;
-    std::cout << "\tIts header.fixed_header.event_type.domain_name=" 
+    std::cout << "\tIts header.fixed_header.event_type.domain_name="
       << event.header.fixed_header.event_type.domain_name
       << std::endl;
-    std::cout << "\tIts header.fixed_header.event_type.type_name=" 
+    std::cout << "\tIts header.fixed_header.event_type.type_name="
       << event.header.fixed_header.event_type.type_name
       << std::endl;
 
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl
index b4fae61a0be..76161b1c493 100755
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl
@@ -45,7 +45,7 @@ if ($#ARGV >= 0 && $ARGV[0] eq '-p') {
     $consumer_runtime = 20;
 }
 
-my $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+my $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                                "-ORBDebugLevel $debug_level ".
                                "-NoNameSvc -IORoutput $nfs_nfsiorfile $svcconf " .
                                "-ORBEndpoint iiop://$host:$port");
@@ -54,7 +54,7 @@ my $CON = $con->CreateProcess ("consumer", "$nts_ref -t $consumer_runtime");
 my $FLT = $flt->CreateProcess ("filter", "$nts_ref");
 
 
-print "\n*********** Starting the Notify_Service  ***********\n\n";
+print "\n*********** Starting the Notify Service  ***********\n\n";
 $NFS_status = $NFS->Spawn ();
 if ($NFS_status != 0) {
     print STDERR "ERROR: Notify Service returned $NFS_status\n";
@@ -90,7 +90,7 @@ if ($CON_status != 0) {
 sleep(5);
 
 if ($persistent_test == 1) {
-    print "*********** Killing the first Notify_Service   ***********\n";
+    print "*********** Killing the first Notify Service   ***********\n";
     $NFS_status = $NFS->TerminateWaitKill ($nfs->ProcessStopWaitInterval());
     if ($NFS_status != 0) {
         print STDERR "ERROR: Notification Service returned $NFS_status\n";
@@ -101,7 +101,7 @@ if ($persistent_test == 1) {
 
     $nfs->DeleteFile ($nfsiorfile);
 
-    print "*********** Starting the second Notify_Service ***********\n";
+    print "*********** Starting the second Notify Service ***********\n";
     print STDERR $NFS->CommandLine (). "\n";
     $NFS_status = $NFS->Spawn ();
     if ($NFS_status != 0) {
@@ -116,7 +116,7 @@ if ($persistent_test == 1) {
         exit 1;
     }
 
-    sleep(5); 
+    sleep(5);
 }
 
 print "\n*********** Starting the notification Supplier ***********\n\n";
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index 5088b562343..96990ac6304 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
 #include "common.h"
-#include "ace/OS.h"
-
 
 namespace CosNotifyCommImpl{
-  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier 
+  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier
   {
   public:
     void disconnect_structured_push_supplier()
     {};
-    void subscription_change( const CosNotification::EventTypeSeq&, 
+    void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
 
@@ -38,7 +36,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Supplier
-    CosNotifyComm::StructuredPushSupplier_var sps = 
+    CosNotifyComm::StructuredPushSupplier_var sps =
       CosNotifyComm::StructuredPushSupplier::_nil();
 
 
@@ -102,17 +100,17 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     event.remainder_of_body <<= "";
 
     std::cout << "Sending a demo event...," << std::endl;
-    std::cout << "event.header.fixed_header.event_type.domain_name = " 
-      << event.header.fixed_header.event_type.domain_name 
+    std::cout << "event.header.fixed_header.event_type.domain_name = "
+      << event.header.fixed_header.event_type.domain_name
       << std::endl;
-    std::cout << "event.header.fixed_header.event_type.type_name = " 
+    std::cout << "event.header.fixed_header.event_type.type_name = "
       << event.header.fixed_header.event_type.type_name
       << std::endl;
 
 
     try{
       ppc->push_structured_event(event);
-    }   
+    }
     catch (CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during push: "
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
index ea848c0f6f5..dabaa4e737f 100644
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
@@ -61,11 +61,11 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
-static CosNotifyFilter::Filter_ptr 
+static CosNotifyFilter::Filter_ptr
 create_proxyFilter (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyFilter::FilterFactory_var ffact =
@@ -100,7 +100,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                     CORBA::NO_MEMORY ());
 
   consumer_1->init (client->root_poa ());
-  
+
   consumer_1->_connect (admin, filter);
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_2415_Regression/Makefile.am
deleted file mode 100644
index 148624d30f0..00000000000
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/Makefile.am
+++ /dev/null
@@ -1,161 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2415_Regression.am
-
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Bug_2415_Regression.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Notify_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Push_Consumer.h
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2415_Regression.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Push_Consumer.h
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.h b/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.h
index 0599cf07acc..418a73fd358 100644
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_PUSH_CONSUMER_H
 #define TAO_NOTIFY_PUSH_CONSUMER_H
 #include "Notify_StructuredPushConsumer.h"
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
index d033f457c44..dcff65c1ebd 100644
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
@@ -91,7 +91,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
     case 'o':
       ior_output_file = get_opts.optarg;
       break;
- 
+
     case 'd':
       domain = get_opts.optarg;
       break;
@@ -105,7 +105,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl
index c2db939f062..628d56e77ea 100755
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl
@@ -48,10 +48,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                           " -ORBEndpoint iiop://$ns_host:$ns_port");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=corbaloc::" .
                             "$ns_host:$ns_port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
@@ -212,7 +212,7 @@ $nfs->DeleteFile ($nfsiorfile);
 
 
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=corbaloc::" .
                             "$ns_host:$ns_port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp b/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
index 5c468af3148..8657a7df797 100644
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
@@ -57,7 +57,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am
deleted file mode 100644
index f5ccede2003..00000000000
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am
+++ /dev/null
@@ -1,165 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2561_Regression_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Bug_2561_Regression_Ntf_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Notify_Push_Consumer.cpp \
-  goC.cpp \
-  Notify_Push_Consumer.h
-
-Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2561_Regression_Ntf_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Push_Consumer.h
-
-Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.h b/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.h
index c4a675b8f94..00158ec1f23 100644
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_PUSH_CONSUMER_H
 #define TAO_NOTIFY_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp b/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
index 3e686e7e445..956e6538775 100644
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
@@ -106,7 +106,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl
index 89adc2131a9..b1a0704fbc5 100755
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl
@@ -49,10 +49,10 @@ $sup->DeleteFile ($supiorfile);
 $con1->DeleteFile ($supiorfile);
 $con2->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Bug_2926_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_2926_Regression/Makefile.am
deleted file mode 100644
index 7ee7f0b5e7a..00000000000
--- a/orbsvcs/tests/Notify/Bug_2926_Regression/Makefile.am
+++ /dev/null
@@ -1,97 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2926_Regression_Lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_LTLIBRARIES = libbug2926.la
-
-libbug2926_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DBUG2926_BUILD_DLL
-
-libbug2926_la_SOURCES = \
-  DllORB.cpp
-
-noinst_HEADERS = \
-  DllORB.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2926_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  server.cpp \
-  DllORB.h \
-  bug2926_export.h
-
-server_LDADD = \
-  libbug2926.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
index c4bdf91925c..5fc7d89a1f8 100644
--- a/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
@@ -29,17 +29,16 @@ ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE(
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -69,7 +68,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_CosNotify_Service * p_notifyService =
@@ -105,7 +105,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -115,9 +116,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am
deleted file mode 100644
index 3b0cea80a90..00000000000
--- a/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3252_Regression_Lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_LTLIBRARIES = libBug_3252.la
-
-libBug_3252_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DBUG_3252_REGRESSION_BUILD_DLL
-
-libBug_3252_la_SOURCES = \
-  DllOrb.cpp
-
-noinst_HEADERS = \
-  DllOrb.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3252_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  server.cpp \
-  DllOrb.h \
-  bug_3252_export.h
-
-server_LDADD = \
-  libBug_3252.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index 5f6a4383598..7d3320078be 100644
--- a/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "ace/ARGV.h"
-#include "ace/OS.h"
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 
diff --git a/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl
index 2c7ea9306ad..68621bd68c7 100755
--- a/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl
@@ -37,12 +37,12 @@ $server2->DeleteFile($ior2file);
 $hostname = $server1->HostName ();
 $port = $server1->RandomPort ();
 
-$SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndpoint iiop://$hostname:$port " .
                               "-o $server1_ior1file");
 
-$SV2 = $server2->CreateProcess ("../../../Notify_Service/Notify_Service",
+$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBInitRef NameService=iioploc://$hostname:$port/NameService " .
                               "-IORoutput $server2_ior2file " .
diff --git a/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
index 33d43fe2910..d25ac609f5a 100644
--- a/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
@@ -29,17 +29,16 @@ ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE(
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -68,7 +67,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_Notify_Service_Driver * p_notifyService =
@@ -88,7 +88,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -98,9 +99,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp b/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
index efd2bf5bffc..ad64a1153a1 100644
--- a/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
@@ -33,12 +33,12 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
           name.length (1);
           name[0].id = CORBA::string_dup ("Channel1");
           CORBA::Object_var obj1 = naming->resolve (name);
-          
+
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Successfully retrieved Challel1\n")));
 
           name[0].id = CORBA::string_dup ("Channel2");
           CORBA::Object_var obj2 = naming->resolve (name);
-          
+
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Successfully retrieved Challel2\n")));
         }
     }
diff --git a/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl
index c21727fe388..8e22b4e2ccb 100755
--- a/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl
@@ -41,7 +41,7 @@ $hostname = $server1->HostName ();
 $port = $server1->RandomPort ();
 
 
-$SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndpoint iiop://$hostname:$port " .
                               "-o $server1_ior1file");
diff --git a/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
index d17740078c4..e1f8cf2af79 100644
--- a/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
@@ -35,11 +35,11 @@ parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("h:p:o:"));
   int c;
-  
+
   ACE_TCHAR *hostname = 0;
   ACE_TCHAR *port = 0;
   ACE_TCHAR *ior_file = 0;
-  
+
   while ((c = get_opts ()) != -1)
     switch (c)
       {
@@ -52,14 +52,14 @@ parse_args (int argc, ACE_TCHAR *argv[])
       case 'o':
         ior_file = get_opts.opt_arg ();
         break;
-        
+
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
            "usage:  %s "
            "-h <hostname> "
            "-p <port> "
-           "-o <ior> "           
+           "-o <ior> "
            "\n",
            argv [0]),-1);
       }
@@ -69,7 +69,7 @@ if ( hostname == 0 || port == 0 || ior_file == 0){
            "usage:  %s "
            "-h <hostname> "
            "-p <port> "
-           "-o <ior> "           
+           "-o <ior> "
            "\n",
            argv [0]),-1);
 }
@@ -84,22 +84,21 @@ ACE_OS::sprintf(scpc_loadOrb, str,  hostname, port);
 
 return 0;
 }
-                                                                
+
 
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -128,7 +127,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_Notify_Service_Driver * p_notifyService =
@@ -148,7 +148,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -158,7 +159,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
 
@@ -168,7 +170,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) main - entered\n")
   ));
-  
+
   if (parse_args (argc, argv) != 0)
         return 1;
 
diff --git a/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
index cd124d8fed8..8a922af1a48 100644
--- a/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
@@ -38,17 +38,16 @@ ACE_TCHAR const * const scpc_unloadNameService = ACE_REMOVE_SERVICE_DIRECTIVE("t
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -77,13 +76,15 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNameService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done. Result: <%d>\n"),
+    result
   ));
 
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -98,7 +99,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -108,7 +110,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNameService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NameService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NameService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -118,9 +121,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
index 22b8f0329ef..6434be8a632 100644
--- a/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
@@ -29,17 +29,16 @@ ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE(
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -68,7 +67,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_Notify_Service_Driver * p_notifyService =
@@ -88,7 +88,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -98,9 +99,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Notify/Bug_3688_Regression/common.h b/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
index 3520155bf02..4ba52e0064b 100755
--- a/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
+++ b/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
@@ -5,7 +5,7 @@
 #include <iostream>
 const char *ior = "file://ecf.ior";
 
-CosNotifyChannelAdmin::EventChannel_var 
+CosNotifyChannelAdmin::EventChannel_var
 get_event_channel(CORBA::ORB_ptr orb)
 
 {
@@ -20,8 +20,8 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if (CORBA::is_nil(obj.in ()))
   {
-    std::cerr << "Bad ec_fact.ior " << std::endl; 
-    ACE_OS::exit (1);    
+    std::cerr << "Bad ec_fact.ior " << std::endl;
+    ACE_OS::exit (1);
   }
 
   CosNotifyChannelAdmin::EventChannelFactory_var factory =
@@ -40,20 +40,20 @@ get_event_channel(CORBA::ORB_ptr orb)
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during get_all_channels: " 
+    std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
     throw;
   }
 
   if( channelIdSeq->length() == 0 )
   {
-    try 
+    try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during find_channel: " 
+      std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
       throw;
     }
@@ -65,14 +65,14 @@ get_event_channel(CORBA::ORB_ptr orb)
     }
     catch (CosNotifyChannelAdmin::ChannelNotFound& )
     {
-      std::cerr << "ChannelNotFound: " 
+      std::cerr << "ChannelNotFound: "
         << channelIdSeq[0] << std::endl;
       throw;
     }
 
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during get_event_channel: " 
+      std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
       throw;
     }
diff --git a/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp b/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
index fd08aa2024c..9ab2f4ee5c7 100755
--- a/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
@@ -9,7 +9,7 @@ int runtime = 5; //sec
 
 
 namespace CosNotifyCommImpl{
-  class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer 
+  class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer
   {
   public:
     StructuredPushConsumer () : received_ (false) {};
@@ -20,23 +20,23 @@ namespace CosNotifyCommImpl{
     {
       received_ = true;
       std::cout << "Received an event...," << std::endl;
-      std::cout << "event.header.fixed_header.event_type.domain_name = " 
-        << event.header.fixed_header.event_type.domain_name 
+      std::cout << "event.header.fixed_header.event_type.domain_name = "
+        << event.header.fixed_header.event_type.domain_name
         << std::endl;
-      std::cout << "event.header.fixed_header.event_type.type_name = " 
+      std::cout << "event.header.fixed_header.event_type.type_name = "
         << event.header.fixed_header.event_type.type_name
         << std::endl;
     };
 
     void disconnect_structured_push_consumer()
-    {};         
+    {};
 
     void offer_change (
       const CosNotification::EventTypeSeq &,
       const CosNotification::EventTypeSeq &)
     {};
 
-    bool received_events () 
+    bool received_events ()
     {
       return this->received_;
     };
@@ -60,8 +60,8 @@ int parse_args (int argc, ACE_TCHAR *argv[])
 
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("usage:  %s -t <runtime>\n"), 
-                         argv [0]), 
+                         ACE_TEXT ("usage:  %s -t <runtime>\n"),
+                         argv [0]),
                         -1);
   }
 
@@ -80,7 +80,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     PortableServer::POA_var root_poa = PortableServer::POA::_narrow(poa_obj.in());
 
     poa_manager = root_poa->the_POAManager();
-    
+
     if (parse_args (argc, argv) != 0)
       return 1;
 
@@ -91,7 +91,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Consumer
-    CosNotifyComm::StructuredPushConsumer_var spc = 
+    CosNotifyComm::StructuredPushConsumer_var spc =
       CosNotifyComm::StructuredPushConsumer::_nil();
 
     CosNotifyCommImpl::StructuredPushConsumer *pImpl_spc = new CosNotifyCommImpl::StructuredPushConsumer;
@@ -127,7 +127,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
     //Attaching a filter to pps
-    CosNotifyFilter::FilterFactory_var dff = 
+    CosNotifyFilter::FilterFactory_var dff =
       ec->default_filter_factory();
 
     ACE_ASSERT(!CORBA::is_nil(dff.in()));
@@ -149,7 +149,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     constraints[0].constraint_expr = CORBA::string_dup(
       "$data == 1 or $data == 2 or $data == 4");
 
-    filter->add_constraints(constraints);                                       
+    filter->add_constraints(constraints);
 
     pps->add_filter(filter.in());
 
@@ -158,7 +158,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     std::cout << "The filter's event_types[0].type_name = " <<  event_types[0].type_name << std::endl;
     std::cout << "The filter's event_types[1].domain_name = " <<  event_types[1].domain_name << std::endl;
     std::cout << "The filter's event_types[1].type_name = " <<  event_types[1].type_name << std::endl;
-    std::cout << "The filter's constraint_expr=" << constraints[0].constraint_expr << std::endl; 
+    std::cout << "The filter's constraint_expr=" << constraints[0].constraint_expr << std::endl;
 
     //Connecting a Supplier to a Proxy Consumer
     try
@@ -185,7 +185,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     if (pImpl_spc->received_events ())
     {
       //Consumer should not receive any events as the user defined constraint takes
-      //effect. 
+      //effect.
       std::cerr << "Test failed - should not receive test events." << std::endl;
       return 1;
     }
diff --git a/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl
index e2e8a36d14f..868bb9bcb7e 100755
--- a/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl
@@ -34,7 +34,7 @@ $server1->DeleteFile($ior1file);
 $hostname = $server1->HostName ();
 $port = $server1->RandomPort ();
 
-$SV1 = $server1->CreateProcess ("../../../Notify_Service/Notify_Service",
+$SV1 = $server1->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                               "-ORBdebuglevel $debug_level " .
                               "-NoNameSvc -IORoutput $server1_ior1file $svcconf " .
                               "-ORBEndpoint iiop://$hostname:$port");
@@ -49,7 +49,7 @@ $CL = $client->CreateProcess ("consumer",
                               "-t $consumer_runtime");
 
 
-print "\n*********** Starting the Notify_Service  ***********\n\n";
+print "\n*********** Starting the Notify Service  ***********\n\n";
 print $SV1->CommandLine ()."\n";
 
 $server_status = $SV1->Spawn ();
diff --git a/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 5ee3773c559..6c48e903007 100755
--- a/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -1,17 +1,16 @@
 // $Id$
 
 #include "common.h"
-#include "ace/OS.h"
-
+#include "ace/OS_NS_unistd.h"
 
 namespace CosNotifyCommImpl{
-  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier 
+  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier
   {
   public:
     void disconnect_structured_push_supplier()
     {
     };
-    void subscription_change( const CosNotification::EventTypeSeq&, 
+    void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
 
@@ -39,7 +38,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Supplier
-    CosNotifyComm::StructuredPushSupplier_var sps = 
+    CosNotifyComm::StructuredPushSupplier_var sps =
       CosNotifyComm::StructuredPushSupplier::_nil();
 
 
@@ -107,18 +106,18 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     event.remainder_of_body <<= data;
 
     std::cout << "Sending a demo event...," << std::endl;
-    std::cout << "event.header.fixed_header.event_type.domain_name = " 
-      << event.header.fixed_header.event_type.domain_name 
+    std::cout << "event.header.fixed_header.event_type.domain_name = "
+      << event.header.fixed_header.event_type.domain_name
       << std::endl;
-    std::cout << "event.header.fixed_header.event_type.type_name = " 
+    std::cout << "event.header.fixed_header.event_type.type_name = "
       << event.header.fixed_header.event_type.type_name
       << std::endl;
-    std::cout << "event.filterable_data: data=" << data << std::endl; 
+    std::cout << "event.filterable_data: data=" << data << std::endl;
 
 
     try{
       ppc->push_structured_event(event);
-    }   
+    }
     catch (CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during push: "
diff --git a/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
index 948e64a01fe..7de79fcc106 100644
--- a/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
@@ -92,7 +92,6 @@ int publish()
 
 int loadunloadcycle()
 {
-  int result = 0;
   int publish_result = 0;
 
   ACE_DEBUG((
@@ -100,10 +99,11 @@ int loadunloadcycle()
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -132,13 +132,15 @@ int loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNameService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done. Result: <%d>\n"),
+    result
   ));
 
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   publish_result = publish();
@@ -155,7 +157,8 @@ int loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -165,7 +168,8 @@ int loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNameService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NameService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NameService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -175,7 +179,8 @@ int loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 
   return publish_result;
diff --git a/orbsvcs/tests/Notify/Destroy/Makefile.am b/orbsvcs/tests/Notify/Destroy/Makefile.am
deleted file mode 100644
index 0b722e2d475..00000000000
--- a/orbsvcs/tests/Notify/Destroy/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Notify_Test_Destroy.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Notify_Tests_Destroy
-
-Notify_Tests_Destroy_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Notify_Tests_Destroy_SOURCES = \
-  main.cpp
-
-Notify_Tests_Destroy_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Notify_Tests_Destroy_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Discarding/Makefile.am b/orbsvcs/tests/Notify/Discarding/Makefile.am
deleted file mode 100644
index 61cb5c1c45b..00000000000
--- a/orbsvcs/tests/Notify/Discarding/Makefile.am
+++ /dev/null
@@ -1,277 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Discarding_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Discarding_Ntf_Seq_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Discarding_Ntf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Discarding_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Discarding_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
index e19763cb7e5..1e23933c853 100644
--- a/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
index bd58ab5e9f8..21bd72f89b8 100644
--- a/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index 28740cd1d36..6a847e4dd87 100644
--- a/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -91,7 +91,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 99ad2a417f2..1f7f6fb57f0 100644
--- a/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -128,7 +128,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index e0993c96011..d29d4721eb7 100644
--- a/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -80,7 +80,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 2fea44d1b94..65ccb52dbb8 100644
--- a/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -119,7 +119,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Discarding/run_test.pl b/orbsvcs/tests/Notify/Discarding/run_test.pl
index d845bcd2de5..561fb5199e1 100755
--- a/orbsvcs/tests/Notify/Discarding/run_test.pl
+++ b/orbsvcs/tests/Notify/Discarding/run_test.pl
@@ -65,10 +65,10 @@ foreach my $arg (@ARGV) {
     }
 }
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                           "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Driver/Makefile.am b/orbsvcs/tests/Notify/Driver/Makefile.am
deleted file mode 100644
index e34669e2e5e..00000000000
--- a/orbsvcs/tests/Notify/Driver/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Notify_Test_Driver.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Notify_Tests_Driver
-
-Notify_Tests_Driver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Notify_Tests_Driver_SOURCES = \
-  main.cpp
-
-Notify_Tests_Driver_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Notify_Tests_Driver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Lanes/consumer.conf b/orbsvcs/tests/Notify/Lanes/consumer.conf
index 98c0f0ed303..b1cb8925002 100644
--- a/orbsvcs/tests/Notify/Lanes/consumer.conf
+++ b/orbsvcs/tests/Notify/Lanes/consumer.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
 #dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/orbsvcs/tests/Notify/Lanes/notify.conf b/orbsvcs/tests/Notify/Lanes/notify.conf
index 85d6b72357e..d1479eec5d8 100644
--- a/orbsvcs/tests/Notify/Lanes/notify.conf
+++ b/orbsvcs/tests/Notify/Lanes/notify.conf
@@ -1,8 +1,9 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+# $Id$
+
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
-#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
+#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
-dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""        
-dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
-
+dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/Lanes/run_test.pl b/orbsvcs/tests/Notify/Lanes/run_test.pl
index a2de8ac8d5c..b77703511bd 100755
--- a/orbsvcs/tests/Notify/Lanes/run_test.pl
+++ b/orbsvcs/tests/Notify/Lanes/run_test.pl
@@ -63,10 +63,10 @@ my $client2_client_ior = $client2->LocalFile ($client_ior);
 $client2->DeleteFile($ior1file);
 $client2->DeleteFile($client_ior);
 
-$SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-o $server1_ior1file");
 
-$SV2 = $server2->CreateProcess ("../../../Notify_Service/Notify_Service",
+$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                                 "-ORBInitRef NameService=file://$server2_ior1file " .
                                 "-IORoutput $server2_ior2file " .
                                 "-ORBSvcConf $server2_conf");
diff --git a/orbsvcs/tests/Notify/MC/Makefile.am b/orbsvcs/tests/Notify/MC/Makefile.am
deleted file mode 100644
index ba4140102ce..00000000000
--- a/orbsvcs/tests/Notify/MC/Makefile.am
+++ /dev/null
@@ -1,212 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MonitorControl_Idl.am
-
-BUILT_SOURCES = \
-  MonitorTestInterfaceC.cpp \
-  MonitorTestInterfaceC.h \
-  MonitorTestInterfaceC.inl \
-  MonitorTestInterfaceS.cpp \
-  MonitorTestInterfaceS.h \
-  MonitorTestInterfaceS.inl
-
-CLEANFILES = \
-  MonitorTestInterface-stamp \
-  MonitorTestInterfaceC.cpp \
-  MonitorTestInterfaceC.h \
-  MonitorTestInterfaceC.inl \
-  MonitorTestInterfaceS.cpp \
-  MonitorTestInterfaceS.h \
-  MonitorTestInterfaceS.inl
-
-MonitorTestInterfaceC.cpp MonitorTestInterfaceC.h MonitorTestInterfaceC.inl MonitorTestInterfaceS.cpp MonitorTestInterfaceS.h MonitorTestInterfaceS.inl: MonitorTestInterface-stamp
-
-MonitorTestInterface-stamp: $(srcdir)/MonitorTestInterface.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MonitorTestInterface.idl
-	@touch $@
-
-noinst_HEADERS = \
-  MonitorTestInterface.idl
-
-## Makefile.MonitorControl_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  MonitorTestInterfaceC.cpp \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.MonitorControl_Monitor.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS += test_monitor
-
-test_monitor_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-test_monitor_SOURCES = \
-  MonitorTestInterfaceC.cpp \
-  MonitorTestInterfaceS.cpp \
-  test_monitor.cpp \
-  Notify_Structured_Push_Consumer.h
-
-test_monitor_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC_Ext.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Makefile.MonitorControl_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  MonitorTestInterfaceC.cpp \
-  Structured_Supplier.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp b/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
index 067765465e1..5989ecf4601 100644
--- a/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
@@ -72,7 +72,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
             argv [0]),
             -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp b/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
index 8ea812e3c91..e5efded21fa 100644
--- a/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
@@ -63,7 +63,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/MC/run_test.pl b/orbsvcs/tests/Notify/MC/run_test.pl
index fd5d46ad8ba..9f91eb1ea4d 100755
--- a/orbsvcs/tests/Notify/MC/run_test.pl
+++ b/orbsvcs/tests/Notify/MC/run_test.pl
@@ -86,9 +86,9 @@ if ($nfs->PutFile ($notify_conf) == -1) {
     exit 1;
 }
 
-my $NS = $ns->CreateProcess("../../../Naming_Service/Naming_Service",
+my $NS = $ns->CreateProcess("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port -o $nsiorfile");
-my $NFS = $nfs->CreateProcess("../../../Notify_Service/Notify_Service",
+my $NFS = $nfs->CreateProcess("../../../Notify_Service/tao_cosnotification",
                               "-ORBDebugLevel $debug_level ".
                               "$nscorbaloc " .
                               "-IORoutput $nfs_nfsiorfile " .
diff --git a/orbsvcs/tests/Notify/MC/test_monitor.cpp b/orbsvcs/tests/Notify/MC/test_monitor.cpp
index 787ea85518c..921d0e673de 100644
--- a/orbsvcs/tests/Notify/MC/test_monitor.cpp
+++ b/orbsvcs/tests/Notify/MC/test_monitor.cpp
@@ -76,7 +76,7 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc)
       data = this->nsm_->get_statistic (str.c_str ());
       num = data->data_union.num ();
 
-      if (num.dlist[0].value != 0)
+      if (!ACE::is_equal (num.dlist[0].value, 0.0))
         {
           ACE_ERROR ((LM_ERROR,
                       "ERROR: There should be no active Event "
@@ -87,7 +87,7 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc)
       data = this->nsm_->get_statistic (str.c_str ());
       num = data->data_union.num ();
 
-      if (num.dlist[0].value != 0)
+      if (!ACE::is_equal (num.dlist[0].value, 0.0))
         {
           ACE_ERROR ((LM_ERROR,
                       "ERROR: There should be no inactive Event "
@@ -116,20 +116,20 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc)
       str = this->base_ + NotifyMonitoringExt::EventChannelConsumerCount;
       data = this->nsm_->get_statistic (str.c_str ());
       num = data->data_union.num ();
-      if (num.dlist[0].value != 1)
+      if (!ACE::is_equal (num.dlist[0].value, 1.0))
         ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be only one Consumer\n"));
 
       str = this->base_ + NotifyMonitoringExt::EventChannelConsumerAdminCount;
       data = nsm_->get_statistic(str.c_str ());
       num = data->data_union.num ();
-      if (num.dlist[0].value != 1)
+      if (!ACE::is_equal (num.dlist[0].value, 1.0))
         ACE_ERROR ((LM_ERROR,
                         "Monitor: ERROR: There should be only one ConsumerAdmin\n"));
 
       str = this->base_ + NotifyMonitoringExt::EventChannelQueueElementCount;
       data = nsm_->get_statistic(str.c_str ());
       num = data->data_union.num ();
-      if (num.dlist[0].value != 0)
+      if (!ACE::is_equal (num.dlist[0].value, 0.0))
         ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be no events queued\n"));
 
         brain_dump ("Running Consumer");
@@ -142,13 +142,13 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc)
       data = nsm_->get_statistic(str.c_str ());
       num = data->data_union.num ();
 
-      if (num.dlist[0].value != 1)
+      if (!ACE::is_equal (num.dlist[0].value, 1.0))
         ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be only one Supplier\n"));
 
       str = this->base_ + NotifyMonitoringExt::EventChannelSupplierAdminCount;
       data = nsm_->get_statistic(str.c_str ());
       num = data->data_union.num ();
-      if (num.dlist[0].value != 1)
+      if (!ACE::is_equal (num.dlist[0].value, 1.0))
         ACE_ERROR ((LM_ERROR,
               "Monitor: ERROR: There should be only one SupplierAdmin\n"));
         brain_dump ("Running Supplier");
@@ -313,18 +313,18 @@ MonitorTestInterface_i::finished (MonitorTestInterface::Which proc)
         nsm_->get_statistic(consumerCountName.c_str ());
       Monitor::Numeric consumerCountNum =
         consumerCountData->data_union.num ();
-      if (consumerCountNum.last != 1)
+      if (!ACE::is_equal (consumerCountNum.last, 1.0))
       ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should still be one Consumer\n"));
-  
+
       ACE_CString queueElementName = this->base_ + NotifyMonitoringExt::EventChannelQueueElementCount;
       Monitor::Data_var queueElementData =
         nsm_->get_statistic(queueElementName.c_str ());
       Monitor::Numeric queueElementNum =
         queueElementData->data_union.num ();
-      if (queueElementNum.last == 0)
+      if (ACE::is_equal (queueElementNum.last, 0.0))
       ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be at least one "
                             "event queued\n"));
-  
+
       ACE_CString adminNamesName  = this->base_ + NotifyMonitoringExt::EventChannelConsumerAdminNames;
       Monitor::Data_var adminNamesData =
         nsm_->get_statistic(adminNamesName.c_str ());
@@ -348,9 +348,9 @@ MonitorTestInterface_i::finished (MonitorTestInterface::Which proc)
             ACE_ERROR ((LM_ERROR, "Monitor: ERROR: The most recent queue size [%f] should not be greater than 2000.\n",
               queueSizeNum.last));
       }
-  
+
       consumer_stats_check();
-  
+
       brain_dump ("Finished Supplier");
       break;
       }
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
deleted file mode 100644
index c9d8fd10330..00000000000
--- a/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
+++ /dev/null
@@ -1,173 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Dispatching_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.MT_Dispatching_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.MT_Dispatching_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index 4c74caed6df..1f9b1bb3594 100644
--- a/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "Notify_Structured_Push_Consumer.h"
 #include "Notify_Test_Client.h"
-#include "ace/OS.h"
+#include "ace/OS_NS_unistd.h"
 
 Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
   const char* name,
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
index 9f3e4ed57f4..bf647535a2d 100644
--- a/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index facf5ed49d5..e9079f7bd8d 100644
--- a/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -65,7 +65,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 43e2318f8e7..2ba2db51a86 100644
--- a/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -113,7 +113,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
index 6c2ce6a6810..6ab17265e41 100755
--- a/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
+++ b/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
@@ -68,10 +68,10 @@ $con->DeleteFile ($coniorfile);
    },
 );
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                                 "-o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ".
             " -IORoutput $nfs_nfsiorfile";
 
diff --git a/orbsvcs/tests/Notify/Makefile.am b/orbsvcs/tests/Notify/Makefile.am
deleted file mode 100644
index fd57f40dcae..00000000000
--- a/orbsvcs/tests/Notify/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Bug_3252_Regression \
-        PluggableTopology \
-        Test_Filter \
-        XML_Persistence \
-        lib \
-        Structured_Multi_Filter \
-        Structured_Filter \
-        Sequence_Multi_Filter \
-        Sequence_Multi_ETCL_Filter \
-        Reconnecting \
-        RT_lib \
-        Persistent_Filter \
-        Persistent_POA \
-        Ordering \
-        MT_Dispatching \
-        MC \
-        Driver \
-        Discarding \
-        Destroy \
-        Bug_2561_Regression \
-        Bug_1385_Regression \
-        Blocking \
-        Basic \
-        Timeout \
-	Validate_Client
-
-if BUILD_TESTS
-SUBDIRS += performance-tests
-endif
diff --git a/orbsvcs/tests/Notify/Ordering/Makefile.am b/orbsvcs/tests/Notify/Ordering/Makefile.am
deleted file mode 100644
index 5df0e8ce7dd..00000000000
--- a/orbsvcs/tests/Notify/Ordering/Makefile.am
+++ /dev/null
@@ -1,277 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Ordering_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Ordering_Ntf_Seq_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Ordering_Ntf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Ordering_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Ordering_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
index 8468813f787..0e63e08d773 100644
--- a/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Ordering
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
index 0d948b295a2..f669d12c7b5 100644
--- a/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Ordering
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 16015d954ac..603b8e6b1a6 100644
--- a/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -86,7 +86,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index bf6ee1b19d8..5af7cd0b8e6 100644
--- a/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -125,7 +125,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index ecf6941a992..4687bc05bbd 100644
--- a/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -83,7 +83,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index 3356d0c552d..3ff196671a8 100644
--- a/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -126,7 +126,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Ordering/run_test.pl b/orbsvcs/tests/Notify/Ordering/run_test.pl
index 815c8362fa9..5d8f51278f9 100755
--- a/orbsvcs/tests/Notify/Ordering/run_test.pl
+++ b/orbsvcs/tests/Notify/Ordering/run_test.pl
@@ -65,10 +65,10 @@ foreach my $arg (@ARGV) {
     }
 }
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                           "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
index 3176f89fcdd..70e81593cce 100644
--- a/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
+++ b/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
@@ -2,9 +2,7 @@
 
 #include "Filter.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
-
-ACE_RCSID(Filter, Filter, "Filter.cpp,v 1.13 2002/05/28 20:24:16 pradeep Exp")
+#include "ace/OS_NS_unistd.h"
 
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
diff --git a/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
index 59f6477c7af..665038d7cd4 100644
--- a/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
+++ b/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Filter.h
-//
-// = DESCRIPTION
-//   Class to demo structured event filtering.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Filter.h
+ *
+ *  $Id$
+ *
+ * Class to demo structured event filtering.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_FILTER_CLIENT_H
 #define NOTIFY_FILTER_CLIENT_H
@@ -29,123 +29,126 @@
 class Filter_StructuredPushConsumer;
 class Filter_StructuredPushSupplier;
 
+/**
+ * @class FilterClient
+ *
+ * @brief Filter Client
+ *
+ * Client example that shows how to do Structured Event filtering
+ * in the Notification Service.
+ */
 class FilterClient
 {
-  // = TITLE
-  //   Filter Client
-  // = DESCRIPTION
-  //   Client example that shows how to do Structured Event filtering
-  //   in the Notification Service.
 
  public:
   // = Initialization and Termination
+  /// Constructor
   FilterClient (void);
-  // Constructor
 
+  /// Destructor
   ~FilterClient ();
-  // Destructor
 
+  /// Init the Client.
   void init_supplier (int argc, ACE_TCHAR *argv []);
   void init_consumer (int argc, ACE_TCHAR *argv []);
-  // Init the Client.
 
+  /// Run the demo.
   void run_supplier ();
   void run_consumer ();
-  // Run the demo.
 
+  /// Consumer calls done, We're done.
   void done (void);
-  // Consumer calls done, We're done.
 
  protected:
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
+  /// Initializes the ORB.
   void init_ORB (int& argc, ACE_TCHAR **& argv);
-  // Initializes the ORB.
 
+  /// Try to get hold of a running naming service.
   void resolve_naming_service ();
-  // Try to get hold of a running naming service.
 
+  /// Try to resolve the Notify factory from the Naming service.
   void resolve_Notify_factory ();
-  // Try to resolve the Notify factory from the Naming service.
 
+  /// Create an EC.
   void create_EC ();
   void get_EC ();
-  // Create an EC.
 
+  /// Create the Supplier Admin.
   void create_supplieradmin();
-  // Create the Supplier Admin.
   void get_supplieradmin();
 
+  /// Create the Consumer Admin.
   void create_consumeradmin ();
-  // Create the Consumer Admin.
   void get_consumeradmin ();
 
+  /// Create and initialize the consumers.
   void create_consumers ();
-  // Create and initialize the consumers.
 
+  /// create and initialize the suppliers.
   void create_suppliers ();
-  // create and initialize the suppliers.
 
+  /// send the events.
   void send_events ();
-  // send the events.
 
   void wait_ready ();
 
   void wait_consumer_complete ();
 
-  void verify_filter (CosNotifyFilter::FilterAdmin_var& admin, 
+  void verify_filter (CosNotifyFilter::FilterAdmin_var& admin,
                       const char* constraint_expr,
                       const char* mod_constraint_expr);
 
   // = Data Members
+  /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// Handle to the name service.
   CosNaming::NamingContext_var naming_context_;
-  // Handle to the name service.
 
+  /// Channel factory.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
-  // Channel factory.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The group operator between admin-proxy's.
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-  // The group operator between admin-proxy's.
 
+  /// Initial qos specified to the factory when creating the EC.
   CosNotification::QoSProperties initial_qos_;
-  // Initial qos specified to the factory when creating the EC.
 
+  /// Initial admin props specified to the factory when creating the EC.
   CosNotification::AdminProperties initial_admin_;
-  // Initial admin props specified to the factory when creating the EC.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_1_;
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_2_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer #1
   Filter_StructuredPushConsumer* consumer_1;
-  // Consumer #1
 
+  /// Consumer #2
   Filter_StructuredPushConsumer* consumer_2;
-  // Consumer #2
 
+  /// Supplier #1
   Filter_StructuredPushSupplier* supplier_1;
-  // Supplier #1
 
+  /// Supplier #2
   Filter_StructuredPushSupplier* supplier_2;
-  // Supplier #2
 
   CosNotifyChannelAdmin::AdminID adminid_1_id_;
   CosNotifyChannelAdmin::AdminID adminid_2_id_;
-  
+
   CosNotifyChannelAdmin::ChannelID channel_id_;
 
   bool use_persistent_;
@@ -157,45 +160,46 @@ class FilterClient
 };
 
 /*****************************************************************/
+/**
+ * @class Filter_StructuredPushConsumer
+ *
+ * @brief Filter_StructuredPushConsumer
+ *
+ * Consumer for the Filter example.
+ */
 class Filter_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushConsumer
 {
-  // = TITLE
-  //   Filter_StructuredPushConsumer
-  //
-  // = DESCRIPTION
-  //   Consumer for the Filter example.
-  //
 
  public:
   // = Initialization and Termination code
+  /// Constructor.
   Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name);
-  // Constructor.
 
+  /// Connect the Consumer to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  // Connect the Consumer to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   virtual void disconnect ();
-  // Disconnect from the supplier.
 
 protected:
   // = Data members
 
+  /// The callback for <done>
   FilterClient* filter_;
-  // The callback for <done>
 
+  /// The name of this consumer.
   ACE_CString my_name_;
-  // The name of this consumer.
 
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
-  // The proxy that we are connected to.
 
+  /// The proxy_supplier id.
   CosNotifyChannelAdmin::ProxyID proxy_supplier_id_;
-  // The proxy_supplier id.
 
   // = Methods
+  /// Destructor
   virtual ~Filter_StructuredPushConsumer (void);
-  // Destructor
 
   // = NotifyPublish method
     virtual void offer_change (
@@ -213,43 +217,44 @@ protected:
 
 /*****************************************************************/
 
+ /**
+  * @class Filter_StructuredPushSupplier
+  *
+  * @brief Filter_StructuredPushSupplier
+  *
+  * Supplier for the filter example.
+  */
 class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSupplier
 {
-  // = TITLE
-  //   Filter_StructuredPushSupplier
-  //
-  // = DESCRIPTION
-  //   Supplier for the filter example.
-  //
  public:
   // = Initialization and Termination code
+  /// Constructor.
   Filter_StructuredPushSupplier (const char* my_name);
-  // Constructor.
 
+  /// Connect the Supplier to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  // Connect the Supplier to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   void disconnect ();
-  // Disconnect from the supplier.
 
+  /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
-  // Send one event.
 
 protected:
   // = Data members
+  /// The name of this consumer.
   ACE_CString my_name_;
-  // The name of this consumer.
 
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_;
-  // The proxy that we are connected to.
 
+  /// This supplier's id.
   CosNotifyChannelAdmin::ProxyID proxy_consumer_id_;
-  // This supplier's id.
 
   // = Protected Methods
+  /// Destructor
   virtual ~Filter_StructuredPushSupplier ();
-  // Destructor
 
   // = NotifySubscribe
   virtual void subscription_change (
diff --git a/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am b/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am
deleted file mode 100644
index 83d7ba78ff8..00000000000
--- a/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am
+++ /dev/null
@@ -1,95 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.consumer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-consumer_SOURCES = \
-  Filter.cpp \
-  consumer.cpp \
-  Filter.h
-
-consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.supplier.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-supplier_SOURCES = \
-  Filter.cpp \
-  supplier.cpp \
-  Filter.h
-
-supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Persistent_Filter/NS.conf b/orbsvcs/tests/Notify/Persistent_Filter/NS.conf
index b5fc33c0af7..20a0b65985f 100644
--- a/orbsvcs/tests/Notify/Persistent_Filter/NS.conf
+++ b/orbsvcs/tests/Notify/Persistent_Filter/NS.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-AllocateTaskPerProxy -DispatchingThreads 1 -SourceThreads 1 -AllowReconnect -ValidateClient -ValidateClientDelay 1 -ValidateClientInterval 10 "
 
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory()  "-save_base_path ./persistency.notif  -load_base_path  ./persistency.notif  -backup_count 1 -v"
diff --git a/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl b/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl
index d9f1a785e00..7c75cc1a151 100755
--- a/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl
@@ -47,10 +47,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $nfs->DeleteFile ($persistent_xml);
 $nfs->DeleteFile ($persistent_000);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                                 "-o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBSvcConf $nfs_svc_conf -ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile ";
 
 $SUP = $sup->CreateProcess ("supplier");
@@ -93,9 +93,9 @@ if ($con->PutFile ($nsiorfile) == -1) {
 sub run_test
 {
     my $client_args = shift;
-    
+
     $nfs->DeleteFile ($nfsiorfile);
-    
+
     $NFS->Arguments ($NFS_Args);
     $args = $NFS->Arguments ();
     print STDERR "Running Notification with arguments: $args\n";
@@ -133,7 +133,7 @@ sub run_test
         $NFS->Kill (); $NFS->TimedWait (1);
         exit 1;
     }
-    
+
     $CON_status = $CON->WaitKill ($con->ProcessStartWaitInterval()+$experiment_timeout);
     if ($CON_status != 0) {
         print STDERR "ERROR: Consumer returned $CON_status\n";
diff --git a/orbsvcs/tests/Notify/Persistent_POA/Makefile.am b/orbsvcs/tests/Notify/Persistent_POA/Makefile.am
deleted file mode 100644
index f557f1ca703..00000000000
--- a/orbsvcs/tests/Notify/Persistent_POA/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Persistent_POA_Notify_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ./goC.cpp \
-  ./goC.h \
-  ./goC.inl \
-  ./goS.cpp \
-  ./goS.h \
-  ./goS.inl
-
-CLEANFILES = \
-  ./go-stamp \
-  ./goC.cpp \
-  ./goC.h \
-  ./goC.inl \
-  ./goS.cpp \
-  ./goS.h \
-  ./goS.inl
-
-./goC.cpp ./goC.h ./goC.inl ./goS.cpp ./goS.h ./goS.inl: ./go-stamp
-
-./go-stamp: $(srcdir)/../Blocking/go.idl $(TAO_IDL_DEP)
-	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o . $(srcdir)/../Blocking/go.idl
-	@touch $@
-
-noinst_PROGRAMS = Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  goC.h \
-  goC.inl \
-  goS.h \
-  goS.inl
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
index 66f5039e52b..4dc868c7be3 100644
--- a/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
@@ -105,7 +105,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Persistent_POA/run_test.pl b/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
index 5a855a090e0..5b675c57c69 100755
--- a/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
+++ b/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
@@ -50,10 +50,10 @@ $sup->DeleteFile ($nfs2iorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBEndpoint iiop://$nfs_host:$nfs_port " .
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
@@ -82,7 +82,7 @@ if ($ns->WaitForFileTimed ($nsiorfile,$ns->ProcessStartWaitInterval()) == -1) {
     exit 1;
 }
 
-print "*********** Starting the first Notify_Service  ***********\n";
+print "*********** Starting the first Notify Service  ***********\n";
 $NFS_status = $NFS->Spawn ();
 if ($NFS_status != 0) {
     print STDERR "ERROR: Notify Service returned $NFS_status\n";
@@ -124,7 +124,7 @@ if ($SUP_status != 0) {
 print "*********** Allowing time to register the ec   ***********\n";
 sleep(3);
 
-print "*********** Killing the first Notify_Service   ***********\n";
+print "*********** Killing the first Notify Service   ***********\n";
 $NFS_status = $NFS->Kill ($nfs->ProcessStopWaitInterval());
 if ($NFS_status != 0) {
     print STDERR "ERROR: Notify Service returned $NFS_status\n";
@@ -134,7 +134,7 @@ if ($NFS_status != 0) {
 }
 sleep(1);
 
-print "*********** Starting the second Notify_Service ***********\n";
+print "*********** Starting the second Notify Service ***********\n";
 my $args = $NFS->Arguments();
 my $l = index($args, $nfs_nfsiorfile);
 substr($args, $l, length($nfs_nfsiorfile)) = $nfs_nfs2iorfile;
diff --git a/orbsvcs/tests/Notify/PluggableTopology/Makefile.am b/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
deleted file mode 100644
index 4760078a202..00000000000
--- a/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
+++ /dev/null
@@ -1,97 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PlugTop_Lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libNotifyPlugTop.la
-
-libNotifyPlugTop_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DPLUGTOP_BUILD_DLL
-
-libNotifyPlugTop_la_SOURCES = \
-  Test_Saver.cpp \
-  Test_Topology_Factory.cpp
-
-noinst_HEADERS = \
-  Test_Saver.h \
-  Test_Topology_Factory.h
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.PlugTop.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = main
-
-main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-main_SOURCES = \
-  main.cpp
-
-main_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf b/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf
index 008cb4abe88..2f3e1e99e58 100644
--- a/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf
+++ b/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf
@@ -1,3 +1,4 @@
-#
+# $Id$
+
 dynamic TopologyFactory Service_Object * NotifyPlugTop:_make_Test_Topology_Factory() ""
 #dynamic TopologyFactory Service_Object * TAO_CosNotification:_make_XML_Topology_Factory() ""
\ No newline at end of file
diff --git a/orbsvcs/tests/Notify/RT_lib/Makefile.am b/orbsvcs/tests/Notify/RT_lib/Makefile.am
deleted file mode 100644
index 1c565445f95..00000000000
--- a/orbsvcs/tests/Notify/RT_lib/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RT_Notify_lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_LTLIBRARIES = libTAO_RT_NotifyTests.la
-
-libTAO_RT_NotifyTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_RT_NOTIFY_TEST_BUILD_DLL
-
-libTAO_RT_NotifyTests_la_SOURCES = \
-  RT_Application_Command.cpp \
-  RT_Factories_Define.cpp \
-  RT_POA_Command.cpp \
-  RT_Priority_Mapping.cpp
-
-libTAO_RT_NotifyTests_la_LDFLAGS = \
- -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-noinst_HEADERS = \
-  RT_Application_Command.h \
-  RT_POA_Command.h \
-  RT_Priority_Mapping.h
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index cdb315860a1..c365a16f619 100644
--- a/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_Application_Command.h"
 
-ACE_RCSID(lib, TAO_RT_Application_Command, "$Id$")
+
 
 #include "../lib/LookupManager.h"
 #include "RT_Priority_Mapping.h"
diff --git a/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
index 35be49f7be6..40b4b622f9c 100644
--- a/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
+++ b/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "../lib/Factories_Define.h"
 
-ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$Id$")
+
 
 #include "rt_notify_test_export.h"
 #include "../lib/Name.h"
diff --git a/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index c29c721f8df..42f2427f0ba 100644
--- a/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_POA_Command.h"
 
-ACE_RCSID(lib, TAO_RT_POA_Command, "$Id$")
+
 
 #include "tao/debug.h"
 #include "../lib/LookupManager.h"
diff --git a/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index 7b9cf2c5d67..ea665041c17 100644
--- a/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_Priority_Mapping.h"
 
-ACE_RCSID(lib, RT_Priority_Mapping, "$Id$")
+
 
 #include "../lib/LookupManager.h"
 
diff --git a/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 7607939e5a9..a8c48427f85 100644
--- a/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID (Notify_Tests, Consumer_Main, "$Id$")
+
 
 static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
 static const char NAMING_SERVICE_NAME[] = "NameService";
diff --git a/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index 358c29600c6..7ddaef1a363 100644
--- a/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Consumer.h
-//
-// = DESCRIPTION
-//   Test Consumer reconnect to existing channel/admin/proxy Notification Service
-//
-// = AUTHOR
-//    Dale Wilson <wilson_d@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ * Test Consumer reconnect to existing channel/admin/proxy Notification Service
+ *
+ *
+ *  @author Dale Wilson <wilson_d@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef RECONNECTNG_CONSUMER_H
 #define RECONNECTNG_CONSUMER_H
diff --git a/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/orbsvcs/tests/Notify/Reconnecting/Makefile.am
deleted file mode 100644
index fea25e761a2..00000000000
--- a/orbsvcs/tests/Notify/Reconnecting/Makefile.am
+++ /dev/null
@@ -1,130 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Reconnecting_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Consumer.h
-
-Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Reconnecting_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  Supplier.cpp \
-  Supplier.h
-
-Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index bd32b35229d..83a78e4a669 100644
--- a/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (Notify_Tests, Supplier_Main, "$Id$")
+
 
 static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
 static const char NAMING_SERVICE_NAME[] = "NameService";
@@ -232,7 +232,8 @@ Supplier_Main::parse_args (int argc, ACE_TCHAR *argv[])
     }
     else
     {
-      ACE_OS::fprintf(stderr, "Unrecognized argument: %s\n", argv[narg]);
+      ACE_OS::fprintf(stderr, "Unrecognized argument: %s\n",
+                      ACE_TEXT_ALWAYS_CHAR (argv[narg]));
       usage (stderr);
       result = -1;
     }
diff --git a/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index 6d998403a03..746bf190a4d 100644
--- a/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Supplier.h
-//
-// = DESCRIPTION
-//   Test Supplier reconnect to existing channel/admin/proxy Notification Service
-//
-// = AUTHOR
-//    Dale Wilson <wilson_d@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ * Test Supplier reconnect to existing channel/admin/proxy Notification Service
+ *
+ *
+ *  @author Dale Wilson <wilson_d@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef RECONNECTNG_SUPPLIER_H
 #define RECONNECTNG_SUPPLIER_H
diff --git a/orbsvcs/tests/Notify/Reconnecting/event.conf b/orbsvcs/tests/Notify/Reconnecting/event.conf
index b1a5edc1876..4b454a220b1 100644
--- a/orbsvcs/tests/Notify/Reconnecting/event.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/event.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 #
 static TAO_CosNotify_Service "-AllowReconnect"
 #
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf b/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf
index 47da73eb47f..a1a23b01338 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 #
 ## -DispatchingThreads N - creates a thread pool for dispatching and consumer side filter eval
 ## -SourceThreads M - creates a thread pool for lookup and supplier side filter eval
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf b/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
index 02ba9ed52ba..bd5b1a06bc7 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-DispatchingThreads 2 -SourceThreads 2 -AllowReconnect"
 #
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-base_path ./reconnect_test"
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf b/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
index ede1e8d298c..621898f97cc 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-DispatchingThreads 2 -SourceThreads 2 -AllowReconnect"
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-base_path ./reconnect_test"
 
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_st.conf b/orbsvcs/tests/Notify/Reconnecting/ns_st.conf
index 3ff9ed61cbb..a1d4cb4bfea 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_st.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_st.conf
@@ -1,4 +1,5 @@
-#
+# $Id$
+
 static TAO_CosNotify_Service "-AllowReconnect"
 
 
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf b/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
index eb8e1f29923..bef31a80273 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-AllowReconnect"
 #
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -base_path ./reconnect_test"
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf b/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
index daf2927299f..4aef148abe4 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static TAO_CosNotify_Service "-AllowReconnect"
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -base_path ./reconnect_test"
diff --git a/orbsvcs/tests/Notify/Reconnecting/run_test.pl b/orbsvcs/tests/Notify/Reconnecting/run_test.pl
index 238e2230830..c480127704c 100755
--- a/orbsvcs/tests/Notify/Reconnecting/run_test.pl
+++ b/orbsvcs/tests/Notify/Reconnecting/run_test.pl
@@ -127,7 +127,7 @@ my $ns_args = "-ORBSvcConf $nfs_svcconf $ns_base_args";
 # Delete the all of the files used in the test
 
 # Define the processes first
-my $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service");
+my $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification");
 my $CON = $con->CreateProcess ("Consumer");
 my $SUP = $sup->CreateProcess ("Supplier");
 
@@ -597,7 +597,7 @@ $nfs->DeleteFile ($save_001);
 $nfs->DeleteFile ($eventpersist);
 $sup->DeleteFile ($supplier_pause);
 
-## Wait a bit to avoid lingering sockets from the previous Notify_Service
+## Wait a bit to avoid lingering sockets from the previous tao_cosnotification
 sleep(3);
 
 $NFS->Arguments("-ORBSvcConf $nfs_st_both $ns_base_args");
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
deleted file mode 100644
index 1ba8d6e2113..00000000000
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
+++ /dev/null
@@ -1,173 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Seq_Multi_ETCL_Filter_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
index cdb1c927dc9..a0fcac7d195 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index b28b7d70b8c..6a993cc4634 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -64,7 +64,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index b322efcdc1c..d26b4e145fe 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -104,7 +104,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
index bc55c1e5e0c..5339c6bf664 100755
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
@@ -42,9 +42,9 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
deleted file mode 100644
index f9bc71a9cdd..00000000000
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
+++ /dev/null
@@ -1,165 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Seq_Multi_Filter_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Seq_Multi_Filter_Ntf_Seq_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Seq_Multi_Filter_Ntf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
index d6fc3520099..42105aae12e 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index d88b6646b70..63ba5eae30f 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -69,7 +69,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index b459ab8a1f1..4a5d5d1375e 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -105,7 +105,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
index e07c4db5e43..f01efb1d81a 100755
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
@@ -42,9 +42,9 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
deleted file mode 100644
index 1a00eeb3ee6..00000000000
--- a/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
+++ /dev/null
@@ -1,165 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Struct_Filter_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Struct_Filter_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Struct_Filter_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h b/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
index 3649d2d46a9..0a7047a000a 100644
--- a/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Structured_Filter
-//
-// = FILENAME
-//   Notify_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chip Jones <jones_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chip Jones <jones_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef NOTIFY_PUSH_CONSUMER_H
 #define NOTIFY_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index a77b479e09c..1f69fde7e44 100644
--- a/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -90,7 +90,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
index 31aeb78a3fc..51105e42a9d 100755
--- a/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
@@ -45,10 +45,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
deleted file mode 100644
index a07a0d73a7b..00000000000
--- a/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
+++ /dev/null
@@ -1,166 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Struct_Multi_Filter_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Struct_Multi_Filter_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Struct_Multi_Filter_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Notify_Push_Supplier.cpp \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Push_Supplier.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h b/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
index 2d17ace210b..28aba1c7f4d 100644
--- a/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Structured_Filter
-//
-// = FILENAME
-//   Notify_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chip Jones <jones_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chip Jones <jones_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef NOTIFY_PUSH_CONSUMER_H
 #define NOTIFY_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
index 77c757099e6..282592ff95d 100755
--- a/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
@@ -45,10 +45,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Test_Filter/Makefile.am b/orbsvcs/tests/Notify/Test_Filter/Makefile.am
deleted file mode 100644
index a02868bb942..00000000000
--- a/orbsvcs/tests/Notify/Test_Filter/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.TAO_RT_NotifyTests_Filter.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_LTLIBRARIES = libTAO_RT_NotifyTests_Filter.la
-
-libTAO_RT_NotifyTests_Filter_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_RT_Test_Filter_BUILD_DLL
-
-libTAO_RT_NotifyTests_Filter_la_SOURCES = \
-  RT_Test_Filter.cpp \
-  RT_Test_FilterFactory.cpp
-
-noinst_HEADERS = \
-  RT_Test_Filter.h \
-  RT_Test_FilterFactory.h
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 6db332ceea9..8b86e1cdeb2 100644
--- a/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_Test_Filter.h"
 
-ACE_RCSID(Notify, TAO_RT_Test_Filter, "$Id$")
+
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
diff --git a/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index f5a5401b6d2..ec9df0597f2 100644
--- a/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_Test_FilterFactory.h"
 
-ACE_RCSID(Notify, TAO_RT_Test_FilterFactory, "$Id$")
+
 
 #include "RT_Test_Filter.h"
 #include "tao/debug.h"
@@ -86,13 +86,13 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create_mapping_filter (const char * /*co
   throw CORBA::NO_IMPLEMENT ();
 }
 
-TAO_Notify_Object::ID 
+TAO_Notify_Object::ID
 TAO_Notify_Tests_RT_Test_FilterFactory::get_filter_id (CosNotifyFilter::Filter_ptr /*filter*/)
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
-CosNotifyFilter::Filter_ptr 
+CosNotifyFilter::Filter_ptr
 TAO_Notify_Tests_RT_Test_FilterFactory::get_filter (const TAO_Notify_Object::ID& /*id*/)
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -105,7 +105,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::release (void)
   //@@ inform factory
 }
 
-void 
+void
 TAO_Notify_Tests_RT_Test_FilterFactory::save_persistent (TAO_Notify::Topology_Saver& /*saver*/)
 {
   throw CORBA::NO_IMPLEMENT ();
diff --git a/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index 34d0240c104..2249dcaef0e 100644
--- a/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -59,7 +59,7 @@ public:
   virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter);
   virtual CosNotifyFilter::Filter_ptr get_filter (const TAO_Notify_Object::ID& id);
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
-    
+
 protected:
   /// Release this object.
   virtual void release (void);
diff --git a/orbsvcs/tests/Notify/ThreadPool/consumer.conf b/orbsvcs/tests/Notify/ThreadPool/consumer.conf
index 872c66654d7..e603c22efa9 100644
--- a/orbsvcs/tests/Notify/ThreadPool/consumer.conf
+++ b/orbsvcs/tests/Notify/ThreadPool/consumer.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
 #dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/orbsvcs/tests/Notify/ThreadPool/notify.conf b/orbsvcs/tests/Notify/ThreadPool/notify.conf
index f56362f30ea..50c432612e5 100644
--- a/orbsvcs/tests/Notify/ThreadPool/notify.conf
+++ b/orbsvcs/tests/Notify/ThreadPool/notify.conf
@@ -1,8 +1,10 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+# $Id$
+
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
-#dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
+#dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
-dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""        
-dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
+dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
 
diff --git a/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/orbsvcs/tests/Notify/ThreadPool/run_test.pl
index 95f9b1ce05a..49f88ff5158 100755
--- a/orbsvcs/tests/Notify/ThreadPool/run_test.pl
+++ b/orbsvcs/tests/Notify/ThreadPool/run_test.pl
@@ -51,10 +51,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile";
 
 $SUP = $sup->CreateProcess ("../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/ThreadPool/supplier.conf b/orbsvcs/tests/Notify/ThreadPool/supplier.conf
index 7ef7b0b4b1c..846fb7a81c4 100644
--- a/orbsvcs/tests/Notify/ThreadPool/supplier.conf
+++ b/orbsvcs/tests/Notify/ThreadPool/supplier.conf
@@ -11,7 +11,7 @@
 ##
 #
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
 #dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/orbsvcs/tests/Notify/Timeout/Makefile.am b/orbsvcs/tests/Notify/Timeout/Makefile.am
deleted file mode 100644
index e35bb52531c..00000000000
--- a/orbsvcs/tests/Notify/Timeout/Makefile.am
+++ /dev/null
@@ -1,165 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Timeout_Idl.am
-
-BUILT_SOURCES = \
-  sigC.cpp \
-  sigC.h \
-  sigC.inl \
-  sigS.cpp \
-  sigS.h \
-  sigS.inl
-
-CLEANFILES = \
-  sig-stamp \
-  sigC.cpp \
-  sigC.h \
-  sigC.inl \
-  sigS.cpp \
-  sigS.h \
-  sigS.inl
-
-sigC.cpp sigC.h sigC.inl sigS.cpp sigS.h sigS.inl: sig-stamp
-
-sig-stamp: $(srcdir)/sig.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/sig.idl
-	@touch "$@"
-
-noinst_HEADERS = \
-  sig.idl
-
-## Makefile.Timeout_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  sigC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Timeout_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  sigC.cpp \
-  sigS.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
index dd542ab52e6..7c75f2e34ea 100644
--- a/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
@@ -47,7 +47,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
             argv [0]),
             -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
index 8e1ad42cc2f..f358d6d62c5 100644
--- a/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
@@ -86,7 +86,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Timeout/run_test.pl b/orbsvcs/tests/Notify/Timeout/run_test.pl
index 55eb2bc6d09..04384ec2fa9 100755
--- a/orbsvcs/tests/Notify/Timeout/run_test.pl
+++ b/orbsvcs/tests/Notify/Timeout/run_test.pl
@@ -49,9 +49,9 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-my $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+my $NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                              "-o $ns_nsiorfile");
-my $NFS = $ns->CreateProcess ("../../../Notify_Service/Notify_Service",
+my $NFS = $ns->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                               "-ORBInitRef NameService=file://$nfs_nsiorfile " .
                               "-IORoutput $nfs_nfsiorfile -Timeout 750");
 my $SUP = $ns->CreateProcess("Structured_Supplier",
@@ -137,7 +137,7 @@ if ($con->PutFile ($supiorfile) == -1) {
 }
 
 ## Wait for the supplier to create the event channel in
-## the Notify_Service and register it with the Name Service
+## the tao_cosnotification and register it with the Name Service
 sleep(2);
 
 $CON_status = $CON->SpawnWaitKill ($con->ProcessStartWaitInterval()+5);
diff --git a/orbsvcs/tests/Notify/Validate_Client/Makefile.am b/orbsvcs/tests/Notify/Validate_Client/Makefile.am
deleted file mode 100644
index 93b3f902784..00000000000
--- a/orbsvcs/tests/Notify/Validate_Client/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## /tao_builds/phil/wustl/ACE+TAO+CIAO/ACE_wrappers/build/native/bin/mwc.pl -type automake
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Validate_Client_Proxy_Dummy.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = proxy_dummy
-
-proxy_dummy_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-proxy_dummy_SOURCES = \
-  proxy_dummy.cpp
-
-proxy_dummy_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Validate_Client/notify.conf b/orbsvcs/tests/Notify/Validate_Client/notify.conf
index 2d7e425ac16..4bd43d29c0c 100644
--- a/orbsvcs/tests/Notify/Validate_Client/notify.conf
+++ b/orbsvcs/tests/Notify/Validate_Client/notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-AllocateTaskPerProxy -DispatchingThreads 1 -SourceThreads 1 -AllowReconnect -ValidateClient -ValidateClientDelay 1 -ValidateClientInterval 2"
 
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory()  "-save_base_path ./persistency.notif  -load_base_path  ./persistency.notif  -backup_count 1 -v"
diff --git a/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp b/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
index 79f179f8bfb..4e55535a11e 100644
--- a/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
+++ b/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
@@ -6,10 +6,6 @@
 #include "tao/PortableServer/POAC.h"
 #include "tao/PortableServer/POAManagerC.h"
 
-ACE_RCSID (Validate_Client,
-           gen_data,
-           "$Id$")
-
 const ACE_TCHAR *output_filename = ACE_TEXT ("persistence.notify.xml");
 
 // must be char
@@ -133,7 +129,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -176,8 +172,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                            output_file),
                            1);
       const char * dummy_consumer_proxy = ior.in();
-      
-      ACE_OS::fprintf (output_file, format, 
+
+      ACE_OS::fprintf (output_file, format,
                        dummy_consumer_proxy, dummy_consumer_proxy,
                        dummy_consumer_proxy, dummy_consumer_proxy);
       ACE_OS::fclose (output_file);
diff --git a/orbsvcs/tests/Notify/Validate_Client/run_test.pl b/orbsvcs/tests/Notify/Validate_Client/run_test.pl
index e58ae336829..bd749040b32 100755
--- a/orbsvcs/tests/Notify/Validate_Client/run_test.pl
+++ b/orbsvcs/tests/Notify/Validate_Client/run_test.pl
@@ -39,7 +39,7 @@ $server->DeleteFile($iorbase);
 $client->DeleteFile ($persistent_file_xml);
 $client->DeleteFile ($persistent_file_000);
 
-$SV = $server->CreateProcess ("../../../Notify_Service/Notify_Service",
+$SV = $server->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                               "-ORBdebuglevel $debug_level " .
                               "-NoNameSvc " .
                               "-IORoutput $server_iorfile " .
diff --git a/orbsvcs/tests/Notify/XML_Persistence/Makefile.am b/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
deleted file mode 100644
index ea6e19e65b1..00000000000
--- a/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.XML_Persistence.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = main
-
-main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-main_SOURCES = \
-  main.cpp
-
-main_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/XML_Persistence/svc.conf b/orbsvcs/tests/Notify/XML_Persistence/svc.conf
index c0d276565cb..b748463e64a 100644
--- a/orbsvcs/tests/Notify/XML_Persistence/svc.conf
+++ b/orbsvcs/tests/Notify/XML_Persistence/svc.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -save_base_path ./abc -load_base_path ./loadtest -backup_count 2 -no_timestamp"
diff --git a/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 7c1933fb08c..afe3264bded 100644
--- a/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -3,11 +3,6 @@
 #include "Activation_Manager.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
-
-ACE_RCSID (lib,
-           TAO_Activation_Manager,
-           "$Id$")
-
 #include "LookupManager.h"
 #include "Command_Builder.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/Application_Command.cpp b/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 4cad93833a9..d7d2f4b7575 100644
--- a/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "Application_Command.h"
 
-ACE_RCSID(lib, TAO_Application_Command, "$Id$")
+
 
 #include "tao/PortableServer/PortableServer.h"
 #include "LookupManager.h"
diff --git a/orbsvcs/tests/Notify/lib/Command.cpp b/orbsvcs/tests/Notify/lib/Command.cpp
index 1704b36dcc1..9e483b37962 100644
--- a/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Command.cpp
@@ -7,7 +7,7 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(lib, TAO_Command, "$Id$")
+
 
 TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void)
   :next_ (0), command_ (INVALID)
diff --git a/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index 071f6da5141..debce6d572b 100644
--- a/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -7,7 +7,7 @@
 #include "Command_Factory.h"
 #include "Name.h"
 
-ACE_RCSID(lib, TAO_Command_Builder, "$Id$")
+
 
 TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void)
   :start_command_ (0)
diff --git a/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/orbsvcs/tests/Notify/lib/Command_Factory.cpp
index 5005641fe4a..792a1cf69bb 100644
--- a/orbsvcs/tests/Notify/lib/Command_Factory.cpp
+++ b/orbsvcs/tests/Notify/lib/Command_Factory.cpp
@@ -3,7 +3,7 @@
 
 #include "Command_Factory.h"
 
-ACE_RCSID(lib, TAO_Command_Factory, "$Id$")
+
 
 TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void)
 {
diff --git a/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
index a4bca1a5c56..a1f7102c400 100644
--- a/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
+++ b/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
@@ -5,7 +5,7 @@
 
 #include "Command_Factory_T.h"
 
-ACE_RCSID(Notify, TAO_Command_Factory_T, "$Id$")
+
 
 #include "ace/Dynamic_Service.h"
 #include "tao/debug.h"
diff --git a/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index dc6d3d6a7e1..ddb0f7ad687 100644
--- a/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "ConsumerAdmin_Command.h"
 
-ACE_RCSID(lib, TAO_ConsumerAdmin_Command, "$Id$")
+
 
 #include "LookupManager.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 7647879b111..19e8d2357ac 100644
--- a/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -4,7 +4,7 @@
 
 #include "Consumer_T.h"
 
-ACE_RCSID(Notify, TAO_Notify_Tests_Consumer_T, "$Id$")
+
 
 template <class Consumer_Traits>
 TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void)
diff --git a/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index e4550193bd1..93e07d08887 100644
--- a/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "Direct_Consumer.h"
 
-ACE_RCSID(lib, TAO_Direct_Consumer, "$Id$")
+
 
 #include "LookupManager.h"
 
diff --git a/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index a57d98f22ef..a3dfe8a7080 100644
--- a/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -6,7 +6,7 @@
 #include "Direct_Supplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Tests_Direct_Supplier, "$Id$")
+
 
 #include "LookupManager.h"
 
diff --git a/orbsvcs/tests/Notify/lib/Driver.cpp b/orbsvcs/tests/Notify/lib/Driver.cpp
index 871ea1c1872..742e65d3281 100644
--- a/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -2,7 +2,7 @@
 
 #include "Driver.h"
 
-ACE_RCSID(lib, TAO_Driver, "$Id$")
+
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Thread_Manager.h"
diff --git a/orbsvcs/tests/Notify/lib/Driver.h b/orbsvcs/tests/Notify/lib/Driver.h
index 0b2697da8f7..3069f2c13c3 100644
--- a/orbsvcs/tests/Notify/lib/Driver.h
+++ b/orbsvcs/tests/Notify/lib/Driver.h
@@ -37,12 +37,6 @@ class TAO_Notify_Tests_Activation_Manager;
  */
 class TAO_Notify_Tests_Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   TAO_Notify_Tests_Worker (void);
   // ctor
@@ -62,14 +56,13 @@ private:
 
 
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class TAO_Notify_Tests_ORB_Run_Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   TAO_Notify_Tests_ORB_Run_Worker (void);
   // ctor
diff --git a/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index caa4a37b107..3f424e30fca 100644
--- a/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -3,7 +3,7 @@
 #include "EventChannel_Command.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(lib, TAO_EventChannel_Command, "$Id$")
+
 
 #include "LookupManager.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/orbsvcs/tests/Notify/lib/Factories_Define.cpp
index 337e8651108..346d3876902 100644
--- a/orbsvcs/tests/Notify/lib/Factories_Define.cpp
+++ b/orbsvcs/tests/Notify/lib/Factories_Define.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "Factories_Define.h"
 
-ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$Id$")
+
 
 #include "Name.h"
 #include "Command_Factory_T.h"
diff --git a/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index af99168980b..083b6711bb6 100644
--- a/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -3,7 +3,7 @@
 #include "Filter_Command.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(lib, TAO_Filter_Command, "$Id$")
+
 
 #include "LookupManager.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/LookupManager.cpp b/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 67b09574776..1524e8e0a3d 100644
--- a/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -3,7 +3,7 @@
 #include "LookupManager.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(lib, TAO_LookupManager, "$Id$")
+
 
 #include "Name.h"
 
diff --git a/orbsvcs/tests/Notify/lib/Makefile.am b/orbsvcs/tests/Notify/lib/Makefile.am
deleted file mode 100644
index 1fc6f37334b..00000000000
--- a/orbsvcs/tests/Notify/lib/Makefile.am
+++ /dev/null
@@ -1,174 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.NotifyTests_Lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  Activation_ManagerC.cpp \
-  Activation_ManagerC.h \
-  Activation_ManagerC.inl \
-  Activation_ManagerS.cpp \
-  Activation_ManagerS.h \
-  Activation_ManagerS.inl
-
-CLEANFILES = \
-  Activation_Manager-stamp \
-  Activation_ManagerC.cpp \
-  Activation_ManagerC.h \
-  Activation_ManagerC.inl \
-  Activation_ManagerS.cpp \
-  Activation_ManagerS.h \
-  Activation_ManagerS.inl
-
-Activation_ManagerC.cpp Activation_ManagerC.h Activation_ManagerC.inl Activation_ManagerS.cpp Activation_ManagerS.h Activation_ManagerS.inl: Activation_Manager-stamp
-
-Activation_Manager-stamp: $(srcdir)/Activation_Manager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Activation_Manager.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libTAO_NotifyTests.la
-
-libTAO_NotifyTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_TEST_BUILD_DLL
-
-libTAO_NotifyTests_la_SOURCES = \
-  Activation_Manager.cpp \
-  Activation_ManagerC.cpp \
-  Activation_ManagerS.cpp \
-  Application_Command.cpp \
-  Command.cpp \
-  Command_Builder.cpp \
-  Command_Factory.cpp \
-  ConsumerAdmin_Command.cpp \
-  Direct_Consumer.cpp \
-  Direct_Supplier.cpp \
-  Driver.cpp \
-  EventChannel_Command.cpp \
-  Factories_Define.cpp \
-  Filter_Command.cpp \
-  LookupManager.cpp \
-  Name.cpp \
-  Notify_Test_Client.cpp \
-  Options_Parser.cpp \
-  Peer.cpp \
-  Periodic_Consumer.cpp \
-  Periodic_Consumer_Command.cpp \
-  Periodic_Supplier.cpp \
-  Periodic_Supplier_Command.cpp \
-  Priority_Mapping.cpp \
-  PushConsumer.cpp \
-  PushSupplier.cpp \
-  Relay_Consumer.cpp \
-  SequencePushConsumer.cpp \
-  SequencePushSupplier.cpp \
-  StructuredEvent.cpp \
-  StructuredPushConsumer.cpp \
-  StructuredPushSupplier.cpp \
-  SupplierAdmin_Command.cpp \
-  Task_Callback.cpp \
-  Task_Stats.cpp \
-  common.cpp
-
-noinst_HEADERS = \
-  Activation_Manager.h \
-  Activation_Manager.idl \
-  Activation_ManagerC.h \
-  Activation_ManagerC.inl \
-  Activation_ManagerS.h \
-  Activation_ManagerS.inl \
-  Application_Command.h \
-  Command.h \
-  Command_Builder.h \
-  Command_Factory.h \
-  Command_Factory_T.cpp \
-  Command_Factory_T.h \
-  ConsumerAdmin_Command.h \
-  Consumer_T.cpp \
-  Consumer_T.h \
-  Direct_Consumer.h \
-  Direct_Supplier.h \
-  Direct_Supplier.inl \
-  Driver.h \
-  Driver_Base.h \
-  EventChannel_Command.h \
-  Factories_Define.h \
-  Filter_Command.h \
-  LookupManager.h \
-  Name.h \
-  Notify_PushConsumer.h \
-  Notify_PushSupplier.h \
-  Notify_SequencePushConsumer.h \
-  Notify_SequencePushSupplier.h \
-  Notify_StructuredPushConsumer.h \
-  Notify_StructuredPushSupplier.h \
-  Notify_Test_Client.h \
-  Options_Parser.h \
-  Peer.h \
-  Peer.inl \
-  Peer_T.cpp \
-  Peer_T.h \
-  Periodic_Consumer.h \
-  Periodic_Consumer_Command.h \
-  Periodic_Supplier.h \
-  Periodic_Supplier_Command.h \
-  Priority_Mapping.h \
-  PushConsumer.h \
-  PushConsumer.inl \
-  PushSupplier.h \
-  PushSupplier.inl \
-  Relay_Consumer.h \
-  Relay_Consumer.inl \
-  SequencePushConsumer.h \
-  SequencePushConsumer.inl \
-  SequencePushSupplier.h \
-  SequencePushSupplier.inl \
-  StructuredEvent.h \
-  StructuredPushConsumer.h \
-  StructuredPushConsumer.inl \
-  StructuredPushSupplier.h \
-  StructuredPushSupplier.inl \
-  SupplierAdmin_Command.h \
-  Supplier_T.cpp \
-  Supplier_T.h \
-  Task_Callback.h \
-  Task_Stats.h \
-  Task_Stats.inl \
-  common.h \
-  notify_test_export.h
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/lib/Name.cpp b/orbsvcs/tests/Notify/lib/Name.cpp
index b8a3081afbe..44b649dffb7 100644
--- a/orbsvcs/tests/Notify/lib/Name.cpp
+++ b/orbsvcs/tests/Notify/lib/Name.cpp
@@ -2,7 +2,7 @@
 
 #include "Name.h"
 
-ACE_RCSID(lib, TAO_Name, "$Id$")
+
 
 #define TAO_Notify_Tests_DECLARE_NAME(target, name) \
 const char* const TAO_Notify_Tests_Name::target = name;
diff --git a/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h b/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
index 0a66baa40e3..274e3ca068b 100644
--- a/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
+++ b/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
@@ -1,28 +1,25 @@
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_PushConsumer.h
-//
-// = DESCRIPTION
-//   This is a utility class is to be used by clients of the Notification
-//   Service to implement the servant for CosNotifyComm::PushConsumer
-//
-// = HOW-TO
-//   1. Derive from Notify_ProxyConsumer and implement <push>.
-//   2. Create the servant on the heap.(refcounted servant).
-//   3. Initialize the object, provide a POA.
-//   4. To connect, call <connect>, this will activate the object in the POA.
-//       You must provide a ConsumerAdmin to <connect>.
-//   5. To disconnect, call <disconnect> this will also deactivate the object.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_PushConsumer.h
+ *
+ *  $Id$
+ *
+ * This is a utility class is to be used by clients of the Notification
+ * Service to implement the servant for CosNotifyComm::PushConsumer
+ *
+ * = HOW-TO
+ * 1. Derive from Notify_ProxyConsumer and implement <push>.
+ * 2. Create the servant on the heap.(refcounted servant).
+ * 3. Initialize the object, provide a POA.
+ * 4. To connect, call <connect>, this will activate the object in the POA.
+ *     You must provide a ConsumerAdmin to <connect>.
+ * 5. To disconnect, call <disconnect> this will also deactivate the object.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_NOTIFY_PUSHCONSUMER_H
 #define TAO_NOTIFY_PUSHCONSUMER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h b/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
index 453abae9d5a..7f3485a5b43 100644
--- a/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
+++ b/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_SequencePushConsumer.h
-//
-// = DESCRIPTION
-//   This is a utility class is to be used by clients of the Notification
-//   Service to implement the servant for CosNotifyComm::SequencePushConsumer
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_SequencePushConsumer.h
+ *
+ *  $Id$
+ *
+ * This is a utility class is to be used by clients of the Notification
+ * Service to implement the servant for CosNotifyComm::SequencePushConsumer
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_SEQUENCEPUSHCONSUMER_H
 #define NOTIFY_SEQUENCEPUSHCONSUMER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h b/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
index 74fd09d4498..b43bbbc41d7 100644
--- a/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
+++ b/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
@@ -1,21 +1,16 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_SequencePushSupplier
-//
-// = DESCRIPTION
-//   This class is to be used by clients of the Notification Service
-//   to implement Sequence Push Suppliers.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_SequencePushSupplier.h
+ *
+ *  $Id$
+ *
+ * This class is to be used by clients of the Notification Service
+ * to implement Sequence Push Suppliers.
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
 
 #ifndef TAO_NOTIFY_SEQUENCEPUSHSUPPLIER_H
 #define TAO_NOTIFY_SEQUENCEPUSHSUPPLIER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h b/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
index 8364a0394b3..292b6a7c595 100644
--- a/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
+++ b/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_StructuredPushConsumer.h
-//
-// = DESCRIPTION
-//   This is a utility class is to be used by clients of the Notification
-//   Service to implement the servant for CosNotifyComm::PushConsumer
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_StructuredPushConsumer.h
+ *
+ *  $Id$
+ *
+ * This is a utility class is to be used by clients of the Notification
+ * Service to implement the servant for CosNotifyComm::PushConsumer
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_STRUCTUREDPUSHCONSUMER_H
 #define NOTIFY_STRUCTUREDPUSHCONSUMER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h b/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
index ecc804ae3aa..dde3618d7c1 100644
--- a/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
+++ b/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
@@ -1,21 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_StructuredPushSupplier
-//
-// = DESCRIPTION
-//   This class is to be used by clients of the Notification Service
-//   to implement Structured Push Suppliers.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_StructuredPushSupplier.h
+ *
+ *  $Id$
+ *
+ * This class is to be used by clients of the Notification Service
+ * to implement Structured Push Suppliers.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
 
 #ifndef TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H
 #define TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index fb95de7463a..346a41a23e8 100644
--- a/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Notify_Test_Client.h"
-
-ACE_RCSID (lib,
-           Notify_Test_Client,
-           "$Id$")
-
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
 
diff --git a/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 8df3e0f673f..07baebcd5e4 100644
--- a/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Notify_Test_Client.h
-//
-// = DESCRIPTION
-//   Prototype Test Driver for all the Notify tests.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Test_Client.h
+ *
+ *  $Id$
+ *
+ * Prototype Test Driver for all the Notify tests.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TEST_CLIENT_H
 #define NOTIFY_TEST_CLIENT_H
@@ -25,87 +25,90 @@
 
 class TAO_Notify_Tests_Peer;
 
+/**
+ * @class Notify_Test_Client
+ *
+ * @brief Notify_Test_Client
+ *
+ * Shows how consumers Notify_Test_Client for events.
+ */
 class TAO_NOTIFY_TEST_Export Notify_Test_Client
 {
-  // = TITLE
-  //   Notify_Test_Client
-  // = DESCRIPTION
-  //   Shows how consumers Notify_Test_Client for events.
 
 public:
   // = Initialization and Termination
   Notify_Test_Client (void);
   virtual ~Notify_Test_Client ();
 
+  /// starts the orb and resolves the notify factory via a naming service.
   virtual int init (int argc, ACE_TCHAR *argv []);
-  // starts the orb and resolves the notify factory via a naming service.
 
+  /// Allow the user to override this empty method
   virtual int parse_args (int argc, ACE_TCHAR* argv[]);
-  // Allow the user to override this empty method
 
+  /// Call ORB::run to accept requests.
   int ORB_run (void);
   int ORB_run (ACE_Time_Value& tv);
-  // Call ORB::run to accept requests.
 
+  /// How many clients will call consumer_done.
   void consumer_start (TAO_Notify_Tests_Peer*);
-  // How many clients will call consumer_done.
 
+  /// Callback for clients to unregister themselves.
   void consumer_done (TAO_Notify_Tests_Peer*);
-  // Callback for clients to unregister themselves.
 
+  /// Access the done boolean.
   bool is_done (void) const;
-  // Access the done boolean.
 
+  /// Access the ORB.  This class retains ownership.
   CORBA::ORB_ptr orb (void);
-  // Access the ORB.  This class retains ownership.
 
+  /// Access the Root POA.  This class retains ownership.
   PortableServer::POA_ptr root_poa (void);
-  // Access the Root POA.  This class retains ownership.
 
+  /// Access the Naming Context.  This class retains ownership.
   CosNaming::NamingContext_ptr naming_context (void);
-  // Access the Naming Context.  This class retains ownership.
 
+  /// Access the Notify Factory.  This class retains ownership.
   CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
-  // Access the Notify Factory.  This class retains ownership.
 
+  /// Create an Event Channel.  Ownership is passed to the caller.
   CosNotifyChannelAdmin::EventChannel_ptr create_event_channel (
                                               const char* name,
                                               bool resolve
                                             );
-  // Create an Event Channel.  Ownership is passed to the caller.
 
 protected:
+  /// Initializes the ORB.
   int init_ORB (int argc,
                 ACE_TCHAR *argv []);
-  // Initializes the ORB.
 
+  /// Try to get hold of a running naming service.
   void resolve_naming_service (void);
-  // Try to get hold of a running naming service.
 
+  /// Try to resolve the Notify factory from the Naming service.
   void resolve_Notify_factory (void);
-  // Try to resolve the Notify factory from the Naming service.
 
   // = Data Members
+  /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// Handle to the name service.
   CosNaming::NamingContext_var naming_context_;
-  // Handle to the name service.
 
+  /// Channel factory.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
-  // Channel factory.
 
+  /// The group operator between admin-proxy's.
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-  // The group operator between admin-proxy's.
 
+  /// Initial qos specified to the factory when creating the EC.
   CosNotification::QoSProperties initial_qos_;
-  // Initial qos specified to the factory when creating the EC.
 
+  /// Initial admin props specified to the factory when creating the EC.
   CosNotification::AdminProperties initial_admin_;
-  // Initial admin props specified to the factory when creating the EC.
 
 private:
   ACE_Atomic_Op< TAO_SYNCH_MUTEX, int > num_clients_;
diff --git a/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index d60d6a1cfbf..032255f285c 100644
--- a/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Options_Parser.h"
-
-ACE_RCSID (lib,
-           TAO_Options_Parser,
-           "$Id$")
-
 #include "orbsvcs/NotifyExtC.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
diff --git a/orbsvcs/tests/Notify/lib/Options_Parser.h b/orbsvcs/tests/Notify/lib/Options_Parser.h
index 743073b3248..27542746489 100644
--- a/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_OPTIONS_PARSER_H
diff --git a/orbsvcs/tests/Notify/lib/Peer.cpp b/orbsvcs/tests/Notify/lib/Peer.cpp
index f4b14d6cdf8..2012aeebbb3 100644
--- a/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -6,10 +6,6 @@
 #include "Peer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (lib,
-           TAO_Peer,
-           "$Id$")
-
 #include "Name.h"
 #include "LookupManager.h"
 #include "Options_Parser.h"
diff --git a/orbsvcs/tests/Notify/lib/Peer_T.cpp b/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 2f54bdbbf88..62a30ea9a2a 100644
--- a/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -5,10 +5,6 @@
 
 #include "Peer_T.h"
 
-ACE_RCSID (Notify,
-           TAO_Notify_Tests_Peer_T,
-           "$Id$")
-
 #include "ace/Arg_Shifter.h"
 #include "Name.h"
 #include "LookupManager.h"
diff --git a/orbsvcs/tests/Notify/lib/Peer_T.h b/orbsvcs/tests/Notify/lib/Peer_T.h
index 6c82ff95f31..39369c6ee34 100644
--- a/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PEER_T_H
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 8c9797dce3b..0f81dbae0ec 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -13,10 +13,6 @@
 #include "LookupManager.h"
 #include "Priority_Mapping.h"
 
-ACE_RCSID (RT_Notify,
-           TAO_Notify_Tests_Periodic_Consumer,
-           "$Id$")
-
 int WARMUP_COUNT = 10;
 
 TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer (void)
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 9d53353228b..aa951675a6b 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PERIODIC_CONSUMER_H
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index 366c24113e5..beb4edbb007 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Periodic_Consumer_Command.h"
-
-ACE_RCSID (lib,
-           TAO_Periodic_Consumer_Command,
-           "$Id$")
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Periodic_Consumer.h"
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index 9818f461ab7..68008e4981d 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PERIODICCONSUMER_COMMAND_H
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index 7aab7760d8e..eea04d1e903 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -15,10 +15,6 @@
 #include "LookupManager.h"
 #include "Priority_Mapping.h"
 
-ACE_RCSID (RT_Notify,
-           TAO_Notify_Tests_Periodic_Supplier,
-           "$Id$")
-
 TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void)
   : barrier_ (0),
     priority_ (0),
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 1ccedf9b240..3237daf6d7f 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PERIODIC_SUPPLIER_H
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 946f81ebda9..a7b182245c9 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Periodic_Supplier_Command.h"
-
-ACE_RCSID (lib,
-           TAO_Periodic_Supplier_Command,
-           "$Id$")
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Periodic_Supplier.h"
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index bd261f52491..82a6831d61a 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PERIODICSUPPLIER_COMMAND_H
diff --git a/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
index 870eef04d59..79ca0812d95 100644
--- a/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
+++ b/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
@@ -2,7 +2,7 @@
 
 #include "Priority_Mapping.h"
 
-ACE_RCSID(lib, Priority_Mapping, "$Id$")
+
 
 TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void)
 {
diff --git a/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 27cb0748b62..79ef0239bcd 100644
--- a/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "PushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_PushConsumer, "$Id$")
+
 
 TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index 335efc1ec7e..b01c70d6913 100644
--- a/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -6,7 +6,7 @@
 #include "PushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_PushSupplier, "$Id$")
+
 
 TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index 252d400bd7b..f1fbdc1589c 100644
--- a/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "Relay_Consumer.h"
 
-ACE_RCSID(Notify, TAO_Notify_Tests_Relay_Consumer, "$Id$")
+
 
 #include "LookupManager.h"
 
diff --git a/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index 169b179a4aa..08e1ceff1db 100644
--- a/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "SequencePushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_SequencePushConsumer, "$Id$")
+
 
 TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index 36537a16048..e98fb96a64d 100644
--- a/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -6,7 +6,7 @@
 #include "SequencePushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_SequencePushSupplier, "$Id$")
+
 
 TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
index 6c6a9882916..df0a5070e30 100644
--- a/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
+++ b/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
@@ -2,7 +2,7 @@
 
 #include "StructuredEvent.h"
 
-ACE_RCSID(RT_Notify, TAO_Notify_Tests_StructuredEvent, "$Id$")
+
 
 TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void)
 {
diff --git a/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index eb7973ba0e6..a63246fb1ed 100644
--- a/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "StructuredPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_StructuredPushConsumer, "$Id$")
+
 
 TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index d5cc66c07d0..ec7504e106f 100644
--- a/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -6,7 +6,7 @@
 #include "StructuredPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_StructuredPushSupplier, "$Id$")
+
 
 TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index ce6077a3632..00bbda0d9e2 100644
--- a/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "SupplierAdmin_Command.h"
 
-ACE_RCSID(lib, TAO_SupplierAdmin_Command, "$Id$")
+
 
 #include "LookupManager.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 86d43a54f03..f7a32546bf1 100644
--- a/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -4,7 +4,7 @@
 
 #include "Supplier_T.h"
 
-ACE_RCSID(Notify, TAO_Notify_Tests_Supplier_T, "$Id$")
+
 
 template <class Supplier_Traits>
 TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void)
diff --git a/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index 3669f3987a1..5420c116b22 100644
--- a/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
 #include "Task_Stats.h"
-#include "ace/OS.h"
+#include "ace/ACE.h"
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
@@ -61,7 +61,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int
   FILE* output_file = ACE_OS::fopen (file_name, "w");
 
   // first dump what the caller has to say.
-  ACE_OS::fprintf (output_file, "%s\n",msg);
+  ACE_OS::fprintf (output_file, "%s\n", ACE_TEXT_ALWAYS_CHAR (msg));
 
   // next, compose and dump what we want to say.
 
@@ -70,7 +70,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int
 
   char out_msg[BUFSIZ];
 
-  if (seconds == 0 || samples_count_ == 0)
+  if (ACE::is_equal (seconds, 0.0) || samples_count_ == 0)
   {
         ACE_OS::sprintf (out_msg,
                    "# No samples recorded\n");
@@ -83,7 +83,9 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int
   double t_avg = samples_count_ / seconds;
 
   ACE_OS::sprintf (out_msg,
-                   "# Throughput: %.2f (events/second) [%u samples in %.2f seconds]\n",
+                   "# Throughput: %.2f (events/second) ["
+                   ACE_SIZE_T_FORMAT_SPECIFIER_ASCII
+                   " samples in %.2f seconds]\n",
                    t_avg, samples_count_, seconds);
   ACE_OS::fprintf (output_file, "%s",out_msg);
 
diff --git a/orbsvcs/tests/Notify/lib/common.h b/orbsvcs/tests/Notify/lib/common.h
index 7704baa6a25..fa0a5fb4b7d 100644
--- a/orbsvcs/tests/Notify/lib/common.h
+++ b/orbsvcs/tests/Notify/lib/common.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/lib
-//
-// = FILENAME
-//   common.h
-//
-// = DESCRIPTION
-//   A couple of useful functions
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   common.h
+ *
+ *  $Id$
+ *
+ * A couple of useful functions
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
deleted file mode 100644
index 1c6add36f4c..00000000000
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
+++ /dev/null
@@ -1,277 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Filter_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Filter_Notify_Perf_Sequence_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Filter_Ntf_Perf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Filter_Ntf_Perf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Filter_Ntf_Perf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
index ac3e9d44568..1b3e96fd666 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
index 9d7d0cdd158..a9413e7f69b 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index cac550ca29e..11b00de9bcc 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -74,7 +74,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index a1025de2028..d8b969cc3b1 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -104,7 +104,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index 850a9061f4a..aee14a0ca01 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -72,7 +72,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index 8063e25ffbe..56488818be0 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -104,7 +104,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
index 987280e3a79..88fc0406dd1 100755
--- a/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
@@ -38,10 +38,10 @@ my $port = $nm_service->RandomPort();
 my $host = $nm_service->HostName();
 
 my $initref = "-ORBInitRef NameService=iioploc://$host:$port/NameService ";
-      
-$NS = $nm_service->CreateProcess ("../../../../Naming_Service/Naming_Service",
+
+$NS = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming",
                                   "-ORBEndpoint iiop://$host:$port -o $ns_naming_ior");
-$TS = $nt_service->CreateProcess ("../../../../Notify_Service/Notify_Service", $initref.
+$TS = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", $initref.
                                   "-IORoutput $ts_notify_ior -ORBSvcConf $ts_notify_conf");
 $STS = $supplier->CreateProcess ("Structured_Supplier", $initref.
                                  "-o $supplier_supplier_ior");
@@ -71,7 +71,7 @@ sub run_test {
         $SP->Kill (); $SP->TimedWait (1);
         return 1;
     }
-    
+
     if ($supplier->GetFile ($supplier_ior) == -1) {
         print STDERR "ERROR: cannot retrieve file <$supplier_supplier_ior>\n";
         $SP->Kill (); $SP->TimedWait (1);
diff --git a/orbsvcs/tests/Notify/performance-tests/Makefile.am b/orbsvcs/tests/Notify/performance-tests/Makefile.am
deleted file mode 100644
index de02210c1a5..00000000000
--- a/orbsvcs/tests/Notify/performance-tests/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Filter \
-        RedGreen \
-        Throughput
-
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
deleted file mode 100644
index d0ee8a5cb74..00000000000
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RedGreen_Ntf_Perf_RedGreen.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = RedGreen_Test
-
-RedGreen_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-RedGreen_Test_SOURCES = \
-  RedGreen_Test.cpp \
-  main.cpp \
-  RedGreen_Test.h
-
-RedGreen_Test_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-RedGreen_Test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 081af8ac861..e02c7b18110 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Notify,
-           RedGreen_Test,
-           "$Id$")
-
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
 
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 2eeae43842c..720939e4b2c 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -1,18 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   RedGreen_Test.h
-//
-// = DESCRIPTION
-//   Performance test to show improvement in Notify performance by picking the
-//   correcting configuration.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   RedGreen_Test.h
+ *
+ *  $Id$
+ *
+ * Performance test to show improvement in Notify performance by picking the
+ * correcting configuration.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_RedGreen_Test_CLIENT_H
 #define NOTIFY_RedGreen_Test_CLIENT_H
@@ -34,37 +34,41 @@
 class RedGreen_Test_StructuredPushConsumer;
 class RedGreen_Test_StructuredPushSupplier;
 
+/**
+ * @class Worker
+ *
+ * @brief Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
+  /// Constructor.
   Worker (void);
-  // Constructor.
 
   void orb (CORBA::ORB_ptr orb);
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
   // Shutdown ORB
   void done (void);
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 };
 
+/**
+ * @class RedGreen_Test
+ *
+ * @brief RedGreen_Test
+ *
+ * Shows how consumers RedGreen_Test for events.
+ */
 class RedGreen_Test
 {
-  // = TITLE
-  //   RedGreen_Test
-  // = DESCRIPTION
-  //   Shows how consumers RedGreen_Test for events.
 
  public:
   // = Initialization
@@ -75,82 +79,82 @@ class RedGreen_Test
 
   void dump_results (void);
 
+  /// Initialize the Client.
   void init (int argc,
              ACE_TCHAR *argv []);
-  // Initialize the Client.
 
+  /// Run the demo.
   void run (void);
-  // Run the demo.
 
+  /// Called when all events we are waiting for have occured.
   void done (void);
-  // Called when all events we are waiting for have occured.
 
+  /// Destroy from the EC
   void destroy_ec (void);
-  // Destroy from the EC
 
   int burst_size_;
   Worker worker_;
   int nthreads_;
 
  protected:
+  /// Initializes the ORB.
   void init_ORB (int argc,
                  ACE_TCHAR *argv []);
-  // Initializes the ORB.
 
+  /// Try to get hold of a running naming service.
   void resolve_naming_service (void);
-  // Try to get hold of a running naming service.
 
+  /// Try to resolve the Notify factory from the Naming service.
   void resolve_Notify_factory (void);
-  // Try to resolve the Notify factory from the Naming service.
 
+  /// Create an EC.
   void create_EC (void);
-  // Create an EC.
 
+  /// Create the Supplier Admin.
   void create_supplieradmin(void);
-  // Create the Supplier Admin.
 
+  /// Create the Consumer Admin.
   void create_consumeradmin (void);
-  // Create the Consumer Admin.
 
+  /// Create and initialize the consumers.
   void create_consumers (void);
-  // Create and initialize the consumers.
 
+  /// create and initialize the suppliers.
   void create_suppliers (void);
-  // create and initialize the suppliers.
 
+  /// send the events.
   void send_events (void);
-  // send the events.
 
   // = Data Members.
+  /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// Handle to the name service.
   CosNaming::NamingContext_var naming_context_;
-  // Handle to the name service.
 
+  /// Channel factory.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
-  // Channel factory.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The group operator between admin-proxy's.
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-  // The group operator between admin-proxy's.
 
+  /// Initial qos specified to the factory when creating the EC.
   CosNotification::QoSProperties initial_qos_;
-  // Initial qos specified to the factory when creating the EC.
 
+  /// Initial admin props specified to the factory when creating the EC.
   CosNotification::AdminProperties initial_admin_;
-  // Initial admin props specified to the factory when creating the EC.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
   RedGreen_Test_StructuredPushConsumer* normal_consumer_;
   RedGreen_Test_StructuredPushConsumer* slow_consumer_;
@@ -171,49 +175,49 @@ class RedGreen_Test_StructuredPushConsumer
 
  public:
   // = Initialization and Termination code
+  /// Constructor.
   RedGreen_Test_StructuredPushConsumer (RedGreen_Test* RedGreen_Test);
-  // Constructor.
 
+  /// Connect the Consumer to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  // Connect the Consumer to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   virtual void disconnect (void);
-  // Disconnect from the supplier.
 
+  /// Accessor for the Proxy that we're connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (
       void
     );
-  // Accessor for the Proxy that we're connected to.
 
+  /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
-  // Accumulate the throughput statistics into <throughput>
 
+  /// Accumulate the throughput statistics into <throughput>
   void dump_stats (const ACE_TCHAR* msg, ACE_UINT32 gsf);
-  // Accumulate the throughput statistics into <throughput>
 
 protected:
   // = Data members
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
-  // The proxy that we are connected to.
 
+  /// The proxy_supplier id.
   CosNotifyChannelAdmin::ProxyID proxy_supplier_id_;
-  // The proxy_supplier id.
 
+  /// callback <done>
   RedGreen_Test* RedGreen_Test_;
-  // callback <done>
 
+  /// Protect internal state
   TAO_SYNCH_MUTEX lock_;
-  // Protect internal state
 
   int push_count_;
 
+  /// Used for reporting stats
   ACE_Throughput_Stats throughput_;
-  // Used for reporting stats
 
   // = Methods
+  /// Destructor
   virtual ~RedGreen_Test_StructuredPushConsumer (void);
-  // Destructor
 
   // = NotifyPublish method
   virtual void offer_change (
@@ -255,39 +259,39 @@ class RedGreen_Test_StructuredPushSupplier
   //
  public:
   // = Initialization and Termination code
+  /// Constructor.
   RedGreen_Test_StructuredPushSupplier (void);
-  // Constructor.
 
+  /// Connect the Supplier to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  // Connect the Supplier to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   void disconnect (void);
-  // Disconnect from the supplier.
 
+  /// Send one event.
   virtual void send_event (CosNotification::StructuredEvent& event);
-  // Send one event.
 
+  /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
-  // Accumulate the throughput statistics into <throughput>
 
+  /// Accumulate the throughput statistics into <throughput>
   void dump_stats (const ACE_TCHAR* msg, ACE_UINT32 gsf);
-  // Accumulate the throughput statistics into <throughput>
 
 protected:
   // = Data members
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_;
-  // The proxy that we are connected to.
 
+  /// This supplier's id.
   CosNotifyChannelAdmin::ProxyID proxy_consumer_id_;
-  // This supplier's id.
 
+  /// Measure the elapsed time spent while sending the events.
   ACE_Throughput_Stats throughput_;
-  // Measure the elapsed time spent while sending the events.
 
   // = Protected Methods
+  /// Destructor
   virtual ~RedGreen_Test_StructuredPushSupplier ();
-  // Destructor
 
   // = NotifyRedGreen_Test
   virtual void subscription_change (
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf b/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
index 6c62c9bb7c2..9d3a088919d 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
@@ -1,4 +1,5 @@
 ## $Id$
+
 static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -DispatchingThreads 1"
 
 
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf b/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
index 9965c905158..8fb85f0082f 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
@@ -1,2 +1,3 @@
 ## $Id$
+
 static Notify_Default_Event_Manager_Objects_Factory "-SourceThreads 2"
\ No newline at end of file
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
index 200c2019316..cd32f090a3e 100755
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
@@ -32,9 +32,9 @@ $nt_service->DeleteFile ($notify_ior);
 $nt_service->DeleteFile ($naming_ior);
 $test->DeleteFile ($naming_ior);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../Naming_Service/Naming_Service", "-o $nm_service_nmiorfile");
+$NM_SV = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile");
 $T = $test->CreateProcess ("RedGreen_Test", "-ORBInitRef NameService=file://$test_nmiorfile");
-$NT_SV = $nt_service->CreateProcess ("../../../../Notify_Service/Notify_Service", "");
+$NT_SV = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", "");
 
 $nm_service_status = $NM_SV->Spawn ();
 
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf b/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf
index 71ec9c42ce6..878eb245f3d 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Resource_Factory "-ORBReactorMaskSignals 0"
diff --git a/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
deleted file mode 100644
index 201e70546db..00000000000
--- a/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Throughput_Ntf_Perf_Throughput.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Throughput
-
-Throughput_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Throughput_SOURCES = \
-  Throughput.cpp \
-  Throughput.h
-
-Throughput_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Throughput_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 845f2830de4..b8727bcd8c5 100644
--- a/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -5,17 +5,12 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "ace/Synch.h"
-#include "ace/OS.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Messaging/Messaging.h"
 #include "orbsvcs/Notify/Service.h"
 #include "orbsvcs/Time_Utilities.h"
 
-ACE_RCSID (Notify_Tests,
-           Throughput,
-           "$Id$")
-
 /***************************************************************************/
 
 Throughput_StructuredPushConsumer::Throughput_StructuredPushConsumer (
diff --git a/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 1132a4e8631..db80e448756 100644
--- a/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -1,16 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Throughput.h
-//
-// = DESCRIPTION
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Throughput.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_Throughput_H
 #define NOTIFY_Throughput_H
@@ -29,28 +27,29 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class Worker
+ *
+ * @brief Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
+  /// ctor
   Worker (void);
-  // ctor
 
   void orb (CORBA::ORB_ptr orb);
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
   int done_;
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 };
 
 /***************************************************************************/
@@ -61,34 +60,34 @@ class Throughput_StructuredPushConsumer
   : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
+  /// Contructor.
   Throughput_StructuredPushConsumer (Notify_Throughput *test_client);
-  // Contructor.
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
       );
 
+  /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
-  // Accumulate the throughput statistics into <throughput>
 
+  /// Accumulate the throughput statistics into <throughput>
   void dump_stats (const ACE_TCHAR* msg, ACE_UINT32 gsf);
-  // Accumulate the throughput statistics into <throughput>
 
 protected:
   Notify_Throughput * test_client_;
 
+  /// Protect internal state
   TAO_SYNCH_MUTEX lock_;
-  // Protect internal state
 
+  /// The timestamp for the first message received
   ACE_hrtime_t throughput_start_;
-  // The timestamp for the first message received
 
+  /// Used for reporting stats
   ACE_Throughput_Stats throughput_;
-  // Used for reporting stats
 
+  /// The number of push() calls
   int push_count_;
-  // The number of push() calls
 };
 
 /***************************************************************************/
@@ -98,32 +97,32 @@ class Throughput_StructuredPushSupplier
     public ACE_Task_Base
 {
 public:
+  /// Constructor.
   Throughput_StructuredPushSupplier (Notify_Throughput * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Throughput_StructuredPushSupplier ();
-  // Destructor.
 
   // = The ACE_Task_Base methods....
   virtual int svc (void);
 
+  /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
-  // Accumulate the throughput statistics into <throughput>
 
+  /// Accumulate the throughput statistics into <throughput>
   void dump_stats (const ACE_TCHAR* msg, ACE_UINT32 gsf);
-  // Accumulate the throughput statistics into <throughput>
 
 protected:
   Notify_Throughput* test_client_;
 
+  /// Count the number of push() calls
   int push_count_;
-  // Count the number of push() calls
 
+  /// The time for the first event sent
   ACE_hrtime_t throughput_start_;
-  // The time for the first event sent
 
+  /// Measure the elapsed time spent while sending the events.
   ACE_Throughput_Stats throughput_;
-  // Measure the elapsed time spent while sending the events.
 };
 
 /***************************************************************************/
@@ -137,79 +136,79 @@ public:
 
   int parse_args(int argc, ACE_TCHAR *argv[]) ;
 
+  /// initialization.
   int init (int argc, ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// Peers call this when done.
   void peer_done (void);
-  // Peers call this when done.
 
+  /// check if we got the expected results.
   void dump_results (void);
-  // check if we got the expected results.
 
   Worker worker_;
 protected:
+  /// Create participants.
   void create_EC (void);
-  // Create participants.
 
+  /// is the ec collocated.
   CORBA::Boolean collocated_ec_;
-  // is the ec collocated.
 
+  /// How many bursts we will send from each supplier.
   int burst_count_;
-  // How many bursts we will send from each supplier.
 
+  /// The time between each event burst, in microseconds.
   int burst_pause_;
-  // The time between each event burst, in microseconds.
 
+  /// Number of events to send per supplier in every burst
   int burst_size_;
-  // Number of events to send per supplier in every burst
 
+  /// data size to transmit.
   int payload_size_;
-  // data size to transmit.
 
+  /// the payload.
   char *payload_;
-  // the payload.
 
+  /// Consumer count
   int consumer_count_;
-  // Consumer count
 
+  /// Supplier count
   int supplier_count_;
-  // Supplier count
 
+  /// Number of events received that each consumer expects to see.
   int perconsumer_count_;
-  // Number of events received that each consumer expects to see.
 
+  /// The name of the EC to resolve.
   ACE_CString ec_name_;
-  // The name of the EC to resolve.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumers
   Throughput_StructuredPushConsumer** consumers_;
-  // Consumers
 
+  /// Suppliers
   Throughput_StructuredPushSupplier** suppliers_;
-  // Suppliers
 
   int nthreads_;
 
   // = Helpers to signal done.
+  /// how many peers are done.
   int peer_done_count_;
-  // how many peers are done.
 
+  /// The lock to serialize access to members.
   TAO_SYNCH_MUTEX lock_;
-  // The lock to serialize access to members.
 
+  /// exit wait condition
   TAO_SYNCH_CONDITION condition_;
-  // exit wait condition
 private:
   friend class Throughput_StructuredPushSupplier;
   friend class Throughput_StructuredPushConsumer;
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
index 0515ecbd0db..7e1c32ee057 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
@@ -1,2 +1,4 @@
+## $Id$
+
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
index a747c353448..c58381f28ec 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
@@ -1,3 +1,5 @@
+## $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
index 540f585bbd0..1154c82070a 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 #    DeleteFile($file) or die "Could not delete $file";
 #}
 
-$NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile";
 
 $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
index 0515ecbd0db..18d4f90968b 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
index a747c353448..4c20b15d32f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
index 5d3fb306395..7d4bd7e216f 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 #    DeleteFile($file) or die "Could not delete $file";
 #}
 
-$NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile";
 
 $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
index 7ba4be37cda..393c5812cb4 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
@@ -44,7 +44,7 @@ $supplier->DeleteFile ($consumer_ior);
 $consumer->DeleteFile ($naming_ior);
 $consumer->DeleteFile ($consumer_ior);
 
-$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile");
 
 $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
index 766d4286349..3a759aeb3b2 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
@@ -44,7 +44,7 @@ $supplier->DeleteFile ($consumer_ior);
 $consumer->DeleteFile ($naming_ior);
 $consumer->DeleteFile ($consumer_ior);
 
-$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile");
 
 $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
index 276d14817fd..3ca61b9dda4 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
@@ -60,7 +60,7 @@ $sup->DeleteFile ($reliorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
 $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
index 716e97cb155..520c3289059 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
@@ -60,7 +60,7 @@ $sup->DeleteFile ($reliorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
 $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
index 8774d46bf67..6b0f5032ee3 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
@@ -30,7 +30,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase);
 $nm_service->DeleteFile($iorbase);
 $collocated->DeleteFile($iorbase);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                                      "-ORBdebuglevel $debug_level -o $nm_service_iorfile");
 
 $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
index 865a3a106ca..009ac28cfad 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
@@ -32,7 +32,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase);
 $nm_service->DeleteFile($iorbase);
 $collocated->DeleteFile($iorbase);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                                      "-ORBdebuglevel $debug_level -o $nm_service_iorfile");
 
 $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
index 61456d1a199..aff8be2188f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
@@ -1,2 +1,4 @@
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""         
+# $Id$
+
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
 
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
index 9a2e6577459..7348bd02884 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ".
             "-IORoutput $nfs_nfsiorfile ".
             "-ORBSvcConf $nfs_nfsconffile";
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
index a747c353448..4c20b15d32f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
index 9d339a00db7..0e1050e731a 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ".
             "-IORoutput $nfs_nfsiorfile ".
             "-ORBSvcConf $nfs_nfsconffile";
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
index 0515ecbd0db..18d4f90968b 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
index a747c353448..4c20b15d32f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
index c3429f9f78a..be792c12a4a 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
@@ -58,18 +58,18 @@ my $nt_service = PerlACE::TestTarget::create_target (2) || die "Create target 2
 my $nm_ior = "naming.ior";
 my $nt_ior = "notify.ior";
 
-my $nt_service_nt_conf = $nt_service->LocalFile($nt_conf); 
+my $nt_service_nt_conf = $nt_service->LocalFile($nt_conf);
 my $nm_service_nm_ior  = $nm_service->LocalFile($nm_ior);
 my $nt_service_nm_ior  = $nt_service->LocalFile($nm_ior);
-my $nt_service_nt_ior  = $nt_service->LocalFile($nt_ior); 
+my $nt_service_nt_ior  = $nt_service->LocalFile($nt_ior);
 $nm_service->DeleteFile($nm_ior);
 $nt_service->DeleteFile($nm_ior);
 $nt_service->DeleteFile($nt_ior);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                                      "-ORBDebugLevel $debug_level -o $nm_service_nm_ior");
 
-$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/Notify_Service",
+$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification",
                                      "-ORBInitRef NameService=file://$nt_service_nm_ior ".
                                      "-IORoutput $nt_service_nt_ior ".
                                      "-ORBSvcConf $nt_service_nt_conf ".
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
index b6bc4c2b26e..4ea15e40ba8 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
@@ -81,9 +81,9 @@ $nt_service_ntconffile = $nt_service->LocalFile($notify_conf);
 $high_path_hpconffile = $high_path->LocalFile($high_path_conf);
 $other_path_opconffile = $other_path->LocalFile($other_paths_conf);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                                      "-o $nm_service_nmiorfile $debug");
-$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/Notify_Service",
+$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification",
                                      "-ORBInitRef NameService=file://$nt_service_nmiorfile ".
                                      "-IORoutput $nt_service_ntiorfile ".
                                      "-ORBSvcConf $nt_service_ntconffile $debug");
diff --git a/orbsvcs/tests/Property/Makefile.am b/orbsvcs/tests/Property/Makefile.am
deleted file mode 100644
index 3ac2d8c9a85..00000000000
--- a/orbsvcs/tests/Property/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Property_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Property_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Property/client.cpp b/orbsvcs/tests/Property/client.cpp
index 8c0a7edd4e5..c5dbbbe2a28 100644
--- a/orbsvcs/tests/Property/client.cpp
+++ b/orbsvcs/tests/Property/client.cpp
@@ -1,25 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Property
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    Test client for the Property Service.
-//
-// = AUTHORS
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  Test client for the Property Service.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "client.h"
 #include "tao/debug.h"
 
-ACE_RCSID(CosPropertyService, client, "$Id$")
+
 
   Client::Client (void)
 {
diff --git a/orbsvcs/tests/Property/client.h b/orbsvcs/tests/Property/client.h
index 9ab696bd6c1..db212a0b0bb 100644
--- a/orbsvcs/tests/Property/client.h
+++ b/orbsvcs/tests/Property/client.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Property
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//    Test client for the Property Service.
-//
-// = AUTHORS
-//   Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *  Test client for the Property Service.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef PROPERTY_CLIENT_H
 #define PROPERTY_CLIENT_H
@@ -33,72 +30,74 @@
 #include "orbsvcs/Property/CosPropertyService_i.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
+/**
+ * @class Client
+ *
+ * @brief Client for A/V Streams demo.
+ *
+ * Encapsulates client functionality.
+ */
 class Client
 {
-  // = TITLE
-  //    Client for A/V Streams demo.
-  //
-  // = DESCRIPTION
-  //    Encapsulates client functionality.
 public:
+  /// Constructor.
   Client (void);
-  // Constructor.
 
+  /// Initialize the ORB etc, and bind the MMDevices.
   int init (int argc,
             ACE_TCHAR **argv);
-  // Initialize the ORB etc, and bind the MMDevices.
 
+  /// Run the client.  This will call StreamCtrl::bind_devs.
   int run (void);
-  // Run the client.  This will call StreamCtrl::bind_devs.
 
+  /// Testing  the property service methods.
   int property_tester (void);
-  // Testing  the property service methods.
 
 protected:
+  /// Bind to the remote MMDevice.
   int bind_to_remote_mmdevice (int argc,
                                ACE_TCHAR *argv[]);
-  // Bind to the remote MMDevice.
 
   // = Property Testing.
 
+  /// Testing the define property method.
   int test_define_property (void);
-  // Testing the define property method.
 
+  /// Testing the number of properties, currently in the Property Set.
   int test_get_number_of_properties (void);
-  // Testing the number of properties, currently in the Property Set.
 
+  ///Testing get_all_property_names.
   int test_get_all_property_names (void);
-  //Testing get_all_property_names.
 
+  /// Testing get_property_value.
   int test_get_property_value (void);
-  // Testing get_property_value.
 
+  ///Testing get_properties.  Give the names and get their properties.
   int test_get_properties (void);
-  //Testing get_properties.  Give the names and get their properties.
 
+  /// Testing get_all_properties.
   int test_get_all_properties (void);
-  // Testing get_all_properties.
 
+  /// Testing delete_property.
   int test_delete_property (const char *property_name);
-  // Testing delete_property.
 
+  /// Testing delete_properties.
   int test_delete_properties (void);
-  // Testing delete_properties.
 
+  /// Defining a sequence of properties.
   int test_define_properties (void);
-  // Defining a sequence of properties.
 
+  /// Defines properties with various modes.
   int test_define_property_with_mode (void);
-  // Defines properties with various modes.
 
+  /// The ORB manager, handles ORB initialization etc.
   TAO_ORB_Manager manager_;
-  // The ORB manager, handles ORB initialization etc.
 
+  /// The Naming Client handles Naming Service work
   TAO_Naming_Client my_name_client_;
-  // The Naming Client handles Naming Service work
 
+  /// To test propertySetDef interface.
   CosPropertyService::PropertySetDef_var propsetdef_;
-  // To test propertySetDef interface.
 };
 
 #endif /* COSPROPERTYSERVICE_CLIENT_H */
diff --git a/orbsvcs/tests/Property/main.cpp b/orbsvcs/tests/Property/main.cpp
index 66d117d3feb..4044d2734a0 100644
--- a/orbsvcs/tests/Property/main.cpp
+++ b/orbsvcs/tests/Property/main.cpp
@@ -18,7 +18,7 @@
 #include "orbsvcs/CosPropertyS.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
 
-ACE_RCSID(CosPropertyService, main, "$Id$")
+
 
 class TAO_PropertySet_Tester
 {
diff --git a/orbsvcs/tests/Property/run_test.pl b/orbsvcs/tests/Property/run_test.pl
index b25091d754b..bc53ac19b04 100755
--- a/orbsvcs/tests/Property/run_test.pl
+++ b/orbsvcs/tests/Property/run_test.pl
@@ -33,9 +33,9 @@ $n_service->DeleteFile($iorbase);
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level ".
                                         "-ORBInitRef NameService=file://$server_iorfile");
 $CL = $client->CreateProcess ("client", "-ORBInitRef NameService=file://$client_iorfile");
-$NS = $n_service->CreateProcess ("../../Naming_Service/Naming_Service", "-o $n_service_iorfile");
+$NS = $n_service->CreateProcess ("../../Naming_Service/tao_cosnaming", "-o $n_service_iorfile");
 
-print STDERR "Starting Naming_Service\n";
+print STDERR "Starting tao_cosnaming\n";
 
 $n_service_status = $NS->Spawn ();
 
diff --git a/orbsvcs/tests/Property/server.cpp b/orbsvcs/tests/Property/server.cpp
index ec2c85ac2e5..165bf7e98de 100644
--- a/orbsvcs/tests/Property/server.cpp
+++ b/orbsvcs/tests/Property/server.cpp
@@ -1,24 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/CosPropertyService
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Test server for the CosPropertyService
-//
-// = AUTHORS
-//   Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Test server for the CosPropertyService
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "server.h"
 
-ACE_RCSID(CosPropertyService, server, "$Id$")
+
 
 // Main program
 
diff --git a/orbsvcs/tests/Property/server.h b/orbsvcs/tests/Property/server.h
index fde9aab4489..4c9fd930d7a 100644
--- a/orbsvcs/tests/Property/server.h
+++ b/orbsvcs/tests/Property/server.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/CosPropertyService
-//
-// = FILENAME
-//    server.h
-//
-// = DESCRIPTION
-//    Test server for the CosPropertyService.
-//
-// = AUTHORS
-//    Alexander Babu Arulanthu <alex.cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  Test server for the CosPropertyService.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex.cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef COSPROPERTYSERVICE_SERVER_H
 #define COSPROPERTYSERVICE_SERVER_H
diff --git a/orbsvcs/tests/Redundant_Naming/Makefile.am b/orbsvcs/tests/Redundant_Naming/Makefile.am
deleted file mode 100644
index 79a86c475a5..00000000000
--- a/orbsvcs/tests/Redundant_Naming/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Redundant_Naming_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-CLEANFILES = \
-  test_object-stamp \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp
-
-test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  test_objectC.cpp \
-  test_objectS.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.h \
-  test_objectS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Redundant_Naming/client.cpp b/orbsvcs/tests/Redundant_Naming/client.cpp
index 263084c4d5f..f54ada2e199 100644
--- a/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -2,12 +2,6 @@
 
 // ============================================================================
 //
-// = LIBRARY
-//    TAO/orbsvcs/Naming_Service/
-//
-// = FILENAME
-//    client.cpp
-//
 // = DESCRIPTION
 //      This class implements a CORBA client for a redundant CosNaming
 //      Service using stubs generated by the TAO ORB IDL compiler.
@@ -23,10 +17,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Simple_Naming,
-           client,
-           "$Id$")
-
 #if defined (_MSC_VER)
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
diff --git a/orbsvcs/tests/Redundant_Naming/run_test.pl b/orbsvcs/tests/Redundant_Naming/run_test.pl
index c20ddc54ed2..849a56c486c 100755
--- a/orbsvcs/tests/Redundant_Naming/run_test.pl
+++ b/orbsvcs/tests/Redundant_Naming/run_test.pl
@@ -78,7 +78,7 @@ else {
 # in files to find the individual copies of the Naming Servers.
 
 my $args = "-ORBEndPoint $ns_endpoint1 -o $test_iorfile1 -m 0 -r NameService";
-my $prog = "$startdir/../../Naming_Service/Naming_Service";
+my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
 
 $NS1 = $test->CreateProcess ("$prog", "$args");
 
@@ -94,7 +94,7 @@ if ($test->WaitForFileTimed ($iorfile1,
 }
 
 $args = "-ORBEndPoint $ns_endpoint2 -o $test_iorfile2 -m 0 -r NameService";
-$prog = "$startdir/../../Naming_Service/Naming_Service";
+$prog = "$startdir/../../Naming_Service/tao_cosnaming";
 
 $NS2 = $test->CreateProcess ("$prog", "$args");
 
diff --git a/orbsvcs/tests/Sched/DynSched_Test.cpp b/orbsvcs/tests/Sched/DynSched_Test.cpp
index b0567d8321c..0667203a972 100644
--- a/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ b/orbsvcs/tests/Sched/DynSched_Test.cpp
@@ -6,10 +6,6 @@
 # include <quantify.h>
 #endif /* ACE_HAS_QUANTIFY */
 
-ACE_RCSID (Sched,
-           DynSched_Test,
-           "$Id$")
-
 // period times, in 100 nanoseconds
 #define ONE_HZ    10000000
 #define FIVE_HZ    2000000
diff --git a/orbsvcs/tests/Sched/Makefile.am b/orbsvcs/tests/Sched/Makefile.am
deleted file mode 100644
index 8bc86453037..00000000000
--- a/orbsvcs/tests/Sched/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Sched.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Sched
-
-Sched_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Sched_SOURCES = \
-  DynSched_Test.cpp
-
-Sched_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Sched_Conf/Makefile.am b/orbsvcs/tests/Sched_Conf/Makefile.am
deleted file mode 100644
index 70335c7c397..00000000000
--- a/orbsvcs/tests/Sched_Conf/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Sched_Conf.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Sched_Conf
-
-Sched_Conf_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Sched_Conf_SOURCES = \
-  Sched_Conf.cpp \
-  Sched_Conf_Anomalies_Runtime.h \
-  Sched_Conf_Runtime.h
-
-Sched_Conf_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index d3dda03a311..8726ac155a7 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -11,10 +11,6 @@
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
-ACE_RCSID (Sched_Conf,
-           Sched_Conf,
-           "$Id$")
-
 const ACE_TCHAR *service_name = ACE_TEXT("ScheduleService");
 
 const char* format_string = " {%-12s, %d, %d, %d, %d, %8d, "
diff --git a/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index 5d1d575a31e..bf367eee839 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -11,7 +11,7 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
-ACE_RCSID(Sched_Conf, Sched_Conf_Anomalies, "$Id$")
+
 
 const char* service_name = "ScheduleService";
 
diff --git a/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h b/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
index 2662b3acb41..b221cecf8e5 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
@@ -53,7 +53,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]);
 
 
 // This sets up Scheduler_Factory to use the runtime version.
-int scheduler_factory_setup = 
+int scheduler_factory_setup =
   ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);
 
 // EOF
diff --git a/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 4f2cbe98442..e345717497c 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -14,7 +14,7 @@
 
 #include "Sched_Conf_Runtime.h"
 
-ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$")
+
 
 
 
diff --git a/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h b/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
index b0fa2c85cbd..5b13c8e4912 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
@@ -56,7 +56,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]);
 
 
 // This sets up Scheduler_Factory to use the runtime version.
-int scheduler_factory_setup = 
+int scheduler_factory_setup =
   ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);
 
 // EOF
diff --git a/orbsvcs/tests/Security/BiDirectional/Makefile.am b/orbsvcs/tests/Security/BiDirectional/Makefile.am
deleted file mode 100644
index 8c40fc85d1b..00000000000
--- a/orbsvcs/tests/Security/BiDirectional/Makefile.am
+++ /dev/null
@@ -1,117 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Secure_BiDir_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Secure_BiDir_SSL_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Secure_BiDir_SSL_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/BiDirectional/client.conf b/orbsvcs/tests/Security/BiDirectional/client.conf
index c827b49249a..b65ac0f47e6 100644
--- a/orbsvcs/tests/Security/BiDirectional/client.conf
+++ b/orbsvcs/tests/Security/BiDirectional/client.conf
@@ -1,10 +1,12 @@
-dynamic SSLIOP_Factory Service_Object * 
-  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
-  "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/client-key.pem' -SSLCertificate 'PEM:ssl/client-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'" 
+# $Id$
 
-dynamic Advanced_Resource_Factory Service_Object* 
-  TAO_Strategies:_make_TAO_Advanced_Resource_Factory () 
+dynamic SSLIOP_Factory Service_Object *
+  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
+  "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/client-key.pem' -SSLCertificate 'PEM:ssl/client-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'"
+
+dynamic Advanced_Resource_Factory Service_Object*
+  TAO_Strategies:_make_TAO_Advanced_Resource_Factory ()
   "-ORBProtocolFactory SSLIOP_Factory"
-  
+
 static Client_Strategy_Factory  "-ORBConnectStrategy blocked"
 
diff --git a/orbsvcs/tests/Security/BiDirectional/client.cpp b/orbsvcs/tests/Security/BiDirectional/client.cpp
index 89f5843811b..392443b78c6 100644
--- a/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -9,7 +9,7 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 
-ACE_RCSID(BiDirectional, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -39,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -173,6 +173,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       root_poa->destroy (1, 1);
 
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/BiDirectional/run_test.pl b/orbsvcs/tests/Security/BiDirectional/run_test.pl
index d3e18164e16..4cba833ddf5 100755
--- a/orbsvcs/tests/Security/BiDirectional/run_test.pl
+++ b/orbsvcs/tests/Security/BiDirectional/run_test.pl
@@ -17,8 +17,8 @@ $conf_client = "";
 $conf_server = "";
 $iter = 10;
 
-sub options () { 
-    my $help = 0;       # handled locally 
+sub options () {
+    my $help = 0;       # handled locally
     my $man = 0;        # handled locally
     my $ssl = 1;        # handled locally
     my $dotdec = 0;     # handled locally
@@ -27,15 +27,15 @@ sub options () {
     my $chost;        # handled locally
 
     # Process options.
-    if ( @ARGV > 0 ) { 
-        GetOptions ('help|?' => \$help, 
-                'manual' => \$man, 
-                'iter=i' => \$iter, 
-                'ssl' => \$ssl, 
-                'dd=s' => \$dotdec, 
-                'shost=s' => \$shost, 
-                'chost=s' => \$chost, 
-                'debug=i' => \$debug) or pod2usage(2); 
+    if ( @ARGV > 0 ) {
+        GetOptions ('help|?' => \$help,
+                'manual' => \$man,
+                'iter=i' => \$iter,
+                'ssl' => \$ssl,
+                'dd=s' => \$dotdec,
+                'shost=s' => \$shost,
+                'chost=s' => \$chost,
+                'debug=i' => \$debug) or pod2usage(2);
     }
 
     if ($ssl) {
@@ -66,18 +66,18 @@ sub options () {
 
     if ( $man or $help ) {
         # Load Pod::Usage only if needed.
-        require "Pod/Usage.pm"; 
-        import Pod::Usage; 
+        require "Pod/Usage.pm";
+        import Pod::Usage;
         pod2usage(1) if $help;
-        pod2usage(VERBOSE => 2) if $man; 
+        pod2usage(VERBOSE => 2) if $man;
         return 0;
-    } 
+    }
     return 1;
 }
 
 
 # Make sure OpenSSL knows where to find the trust store
-$ENV{'SSL_CERT_DIR'} = './ssl'; 
+$ENV{'SSL_CERT_DIR'} = './ssl';
 
 options () or die "Error: Nothing executed";
 
@@ -92,13 +92,13 @@ $client->DeleteFile($iorbase);
 
 print STDERR "Executing: server $conf_server $opt -o $iorbase -i $iter\n";
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "$conf_server " .
                               "$opt " .
                               "-o $server_iorfile " .
                               "-i $iter");
 
-$CL = $client->CreateProcess ("client", 
+$CL = $client->CreateProcess ("client",
                               "$conf_client " .
                               "$opt " .
                               "-k file://$client_iorfile");
@@ -157,7 +157,7 @@ run_test.pl - A driver to run the test
 =head1 SYNOPSIS
 
 B<run_test.pl> [B<-help|?>] [B<-iter iterations>] [B<-chost host>]
-               [B<-dd who>] [B<-shost host>] [B<-man>] [B<-ssl>] 
+               [B<-dd who>] [B<-shost host>] [B<-man>] [B<-ssl>]
                [B<-debug level>]
 
 
@@ -167,7 +167,7 @@ This is a test that exercises the birectional GIOP connection
 implementation in TAO over SSLIOP connection. Start the server like this
 
     $ server -ORBSvcConf server.conf -o <file.ior> -i <no_iterations>
-    $ client -ORBSvcConf client.conf -k file://<file.ior> -x 
+    $ client -ORBSvcConf client.conf -k file://<file.ior> -x
 
 Or, simply
 
@@ -188,13 +188,13 @@ added support for SSLIOP.
 [B<-help|?>]
     Print a short help message
 
-[B<-iter iterations>] 
+[B<-iter iterations>]
     The number of iterations to make. Default is 10.
 
-[B<-chost hostname>] 
+[B<-chost hostname>]
     The hostname_in_ior for the client. Used only if specified.
 
-[B<-shost hostname>] 
+[B<-shost hostname>]
     The hostname_in_ior for the server. Used only if specified.
 
 [B<-man>]
@@ -205,7 +205,7 @@ added support for SSLIOP.
     server or both. Values of who can be "client", "server" or
     "client,server".
 
-[B<-ssl>] 
+[B<-ssl>]
     Enables the use of SSLIOP instead of IIOP. Default.
 
 [B<-debug level>]
diff --git a/orbsvcs/tests/Security/BiDirectional/server.conf b/orbsvcs/tests/Security/BiDirectional/server.conf
index 6ad7e6d78a8..39bf82dd312 100644
--- a/orbsvcs/tests/Security/BiDirectional/server.conf
+++ b/orbsvcs/tests/Security/BiDirectional/server.conf
@@ -1,10 +1,12 @@
-dynamic SSLIOP_Factory Service_Object * 
-  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
+# $Id$
+
+dynamic SSLIOP_Factory Service_Object *
+  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
   "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/server-key.pem' -SSLCertificate 'PEM:ssl/server-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'"
 
-dynamic Advanced_Resource_Factory Service_Object* 
-  TAO_Strategies:_make_TAO_Advanced_Resource_Factory () 
+dynamic Advanced_Resource_Factory Service_Object*
+  TAO_Strategies:_make_TAO_Advanced_Resource_Factory ()
   "-ORBProtocolFactory SSLIOP_Factory"
-  
+
 static Client_Strategy_Factory  "-ORBConnectStrategy blocked"
 
diff --git a/orbsvcs/tests/Security/BiDirectional/server.cpp b/orbsvcs/tests/Security/BiDirectional/server.cpp
index f1190f6653f..8991d3db473 100644
--- a/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -6,7 +6,7 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
@@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -143,6 +143,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1);
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index a4438816292..6bb15414370 100644
--- a/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -11,7 +11,7 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(BiDirectional, test_i, "$Id$")
+
 
 void
 Callback_i::shutdown (void)
diff --git a/orbsvcs/tests/Security/BiDirectional/test_i.h b/orbsvcs/tests/Security/BiDirectional/test_i.h
index cc4725dc141..3914ef78a3e 100644
--- a/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ b/orbsvcs/tests/Security/BiDirectional/test_i.h
@@ -1,59 +1,58 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_BIDIRECTIONAL_TEST_I_H
 #define TAO_BIDIRECTIONAL_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Callback_i
+ *
+ * @brief A callback object to the "client"
+ *
+ * To test that the server can call the client on the same
+ * connection that was established by the client
+ */
 class Callback_i : public POA_Callback
 {
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
 public:
+  /// ctor
   Callback_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// Safe way to shutdown
   void shutdown (void);
-  // Safe way to shutdown
 
+  /// The callback method
   void callback_method (void);
-  // The callback method
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback);
@@ -65,17 +64,17 @@ public:
   int call_client (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Flag to indicate, whether we are ready for a remote call.
   int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
 
+  /// Callback Object
   Callback_var callback_;
-  // Callback Object
 
+  /// Number of times the callback needs to be called
   int no_iterations_;
-  // Number of times the callback needs to be called
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
index 85e6ce4428f..ffd4c35b7d9 100644
--- a/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+++ b/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*security client): taoclient, anytypecode, ssl {
+project(*security client): taoclient {
   after += *idl
   Source_Files {
     TX_ObjectC.cpp
@@ -18,7 +18,7 @@ project(*security client): taoclient, anytypecode, ssl {
   }
 }
 
-project(*security server): taoserver, ssl {
+project(*security server): taoserver {
   after += *idl
   Source_Files {
     TX_Object_i.cpp
diff --git a/orbsvcs/tests/Security/Big_Request/Makefile.am b/orbsvcs/tests/Security/Big_Request/Makefile.am
deleted file mode 100644
index 2cd5fcec6b0..00000000000
--- a/orbsvcs/tests/Security/Big_Request/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Request_Idl.am
-
-BUILT_SOURCES = \
-  TX_ObjectC.cpp \
-  TX_ObjectC.h \
-  TX_ObjectC.inl \
-  TX_ObjectS.cpp \
-  TX_ObjectS.h \
-  TX_ObjectS.inl
-
-CLEANFILES = \
-  TX_Object-stamp \
-  TX_ObjectC.cpp \
-  TX_ObjectC.h \
-  TX_ObjectC.inl \
-  TX_ObjectS.cpp \
-  TX_ObjectS.h \
-  TX_ObjectS.inl
-
-TX_ObjectC.cpp TX_ObjectC.h TX_ObjectC.inl TX_ObjectS.cpp TX_ObjectS.h TX_ObjectS.inl: TX_Object-stamp
-
-TX_Object-stamp: $(srcdir)/TX_Object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TX_Object.idl
-	@touch $@
-
-noinst_HEADERS = \
-  TX_Object.idl
-
-## Makefile.Big_Request_Security_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  TX_ObjectC.cpp \
-  client.cpp \
-  TX_Object_i.h
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_EXCEPTIONS
-
-## Makefile.Big_Request_Security_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  TX_ObjectC.cpp \
-  TX_ObjectS.cpp \
-  TX_Object_i.cpp \
-  server.cpp \
-  TX_Object_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index 4cea1fa04b9..ea411dbe319 100644
--- a/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -1,12 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "TX_Object_i.h"
 
-ACE_RCSID (Big_Request,
-           TX_Object_i,
-           "$Id$")
-
-
 TX_Object_i::TX_Object_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     data_ ()
diff --git a/orbsvcs/tests/Security/Big_Request/client.cpp b/orbsvcs/tests/Security/Big_Request/client.cpp
index 2a79ca57c78..7258aedbb7a 100644
--- a/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "TX_ObjectC.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Big_Request,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 const char *cert_file = "cacert.pem";
 long number_iterations = 1;
@@ -48,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -122,6 +120,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         {
           txObject->shutdown ();
         }
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/Big_Request/server.cpp b/orbsvcs/tests/Security/Big_Request/server.cpp
index a535b6b2e50..06510884f27 100644
--- a/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -1,3 +1,4 @@
+// $Id$
 
 #include "TX_Object_i.h"
 #include "ace/Get_Opt.h"
@@ -6,10 +7,6 @@
 #include "ace/SString.h"
 #include "ace/Task.h"
 
-ACE_RCSID (Big_Request,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -65,7 +62,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc b/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
index 17cb4d65c5f..f48d7df4255 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
@@ -8,7 +8,7 @@ project(*idl) : taoidldefaults {
   custom_only = 1
 }
 
-project(*security server): taoserver, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
+project(*security server): taoserver, security {
   after += *idl
   Source_Files {
     Foo_i.cpp
@@ -20,7 +20,7 @@ project(*security server): taoserver, orbsvcslib, security, ssliop, pi_server, c
   }
 }
 
-project(*security client): taoexe, orbsvcslib, security, pi, codecfactory, interceptors {
+project(*security client): taoclient, security {
   after += *idl
   exename = client
   Source_Files {
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp b/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
index afb59f51dc3..be296431912 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
@@ -1,15 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Foo_i.h"
-
 #include "ace/OS_NS_string.h"
 
 
-ACE_RCSID (Bug_1107_Regression,
-           Foo_i,
-           "$Id$")
-
-
 Foo_i::Foo_i (CORBA::ORB_ptr orb,
               SecurityLevel3::SecurityCurrent_ptr current)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/Makefile.am b/orbsvcs/tests/Security/Bug_1107_Regression/Makefile.am
deleted file mode 100644
index 13a6e70f84d..00000000000
--- a/orbsvcs/tests/Security/Bug_1107_Regression/Makefile.am
+++ /dev/null
@@ -1,138 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1107_Regression_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.Bug_1107_Regression_Security_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  FooC.cpp \
-  client.cpp \
-  Foo_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1107_Regression_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  server.cpp \
-  Foo_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
index 49e36cbd76e..6ac9c87c891 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 
@@ -6,14 +7,10 @@
 #include "orbsvcs/SecurityC.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Bug_1107_Regression,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 const char *cert_file = "cacert.pem";
 
-void
+int
 insecure_invocation_test (CORBA::ORB_ptr orb,
                           CORBA::Object_ptr obj)
 {
@@ -49,7 +46,7 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
                   "nil.\n",
                   ior));
 
-      throw CORBA::INTERNAL ();
+      return 1;
     }
 
   try
@@ -64,17 +61,17 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
                   "(%P|%t) Received CORBA::NO_PERMISSION from "
                   "server, as expected.\n"));
 
-      return;
+      return 0;
     }
 
   ACE_ERROR ((LM_ERROR,
               "(%P|%t) ERROR: CORBA::NO_PERMISSION was not thrown.\n"
               "(%P|%t) ERROR: It should have been thrown.\n"));
 
-  throw CORBA::INTERNAL ();
+  return 1;
 }
 
-void
+int
 secure_invocation_test (CORBA::Object_ptr object)
 {
   Foo::Bar_var server =
@@ -87,13 +84,15 @@ secure_invocation_test (CORBA::Object_ptr object)
                   "nil.\n",
                   ior));
 
-      throw CORBA::INTERNAL ();
+      return 1;
     }
 
   // This invocation should return successfully.
   server->baz ();
 
   server->shutdown ();
+
+  return 0;
 }
 
 int
@@ -114,18 +113,19 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Usage:  %s "
-                           "-k <ior> "
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
+  int status = 0;
   bool set_cert_file = true;
   try
     {
@@ -165,42 +165,54 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           // then result in a CORBA::NO_PERMISSION exception.
           //
           // The server is not shutdown by this test.
-          insecure_invocation_test (orb.in (), object.in ());
+          status = insecure_invocation_test (orb.in (), object.in ());
+          ACE_DEBUG ((LM_DEBUG,
+                      "insecure_invocation_test returned <%d>\n",
+                      status));
         }
 
       // This test uses the default secure SSLIOP settings to securely
       // invoke a method on the server.  No exception should occur.
       //
       // The server *is* shutdown by this test.
-      if (!set_cert_file)
-        ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
-      secure_invocation_test (object.in ());
-      if (!set_cert_file)
-        ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
+      try
+        {
+          status = secure_invocation_test (object.in ());
+          ACE_DEBUG ((LM_DEBUG,
+                      "secure_invocation_test returned <%d>\n",
+                      status));
+        }
+      catch (CORBA::Exception const &ex)
+        {
+          if (set_cert_file)
+            {
+              ex._tao_print_exception ("Caught unexpected exception "
+                                       "(probable failure):");
+              status = 1;
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "Caught an exception as expected due "
+                          "to the SSL_CERT_FILE environment "
+                          "variable not being set.\n"));
+            }
+        }
 
       orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
-      if (set_cert_file)
-        {
-          ex._tao_print_exception ("Caught unexpected exception "
-                                   "(probable failure):");
-          return 1;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "Caught an excep. as expected due "
-                                "to the SSL_CERT_FILE environment "
-                                "variable\nnot being set.\n"));
-          return 0;
-        }
+      ex._tao_print_exception ("Exception in main:");
+      return 1;
     }
 
-  ACE_DEBUG ((LM_DEBUG,
-              "\n"
-              "Bug_1107_Regression test passed.\n"));
+  if (status == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "\n"
+                  "Bug_1107_Regression test passed.\n"));
+    }
 
-  return 0;
+  return status;
 }
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
index 7ddd787fc56..9bfc639bbfe 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "Foo_i.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Bug_1107_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -33,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
index 94e400077c2..8e1ad8e0a71 100644
--- a/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
+++ b/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
@@ -5,7 +5,7 @@
 #include "Client_Task.h"
 #include "MessengerC.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
+
 
 Client_Task::Client_Task (
         CORBA::ORB_ptr corb,
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am b/orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am
deleted file mode 100644
index 335614ec755..00000000000
--- a/orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2908_Regression_Idl.am
-
-BUILT_SOURCES = \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES = \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Messenger.idl
-
-## Makefile.Bug_2908_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  MessengerC.cpp \
-  MessengerClient.cpp \
-  Client_Task.h \
-  Messenger_i.h
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2908_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  Client_Task.cpp \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  MessengerServer.cpp \
-  Messenger_i.cpp \
-  Client_Task.h \
-  Messenger_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp b/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
index 1b82a2e98a5..ce03557b106 100644
--- a/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
+++ b/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/client.conf b/orbsvcs/tests/Security/Bug_2908_Regression/client.conf
index 87da295875f..6dd5426760e 100644
--- a/orbsvcs/tests/Security/Bug_2908_Regression/client.conf
+++ b/orbsvcs/tests/Security/Bug_2908_Regression/client.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:clientKey.pem -SSLCertificate PEM:clientCert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/server.conf b/orbsvcs/tests/Security/Bug_2908_Regression/server.conf
index 791a6774ce9..bed3fed0a1b 100644
--- a/orbsvcs/tests/Security/Bug_2908_Regression/server.conf
+++ b/orbsvcs/tests/Security/Bug_2908_Regression/server.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:serverKey.pem -SSLCertificate PEM:serverCert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/orbsvcs/tests/Security/Callback/Makefile.am b/orbsvcs/tests/Security/Callback/Makefile.am
deleted file mode 100644
index 01af58ae695..00000000000
--- a/orbsvcs/tests/Security/Callback/Makefile.am
+++ /dev/null
@@ -1,153 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Callback_Idl.am
-
-BUILT_SOURCES = \
-  serverC.cpp \
-  serverC.h \
-  serverC.inl \
-  serverS.cpp \
-  serverS.h \
-  serverS.inl
-
-CLEANFILES = \
-  server-stamp \
-  serverC.cpp \
-  serverC.h \
-  serverC.inl \
-  serverS.cpp \
-  serverS.h \
-  serverS.inl
-
-serverC.cpp serverC.h serverC.inl serverS.cpp serverS.h serverS.inl: server-stamp
-
-server-stamp: $(srcdir)/server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/server.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  clientC.cpp \
-  clientC.h \
-  clientC.inl \
-  clientS.cpp \
-  clientS.h \
-  clientS.inl
-
-CLEANFILES += \
-  client-stamp \
-  clientC.cpp \
-  clientC.h \
-  clientC.inl \
-  clientS.cpp \
-  clientS.h \
-  clientS.inl
-
-clientC.cpp clientC.h clientC.inl clientS.cpp clientS.h clientS.inl: client-stamp
-
-client-stamp: $(srcdir)/client.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/client.idl
-	@touch $@
-
-noinst_HEADERS = \
-  client.idl \
-  server.idl
-
-## Makefile.Callback_Security_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  client.cpp \
-  clientC.cpp \
-  clientS.cpp \
-  client_i.cpp \
-  serverC.cpp \
-  client_i.h
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_EXCEPTIONS
-
-## Makefile.Callback_Security_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  clientC.cpp \
-  server.cpp \
-  serverC.cpp \
-  serverS.cpp \
-  server_i.cpp \
-  server_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Callback/client.cpp b/orbsvcs/tests/Security/Callback/client.cpp
index 69b4693c129..a45e7478e04 100644
--- a/orbsvcs/tests/Security/Callback/client.cpp
+++ b/orbsvcs/tests/Security/Callback/client.cpp
@@ -1,16 +1,12 @@
+// $Id$
+
 #include "ace/Log_Msg.h"
 #include "serverC.h"
 #include "client_i.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Callback,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior");
-
 const ACE_TCHAR  *cert_file = ACE_TEXT ("cacert.pem");
 
 int
diff --git a/orbsvcs/tests/Security/Callback/client_i.cpp b/orbsvcs/tests/Security/Callback/client_i.cpp
index e91058cf879..eea77b0a2cb 100644
--- a/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "ace/Log_Msg.h"
 #include "client_i.h"
 
-ACE_RCSID (Callback,
-           client_i,
-           "$Id$")
-
 client_i::client_i (server_ptr s)
   : server_ (server::_duplicate (s))
 {
diff --git a/orbsvcs/tests/Security/Callback/server.cpp b/orbsvcs/tests/Security/Callback/server.cpp
index 3da387d4370..04cbecc6590 100644
--- a/orbsvcs/tests/Security/Callback/server.cpp
+++ b/orbsvcs/tests/Security/Callback/server.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "ace/Log_Msg.h"
 #include "server_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Callback,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 const ACE_TCHAR *cert_file = ACE_TEXT("cacert.pem");
 
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Callback/server_i.cpp b/orbsvcs/tests/Security/Callback/server_i.cpp
index 873cf521f55..2b5031d8560 100644
--- a/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -1,8 +1,6 @@
-#include "server_i.h"
+// $Id$
 
-ACE_RCSID (Callback,
-           server_i,
-           "$Id$")
+#include "server_i.h"
 
 server_i::server_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/Security/Crash_Test/Makefile.am b/orbsvcs/tests/Security/Crash_Test/Makefile.am
deleted file mode 100644
index 6d97144d2ed..00000000000
--- a/orbsvcs/tests/Security/Crash_Test/Makefile.am
+++ /dev/null
@@ -1,151 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Security_Crash_Test_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Security_Crash_Test_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Security_Crash_Test_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Crash_Test/client.cpp b/orbsvcs/tests/Security/Crash_Test/client.cpp
index 387181cca2a..48599b596a6 100644
--- a/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -6,10 +6,6 @@
 #include "ace/SString.h"
 #include "testC.h"
 
-ACE_RCSID (Send_File,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 const char *cert_file = "cacert.pem";
 
@@ -43,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Crash_Test/run_test.pl b/orbsvcs/tests/Security/Crash_Test/run_test.pl
index c09c115eeb4..900fefac7f1 100755
--- a/orbsvcs/tests/Security/Crash_Test/run_test.pl
+++ b/orbsvcs/tests/Security/Crash_Test/run_test.pl
@@ -30,7 +30,6 @@ my $server_iorfile = $server->LocalFile ($iorbase);
 my $client1_iorfile = $client1->LocalFile ($iorbase);
 my $client2_iorfile = $client2->LocalFile ($iorbase);
 my $client3_iorfile = $client3->LocalFile ($iorbase);
-
 $server->DeleteFile($iorbase);
 $client1->DeleteFile($iorbase);
 $client2->DeleteFile($iorbase);
@@ -76,6 +75,11 @@ local $start_time = time();
 local $max_running_time = 500; # < 10 minutes
 local $elapsed = time() - $start_time;
 
+if ($ARGV[0] eq '-quick')  {
+    $elapsed = 0;
+    $max_running_time = 1;
+}
+
 while($status == 0 && $elapsed < $max_running_time){
 
     # Start the server
@@ -251,4 +255,9 @@ while($status == 0 && $elapsed < $max_running_time){
     $elapsed = time() - $start_time;
 }
 
+$server->DeleteFile($iorbase);
+$client1->DeleteFile($iorbase);
+$client2->DeleteFile($iorbase);
+$client3->DeleteFile($iorbase);
+
 exit $status;
diff --git a/orbsvcs/tests/Security/Crash_Test/server.cpp b/orbsvcs/tests/Security/Crash_Test/server.cpp
index 1be2a7de439..8c6c7caecfd 100644
--- a/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -6,10 +6,6 @@
 #include "ace/SString.h"
 #include "test_i.h"
 
-ACE_RCSID (Send_File,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -134,6 +130,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       root_poa->destroy (1, 1);
 
       ACE_OS::sleep (1);
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index 225c91d9abd..137ca4f0ec5 100644
--- a/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -6,10 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Send_File,
-           test_i,
-           "$Id$")
-
 void
 Simple_Server_i::send_line (const char *)
 {
diff --git a/orbsvcs/tests/Security/Crash_Test/test_i.h b/orbsvcs/tests/Security/Crash_Test/test_i.h
index 729b1d933f8..c9ff4b29ab3 100644
--- a/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ b/orbsvcs/tests/Security/Crash_Test/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Send_File
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_SEND_FILE_TEST_I_H
 #define TAO_SEND_FILE_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   void send_line (const char *line);
diff --git a/orbsvcs/tests/Security/EndpointPolicy/Makefile.am b/orbsvcs/tests/Security/EndpointPolicy/Makefile.am
deleted file mode 100644
index d41627b774c..00000000000
--- a/orbsvcs/tests/Security/EndpointPolicy/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EndpointPolicy_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-bin_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-test_SOURCES = \
-  test.cpp
-
-test_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/EndpointPolicy/svc.conf b/orbsvcs/tests/Security/EndpointPolicy/svc.conf
index 6f3231c6716..05966f6443c 100644
--- a/orbsvcs/tests/Security/EndpointPolicy/svc.conf
+++ b/orbsvcs/tests/Security/EndpointPolicy/svc.conf
@@ -1,3 +1,4 @@
+# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/orbsvcs/tests/Security/EndpointPolicy/test.cpp
index 19904fd2479..0aeea98134d 100644
--- a/orbsvcs/tests/Security/EndpointPolicy/test.cpp
+++ b/orbsvcs/tests/Security/EndpointPolicy/test.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                          argv [0]),
                         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/InsecureReferences/Makefile.am b/orbsvcs/tests/Security/InsecureReferences/Makefile.am
deleted file mode 100644
index 113224144b6..00000000000
--- a/orbsvcs/tests/Security/InsecureReferences/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.InsecureReferences_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-test_SOURCES = \
-  test.cpp
-
-test_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/InsecureReferences/client.conf b/orbsvcs/tests/Security/InsecureReferences/client.conf
index 6f3231c6716..05966f6443c 100644
--- a/orbsvcs/tests/Security/InsecureReferences/client.conf
+++ b/orbsvcs/tests/Security/InsecureReferences/client.conf
@@ -1,3 +1,4 @@
+# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/orbsvcs/tests/Security/InsecureReferences/test.cpp b/orbsvcs/tests/Security/InsecureReferences/test.cpp
index 89f1a561c9f..f4376b7d0b5 100644
--- a/orbsvcs/tests/Security/InsecureReferences/test.cpp
+++ b/orbsvcs/tests/Security/InsecureReferences/test.cpp
@@ -44,7 +44,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                          argv [0]),
                         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -146,6 +146,8 @@ parse_objref (int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc, argv);
 
       obj = orb->string_to_object (iorstr);
+
+      orb->destroy ();
     }
   catch (CORBA::Exception &ex)
     {
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
index 85099621dfa..c7b0f235f7b 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ===========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Security/MT_SSLIOP
-//
-// = FILENAME
-//   Client_Worker.h
-//
-// = AUTHOR
-//   Anand Krishnan
-//
-// ===========================================================================
+
+//=============================================================================
+/**
+ *  @file   Client_Worker.h
+ *
+ *  $Id$
+ *
+ *  @author Anand Krishnan
+ */
+//=============================================================================
+
 
 #ifndef MT_SSLIOP_CLIENT_WORKER_H
 #define MT_SSLIOP_CLIENT_WORKER_H
@@ -26,32 +23,33 @@
 #include "testC.h"
 
 
+/**
+ * @class Client_Worker
+ *
+ * @brief Run the Client_Worker Thread
+ *
+ * Use the ACE_Task_Base class to run the client threads
+ */
 class Client_Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run the Client_Worker Thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads
-  //
 
 public:
+  /// ctor
   Client_Worker (Simple_Server_ptr server, int niterations);
-  // ctor
 
+  /// thread entry point
   virtual int svc (void);
-  // thread entry point
 
 private:
+  /// Validate the connection
   void validate_connection (void);
-  // Validate the connection
 
 private:
+  /// The server.
   Simple_Server_var server_;
-  // The server.
 
+  /// The number of iterations on each client thread.
   int niterations_;
-  // The number of iterations on each client thread.
 };
 
 #if defined(_MSC_VER)
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
deleted file mode 100644
index eabcde4fddd..00000000000
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
+++ /dev/null
@@ -1,134 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_IIOP_SSL_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MT_IIOP_SSL_Security_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Client_Worker.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_Worker.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_IIOP_SSL_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  Server_Worker.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_Worker.h \
-  test_i.h \
-  test_i.inl
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf b/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
index bf9048990f4..fe8f854a0dd 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
@@ -1,4 +1,5 @@
 #$Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLNoProtection -SSLAuthenticate  NONE"
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index 53af9eeb98d..a819b37e393 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf b/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
index d486769062b..c2d659f95eb 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
@@ -1,4 +1,5 @@
 #$Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLNoProtection -SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index dfca2b5c55d..ab199af47fa 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -100,6 +100,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       worker.thr_mgr ()->wait ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index ba8e1b90c52..98af071916a 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -12,10 +12,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (MT_IIOP_SSL,
-           test_i,
-           "$Id$")
-
 void
 Simple_Server_i::ping (void)
 {
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
index 61eb06ce0b5..c7ec4e6a1c2 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_SERVER_TEST_I_H
 #define TAO_MT_SERVER_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   void ping (void);
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index 1d56173a596..68683c2c101 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -1,17 +1,14 @@
-// $Id$
 
-// ===========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Security/MT_SSLIOP
-//
-// = FILENAME
-//   Client_Worker.h
-//
-// = AUTHOR
-//   Anand Krishnan
-//
-// ===========================================================================
+//=============================================================================
+/**
+ *  @file   Client_Worker.h
+ *
+ *  $Id$
+ *
+ *  @author Anand Krishnan
+ */
+//=============================================================================
+
 
 #ifndef MT_SSLIOP_CLIENT_WORKER_H
 #define MT_SSLIOP_CLIENT_WORKER_H
@@ -26,37 +23,38 @@
 #include "testC.h"
 
 
+/**
+ * @class Client_Worker
+ *
+ * @brief Run the Client_Worker Thread
+ *
+ * Use the ACE_Task_Base class to run the client threads
+ */
 class Client_Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run the Client_Worker Thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads
-  //
 
 public:
+  /// ctor
   Client_Worker (Simple_Server_ptr server,
                  Another_One_ptr another,
                  int niterations);
-  // ctor
 
+  /// thread entry point
   virtual int svc (void);
-  // thread entry point
 
 private:
+  /// Validate the connection
   void validate_connection (void);
-  // Validate the connection
 
 private:
+  /// The server.
   Simple_Server_var server_;
-  // The server.
 
+  /// Another object served by the same server as server_.
   Another_One_var another_;
-  // Another object served by the same server as server_.
 
+  /// The number of iterations on each client thread.
   int niterations_;
-  // The number of iterations on each client thread.
 };
 
 #if defined(_MSC_VER)
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
deleted file mode 100644
index 318db7b954b..00000000000
--- a/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+++ /dev/null
@@ -1,130 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_SSLIOP_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MT_SSLIOP_Security_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  Client_Worker.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_Worker.h \
-  test_i.inl
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_SSLIOP_Security_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  Server_Worker.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_Worker.h \
-  test_i.h \
-  test_i.inl
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/client.conf b/orbsvcs/tests/Security/MT_SSLIOP/client.conf
index fc1422ac496..5403109ed69 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/client.conf
+++ b/orbsvcs/tests/Security/MT_SSLIOP/client.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLCertificate PEM:selfsigncert.pem"
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 174338d5535..39f3fc928d8 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -48,7 +48,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/server.conf b/orbsvcs/tests/Security/MT_SSLIOP/server.conf
index 31d7b2979b8..fec138accdb 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/server.conf
+++ b/orbsvcs/tests/Security/MT_SSLIOP/server.conf
@@ -1,3 +1,4 @@
+# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index cf7b33bc8af..0ee69874025 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -54,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -161,6 +161,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       worker.thr_mgr ()->wait ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index 634b0fd9e27..ed3db5f624d 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -7,10 +7,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (MT_Server,
-           test_i,
-           "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
 {
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index 28dafc13474..0ec089a3b61 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_SERVER_TEST_I_H
 #define TAO_MT_SERVER_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
@@ -36,29 +34,30 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 
+/**
+ * @class Another_One_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Another_One_i : public POA_Another_One
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Another_One_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/orbsvcs/tests/Security/Makefile.am b/orbsvcs/tests/Security/Makefile.am
deleted file mode 100644
index 4e4d399993a..00000000000
--- a/orbsvcs/tests/Security/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        BiDirectional \
-        Big_Request \
-        Bug_1107_Regression \
-        Bug_2908_Regression \
-        Callback \
-        Crash_Test \
-        EndpointPolicy \
-        InsecureReferences \
-        MT_IIOP_SSL \
-        MT_SSLIOP \
-        Secure_Invocation \
-        mixed_security_test \
-        ssliop_CSD \
-        ssliop_corbaloc
-
diff --git a/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp b/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
index 299f4a79f7f..1d7af9b5648 100644
--- a/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
+++ b/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id:$
+// $Id$
 
 #include "Foo_i.h"
 
diff --git a/orbsvcs/tests/Security/Null_Cipher/Makefile.am b/orbsvcs/tests/Security/Null_Cipher/Makefile.am
deleted file mode 100644
index 83b0cafc241..00000000000
--- a/orbsvcs/tests/Security/Null_Cipher/Makefile.am
+++ /dev/null
@@ -1,138 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Secure_Invocation_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.Secure_Invocation_Security_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  FooC.cpp \
-  client.cpp \
-  Foo_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Secure_Invocation_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  server.cpp \
-  Foo_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Null_Cipher/client.cpp b/orbsvcs/tests/Security/Null_Cipher/client.cpp
index b610aff6f31..0b7c505dec5 100644
--- a/orbsvcs/tests/Security/Null_Cipher/client.cpp
+++ b/orbsvcs/tests/Security/Null_Cipher/client.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id:$
+// $Id$
 //
 
 #include "ace/Get_Opt.h"
@@ -26,10 +26,10 @@ null_cipher_test (CORBA::ORB_ptr orb,
   //trust <<= establish_trust;
 
   CORBA::PolicyList policy_list (2);
-  policy_list.length (1); 
+  policy_list.length (1);
   policy_list[0] =
     orb->create_policy (Security::SecQOPPolicy, protection);
-//   policy_list[1] = 
+//   policy_list[1] =
 //     orb->create_policy (Security::SecEstablishTrustPolicy, trust);
 
   // Create an object reference that uses plain IIOP (i.e. no
@@ -88,7 +88,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Null_Cipher/server.cpp b/orbsvcs/tests/Security/Null_Cipher/server.cpp
index 38c87f1c0f5..74a08a7095b 100644
--- a/orbsvcs/tests/Security/Null_Cipher/server.cpp
+++ b/orbsvcs/tests/Security/Null_Cipher/server.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "Foo_i.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Secure_Invocation,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -33,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index e40e0f69e13..df429bfaeb2 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -1,15 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Foo_i.h"
-
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Secure_Invocation,
-           Foo_i,
-           "$Id$")
-
-
 Foo_i::Foo_i (CORBA::ORB_ptr orb,
               SecurityLevel3::SecurityCurrent_ptr current)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
deleted file mode 100644
index 83b0cafc241..00000000000
--- a/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
+++ /dev/null
@@ -1,138 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Secure_Invocation_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.Secure_Invocation_Security_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  FooC.cpp \
-  client.cpp \
-  Foo_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Secure_Invocation_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  server.cpp \
-  Foo_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 1ee4e0773e2..e81a2cf2f83 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 
@@ -6,10 +7,6 @@
 #include "orbsvcs/SecurityC.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Secure_Invocation,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 const char *cert_file = "cacert.pem";
 
@@ -117,7 +114,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 723915cf2c1..3acd85c9486 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "Foo_i.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Secure_Invocation,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -33,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
index aa1368d5e67..ccaf134b109 100644
--- a/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
+++ b/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
@@ -1,15 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Foo_i.h"
-
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Secure_Invocation,
-           Foo_i,
-           "$Id$")
-
-
 Foo_i::Foo_i (CORBA::ORB_ptr orb,
               SecurityLevel3::SecurityCurrent_ptr current)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/Security/mixed_security_test/Makefile.am b/orbsvcs/tests/Security/mixed_security_test/Makefile.am
deleted file mode 100644
index aa8d9cc7ade..00000000000
--- a/orbsvcs/tests/Security/mixed_security_test/Makefile.am
+++ /dev/null
@@ -1,139 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.mixed_security_idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.mixed_security_security_client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  FooC.cpp \
-  client.cpp \
-  Foo_i.h \
-  constants.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.mixed_security_security_server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  server.cpp \
-  Foo_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/mixed_security_test/client.cpp b/orbsvcs/tests/Security/mixed_security_test/client.cpp
index 2973a2fcb41..2e77ad1b931 100644
--- a/orbsvcs/tests/Security/mixed_security_test/client.cpp
+++ b/orbsvcs/tests/Security/mixed_security_test/client.cpp
@@ -1,17 +1,12 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
-
 #include "orbsvcs/SecurityC.h"
-
 #include "FooC.h"
 #include "constants.h"
 
-ACE_RCSID (Secure_Invocation,
-           client,
-           "$Id$")
-
 bool shutdown_server = true;
 
 class ClientTest
diff --git a/orbsvcs/tests/Security/mixed_security_test/server.cpp b/orbsvcs/tests/Security/mixed_security_test/server.cpp
index 2615b696aa4..523c8fc8148 100644
--- a/orbsvcs/tests/Security/mixed_security_test/server.cpp
+++ b/orbsvcs/tests/Security/mixed_security_test/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include <ace/SString.h>
 #include <ace/ARGV.h>
@@ -9,10 +10,6 @@
 #include "Foo_i.h"
 #include "constants.h"
 
-ACE_RCSID (Secure_Invocation,
-           server,
-           "$Id$")
-
 /*
   This tests the ability to use the SecurityManager/AccessDecision tools
   to permit unsecured access to specific object references, while all other
diff --git a/orbsvcs/tests/Security/ssliop_CSD/Makefile.am b/orbsvcs/tests/Security/ssliop_CSD/Makefile.am
deleted file mode 100644
index 38bc4230cb1..00000000000
--- a/orbsvcs/tests/Security/ssliop_CSD/Makefile.am
+++ /dev/null
@@ -1,145 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Ssliop_CSD_Idl.am
-
-BUILT_SOURCES = \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES = \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Messenger.idl
-
-## Makefile.Ssliop_CSD_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += MessengerClient
-
-MessengerClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-MessengerClient_SOURCES = \
-  MessengerC.cpp \
-  MessengerClient.cpp \
-  Messenger_i.h
-
-MessengerClient_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-MessengerClient_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Ssliop_CSD_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += MessengerServer
-
-MessengerServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-MessengerServer_SOURCES = \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  MessengerServer.cpp \
-  Messenger_i.cpp \
-  Messenger_i.h
-
-MessengerServer_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-MessengerServer_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp b/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
index 06c32756aed..2011be2c41b 100644
--- a/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
+++ b/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
@@ -55,12 +55,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-    CORBA::String_var message = CORBA::string_dup( 
+    CORBA::String_var message = CORBA::string_dup(
       "Implementing security policy now!" );
-    messenger->send_message( "Chief of Security", 
+    messenger->send_message( "Chief of Security",
                              "New Directive",
                              message.inout() );
     std::cout << "message was sent" << std::endl;
+
+    orb->destroy ();
   }
 
   catch(const CORBA::Exception& ex) {
diff --git a/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp b/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
index b5e36458b92..6e8c488cbc9 100644
--- a/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
+++ b/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -56,14 +56,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
-    PortableServer::ObjectId_var oid = 
+    PortableServer::ObjectId_var oid =
       poa->activate_object( &messenger_servant );
     CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
     std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(ior_output_file) );
     iorFile << str.in() << std::endl;
     iorFile.close();
-    std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl;   
+    std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl;
 
     // Accept requests
     orb->run();
diff --git a/orbsvcs/tests/Security/ssliop_CSD/csd.conf b/orbsvcs/tests/Security/ssliop_CSD/csd.conf
index e59fb4ac94c..4eccadbc649 100644
--- a/orbsvcs/tests/Security/ssliop_CSD/csd.conf
+++ b/orbsvcs/tests/Security/ssliop_CSD/csd.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic TAO_CSD_TP_Strategy_Factory Service_Object * TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
deleted file mode 100644
index 01d2844f4b2..00000000000
--- a/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Corbaloc_Ssliop_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-CLEANFILES = \
-  test_object-stamp \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp
-
-test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  test_objectC.cpp \
-  test_objectS.cpp \
-  client.h \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.h \
-  test_objectS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/client.conf b/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
index 880c1b7d372..4624af11b7a 100644
--- a/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLPrivateKey PEM:pvtkey-client.pem -SSLCertificate PEM:selfsigncert-client.pem"
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index db19df43db4..7c4c5c250b8 100644
--- a/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -1,28 +1,26 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Naming_Service/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple CORBA client for the CosNaming
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>,
-//      Marina Spivak <marina@cs.wustl.edu>, and
-//      Douglas C. Schmidt <schmidt@cs.wustl.edu>
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements a simple CORBA client for the CosNaming
+ *    example using stubs generated by the TAO ORB IDL compiler.
+ *
+ *
+ *  @author   Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+ *  @author   Marina Spivak <marina@cs.wustl.edu>
+ *  @author and   Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "client.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Simple_Naming, client, "$Id$")
+
 
 #if defined (_MSC_VER)
 # pragma warning (disable : 4250)
@@ -33,19 +31,19 @@ class My_Test_Object :
 {
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   My_Test_Object (CORBA::Short id = 0);
-  // Constructor.
 
+  /// Destructor.
   ~My_Test_Object (void);
-  // Destructor.
 
   // = Interface implementation accessor methods.
 
+  /// Sets id.
   void id (CORBA::Short id);
-  // Sets id.
 
+  /// Gets id.
   CORBA::Short id (void);
-  // Gets id.
 
 private:
   short id_;
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/orbsvcs/tests/Security/ssliop_corbaloc/client.h
index dffdf271fd1..faf0c8ea0fe 100644
--- a/orbsvcs/tests/Security/ssliop_corbaloc/client.h
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/client.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//      This class tests the facilities to connect to the naming service.
-//
-// = AUTHORS
-//      Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *    This class tests the facilities to connect to the naming service.
+ *
+ *
+ *  @author   Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "test_objectS.h"
 #include "orbsvcs/CosNamingC.h"
@@ -23,149 +20,163 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "ace/Task.h"
 
+/**
+ * @class Naming_Test
+ *
+ * @brief This is an abstract class which is subclassed
+ * to create different Naming Service tests.
+ *
+ * This is a basic example of the "Strategy" pattern.  This class
+ * provides a common interface for different tests (or
+ * "strategies"), so that a specific test to be used can be
+ * chosen at runtime.
+ */
 class Naming_Test
 {
-  // = TITLE
-  //    This is an abstract class which is subclassed
-  //    to create different Naming Service tests.
-  //
-  // = DESCRIPTION
-  //    This is a basic example of the "Strategy" pattern.  This class
-  //    provides a common interface for different tests (or
-  //    "strategies"), so that a specific test to be used can be
-  //    chosen at runtime.
 
 public:
+  /// Execute the test code.  <root_context> is the context to assume
+  /// as the root for all tests operations.
   virtual ~Naming_Test (void) {}
   virtual int execute (TAO_Naming_Client &root_context) = 0;
-  // Execute the test code.  <root_context> is the context to assume
-  // as the root for all tests operations.
 };
 
+/**
+ * @class Simple_Test
+ *
+ * @brief This class implements a simple Naming Service test.
+ *
+ * The test binds(), resolves(), and unbinds() an object
+ * reference from the given Naming Context.
+ */
 class Simple_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a simple Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test binds(), resolves(), and unbinds() an object
-  //    reference from the given Naming Context.
 public:
+  /// Execute the simple test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the simple test code.
 };
 
+/**
+ * @class MT_Test
+ *
+ * @brief This class implements a simple Multithreaded (multiclient) Naming Service test.
+ *
+ * The test spawns multiple threads: each attempts to
+ * bind(), resolve(), and unbind() an object
+ * reference using the same name, and the same Naming Context.
+ */
 class MT_Test : public Naming_Test, public ACE_Task_Base
 {
-  // = TITLE
-  //    This class implements a simple Multithreaded (multiclient) Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test spawns multiple threads: each attempts to
-  //    bind(), resolve(), and unbind() an object
-  //    reference using the same name, and the same Naming Context.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer and number of threads to spawn.
   MT_Test (CORBA::ORB_ptr orb,
            int size = 10);
-  // Constructor.  Takes in an orb pointer and number of threads to spawn.
 
+  /// Execute the MT test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the MT test code.
 
+  /// This code is executed by each thread.
   virtual int svc (void);
-  // This code is executed by each thread.
 
 private:
+  /// Number of threads to spawn.  By default is set to 10.
   int size_;
-  // Number of threads to spawn.  By default is set to 10.
 
+  /// A pointer to our ORB.
   CORBA::ORB_var orb_;
-  // A pointer to our ORB.
 
+  /**
+   * IOR in the string format for Naming Service we are to deal with.
+   * Each thread will use string_to_object() and this IOR to create
+   * its own NamingContext stub for invoking operations on the
+   * Naming Service.  If all threads try to use the same stub, bad things
+   * happen...
+   */
   char* name_service_ior_;
-  // IOR in the string format for Naming Service we are to deal with.
-  // Each thread will use string_to_object() and this IOR to create
-  // its own NamingContext stub for invoking operations on the
-  // Naming Service.  If all threads try to use the same stub, bad things
-  // happen...
 
   // This can be replaced with CORBA::String_var when <string_to_object>
   // is fixed - this will clean up the memory properly.
 
+  /// Holds name used for registering the object with Naming Service.
   CosNaming::Name test_name_;
-  // Holds name used for registering the object with Naming Service.
 
+  /// Holds object to be registered with the Naming Service by each thread.
   Test_Object_var test_ref_;
-  // Holds object to be registered with the Naming Service by each thread.
 
 };
 
+/**
+ * @class Tree_Test
+ *
+ * @brief This class implements a test of all Naming Service functions
+ * on a tree of Naming Contexts.
+ *
+ * Bind_context() under the root context with the name level1.
+ * Create_new_context(), bind() foo object into it, and
+ * bind the context into root/level1 under the name level2.
+ * Resolve (root/level1/level2/foo).
+ * Unbind (root/level1/level2/foo).
+ * Bind (root/level1/level2/foo, obj)
+ * Create_new_context()
+ * and invoke rebind_context() to substitute it for the current
+ * level2 context.
+ * Bind (root/level1/level2/foo, obj)
+ * Resolve (root/level1/level2/foo).
+ * Rebind() to have a different object under the name bar.
+ * Resolve (root/level1/level2/foo) to make sure correct reference is returned.
+ */
 class Tree_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of all Naming Service functions
-  //    on a tree of Naming Contexts.
-  //
-  // = DESCRIPTION
-  //    Bind_context() under the root context with the name level1.
-  //    Create_new_context(), bind() foo object into it, and
-  //    bind the context into root/level1 under the name level2.
-  //    Resolve (root/level1/level2/foo).
-  //    Unbind (root/level1/level2/foo).
-  //    Bind (root/level1/level2/foo, obj)
-  //    Create_new_context()
-  //    and invoke rebind_context() to substitute it for the current
-  //    level2 context.
-  //    Bind (root/level1/level2/foo, obj)
-  //    Resolve (root/level1/level2/foo).
-  //    Rebind() to have a different object under the name bar.
-  //    Resolve (root/level1/level2/foo) to make sure correct reference is returned.
 public:
+  /// Execute the tree test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the tree test code.
 };
 
+/**
+ * @class Iterator_Test
+ *
+ * @brief This class implements a test of Naming Service functions
+ * which involve BindingIterator.
+ *
+ * The test binds foo1, foo2, foo3, and foo4 objects to the
+ * Naming Context.  It lists() one binding and receives
+ * BindingIterator to iterate over the rest of the bindings.  It
+ * then invokes next_one(), next_n(2), next_one(), and destroy()
+ * on the iterator.
+ */
 class Iterator_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of Naming Service functions
-  //    which involve BindingIterator.
-  //
-  // = DESCRIPTION
-  //    The test binds foo1, foo2, foo3, and foo4 objects to the
-  //    Naming Context.  It lists() one binding and receives
-  //    BindingIterator to iterate over the rest of the bindings.  It
-  //    then invokes next_one(), next_n(2), next_one(), and destroy()
-  //    on the iterator.
 public:
+  /// Execute the iterator test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the iterator test code.
 };
 
+/**
+ * @class Exceptions_Test
+ *
+ * @brief This class implements a test of exceptions in the Naming Service.
+ *
+ * Makes sure that Naming Service throws exceptions as expected, and
+ * data inside exceptions is set correctly.  The test creates a tree of
+ * of Naming Contexts: root context -> level1 -> level2.  It then binds() an
+ * object with the name foo to each of Naming Contexts in the tree.
+ * Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
+ * Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
+ * Invoke bind( level1/foo, obj) on root context - make sure we get AlreadyBound exc.
+ * Invoke unbind( level1/level2/bar) on root context - make sure we get NotFound exc.
+ * with why = not_object, rest_of_name = bar.
+ * Invoke unbind( level1/level3/foo) on root context - make sure we get NotFound exc.
+ * with why = missing_node, rest_of_name = level3/foo.
+ * Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
+ * with why = not_context, rest_of_name = foo/foo.
+ */
 class Exceptions_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of exceptions in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Makes sure that Naming Service throws exceptions as expected, and
-  //    data inside exceptions is set correctly.  The test creates a tree of
-  //    of Naming Contexts: root context -> level1 -> level2.  It then binds() an
-  //    object with the name foo to each of Naming Contexts in the tree.
-  //    Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
-  //    Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
-  //    Invoke bind( level1/foo, obj) on root context - make sure we get AlreadyBound exc.
-  //    Invoke unbind( level1/level2/bar) on root context - make sure we get NotFound exc.
-  //    with why = not_object, rest_of_name = bar.
-  //    Invoke unbind( level1/level3/foo) on root context - make sure we get NotFound exc.
-  //    with why = missing_node, rest_of_name = level3/foo.
-  //    Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
-  //    with why = not_context, rest_of_name = foo/foo.
 public:
+  /// Execute the exceptions test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the exceptions test code.
 
 private:
   // the following functions isolate specific tests due to the
@@ -179,23 +190,23 @@ private:
   void not_found_test3 (TAO_Naming_Client &root_context);
 };
 
+/**
+ * @class Destroy_Test
+ *
+ * @brief This class implements a test of destroy() function
+ * in the Naming Service.
+ *
+ * Create a context and bind an object under it.
+ * Attempt to destroy the context - NotEmpty exception should be raised.
+ * Unbind the object and call destroy on the context.
+ * Attempt to call destroy on the object again - OBJECT_NOT_EXIST
+ * exception should be raised.
+ */
 class Destroy_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of destroy() function
-  //    in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Create a context and bind an object under it.
-  //    Attempt to destroy the context - NotEmpty exception should be raised.
-  //
-  //    Unbind the object and call destroy on the context.
-  //    Attempt to call destroy on the object again - OBJECT_NOT_EXIST
-  //    exception should be raised.
-  //
 public:
+  /// Execute the destroy test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the destroy test code.
 
 private:
   // = The following functions isolate specific tests.
@@ -203,100 +214,106 @@ private:
   void not_exist_test (CosNaming::NamingContext_var &ref);
 };
 
+/**
+ * @class Persistent_Test_Begin
+ *
+ * @brief This class implements the first part of the Persistent Naming
+ * Service test.
+ *
+ * This test creates the Naming Context hierarchy:
+ * root -> level1_context -> level2_context,
+ * and prints out the ior of the <level1_context>.
+ */
 class Persistent_Test_Begin : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the first part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //    This test creates the Naming Context hierarchy:
-  //    root -> level1_context -> level2_context,
-  //    and prints out the ior of the <level1_context>.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer.
   Persistent_Test_Begin (CORBA::ORB_ptr orb,
                          FILE * ior_output_file);
-  // Constructor.  Takes in an orb pointer.
 
+  /// Destructor.
   virtual ~Persistent_Test_Begin (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 1) code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 1) code.
 
 private:
 
+  /// A pointer to our ORB (needed for object/string conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (needed for object/string conversion).
 
+  /// File where we output the ior for use by part 2 of persistent test.
   FILE *file_;
-  // File where we output the ior for use by part 2 of persistent test.
 };
 
+/**
+ * @class Persistent_Test_End
+ *
+ * @brief This class implements the second part of the Persistent Naming
+ * Service test.
+ *
+ * This test attempts to resolve <level2_context> both through the
+ * <root> Naming Context, which it gets from <resolve_initial_references>, and
+ * through <level1_context> stringified ior, which it gets from part 1 of
+ * the persistent test.  The results of both methods are then
+ * compared for equality.
+ */
 class Persistent_Test_End : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the second part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //   This test attempts to resolve <level2_context> both through the
-  //   <root> Naming Context, which it gets from <resolve_initial_references>, and
-  //   through <level1_context> stringified ior, which it gets from part 1 of
-  //   the persistent test.  The results of both methods are then
-  //   compared for equality.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer and the ior received from
+  /// <Persistent_Test_Begin>.
   Persistent_Test_End (CORBA::ORB_ptr orb,
                        const ACE_TCHAR * ior);
-  // Constructor.  Takes in an orb pointer and the ior received from
-  // <Persistent_Test_Begin>.
 
+  /// Destructor.
   virtual ~Persistent_Test_End (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 2).
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 2).
 
 private:
 
+  /// A pointer to our ORB (used for string/object conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (used for string/object conversion).
 
+  /// IOR of <level1_context> recorded during the run of part 1 of
+  /// persistent test.
   const ACE_TCHAR* ior_;
-  // IOR of <level1_context> recorded during the run of part 1 of
-  // persistent test.
 };
 
+/**
+ * @class CosNaming_Client
+ *
+ * @brief Defines a class that encapsulates behaviour of the CosNaming
+ * client example.  Provides a better understanding of the logic
+ * in an object-oriented way.
+ *
+ * This class declares an interface to run the example client for
+ * CosNaming CORBA server.  All the complexity for initializing
+ * the server is hidden in the class.  Just the <run> interface
+ * is needed.
+ */
 class CosNaming_Client
 {
-  // = TITLE,
-  //    Defines a class that encapsulates behaviour of the CosNaming
-  //    client example.  Provides a better understanding of the logic
-  //    in an object-oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    CosNaming CORBA server.  All the complexity for initializing
-  //    the server is hidden in the class.  Just the <run> interface
-  //    is needed.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   CosNaming_Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~CosNaming_Client (void);
-  // Destructor.
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with server.
 
   // = Symbolic ids.
   enum OBJ_ID
@@ -306,22 +323,22 @@ public:
   };
 
 private:
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// A pointer to the specific Naming Service test a client will
+  /// execute.
   Naming_Test *test_;
-  // A pointer to the specific Naming Service test a client will
-  // execute.
 
+  /// Our ORB manager helper class.
   TAO_ORB_Manager orbmgr_;
-  // Our ORB manager helper class.
 
+  /// Our naming client helper class.
   TAO_Naming_Client naming_client_;
-  // Our naming client helper class.
 };
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
index e2530f2bc2f..90c93878d60 100755
--- a/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
@@ -66,7 +66,7 @@ $cli->DeleteFile ($nsiorfile);
 sub name_server
 {
     my $args = "-ORBNameServicePort $ns_multicast_port -o $ns_nsiorfile -m 1 @_";
-    my $prog = "../../../Naming_Service/Naming_Service";
+    my $prog = "../../../Naming_Service/tao_cosnaming";
     $NS = $ns->CreateProcess ($prog, $args);
 
     $ns->DeleteFile ($nsiorfile);
@@ -119,7 +119,7 @@ $orb_debug_level =  ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_
 
 # Options for all simple tests recognized by the 'client' program.
 @opts = (
-         "-s -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" 
+         "-s -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
                 . " -ORBSvcConf $cli_cliconffile $orb_debug_level",
          "-t -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
                 . " -ORBSvcConf $cli_cliconffile $orb_debug_level",
@@ -129,7 +129,7 @@ $orb_debug_level =  ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_
                 . " -ORBSvcConf $cli_cliconffile $orb_debug_level",
          "-y -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
                 . " -ORBSvcConf $cli_cliconffile $orb_debug_level",
-         
+
          );
 
 @server_opts = (
@@ -137,13 +137,13 @@ $orb_debug_level =  ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
                 "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" 
+                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" 
+                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" 
+                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
-                
+
                 );
 
 @comments = (
@@ -165,7 +165,7 @@ foreach $o (@opts) {
         print STDERR " - Skipping, use -s to run the SSL tests";
         next;
     }
-    
+
     print STDERR "\n";
     name_server ($server_opts[$test_number]);
     client ($o);
@@ -178,7 +178,7 @@ foreach $o (@opts) {
     }
 
     ## For some reason, only on Windows XP, we need to
-    ## wait before starting another Naming_Service when
+    ## wait before starting another tao_cosnaming when
     ## the mmap persistence option is used
     if ($^O eq "MSWin32") {
       sleep(1);
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/server.conf b/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
index 672a471014d..fec138accdb 100644
--- a/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"
diff --git a/orbsvcs/tests/Simple_Naming/Makefile.am b/orbsvcs/tests/Simple_Naming/Makefile.am
deleted file mode 100644
index 09889240ec1..00000000000
--- a/orbsvcs/tests/Simple_Naming/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Simple_Naming_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-CLEANFILES = \
-  test_object-stamp \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp
-
-test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  test_objectC.cpp \
-  test_objectS.cpp \
-  client.h \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.h \
-  test_objectS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Simple_Naming/client.cpp b/orbsvcs/tests/Simple_Naming/client.cpp
index 6f0b6211149..d8996e15ceb 100644
--- a/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/orbsvcs/tests/Simple_Naming/client.cpp
@@ -1,28 +1,26 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Naming_Service/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple CORBA client for the CosNaming
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>,
-//      Marina Spivak <marina@cs.wustl.edu>, and
-//      Douglas C. Schmidt <schmidt@cs.wustl.edu>
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements a simple CORBA client for the CosNaming
+ *    example using stubs generated by the TAO ORB IDL compiler.
+ *
+ *
+ *  @author   Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+ *  @author   Marina Spivak <marina@cs.wustl.edu>
+ *  @author and   Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "client.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Simple_Naming, client, "$Id$")
+
 
 #if defined (_MSC_VER)
 # pragma warning (disable : 4250)
@@ -33,19 +31,19 @@ class My_Test_Object :
 {
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   My_Test_Object (CORBA::Short id = 0);
-  // Constructor.
 
+  /// Destructor.
   ~My_Test_Object (void);
-  // Destructor.
 
   // = Interface implementation accessor methods.
 
+  /// Sets id.
   void id (CORBA::Short id);
-  // Sets id.
 
+  /// Gets id.
   CORBA::Short id (void);
-  // Gets id.
 
 private:
   short id_;
diff --git a/orbsvcs/tests/Simple_Naming/client.h b/orbsvcs/tests/Simple_Naming/client.h
index 81a3daa428b..ad381cd66bd 100644
--- a/orbsvcs/tests/Simple_Naming/client.h
+++ b/orbsvcs/tests/Simple_Naming/client.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//      This class tests the facilities to connect to the naming service.
-//
-// = AUTHORS
-//      Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *    This class tests the facilities to connect to the naming service.
+ *
+ *
+ *  @author   Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "test_objectS.h"
 #include "orbsvcs/CosNamingC.h"
@@ -23,23 +20,25 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "ace/Task.h"
 
+/**
+ * @class Naming_Test
+ *
+ * @brief This is an abstract class which is subclassed
+ * to create different Naming Service tests.
+ *
+ * This is a basic example of the "Strategy" pattern.  This class
+ * provides a common interface for different tests (or
+ * "strategies"), so that a specific test to be used can be
+ * chosen at runtime.
+ */
 class Naming_Test
 {
-  // = TITLE
-  //    This is an abstract class which is subclassed
-  //    to create different Naming Service tests.
-  //
-  // = DESCRIPTION
-  //    This is a basic example of the "Strategy" pattern.  This class
-  //    provides a common interface for different tests (or
-  //    "strategies"), so that a specific test to be used can be
-  //    chosen at runtime.
 
 public:
+  /// Execute the test code.  <root_context> is the context to assume
+  /// as the root for all tests operations.
   virtual ~Naming_Test (void);
   virtual int execute (TAO_Naming_Client &root_context) = 0;
-  // Execute the test code.  <root_context> is the context to assume
-  // as the root for all tests operations.
 
 protected:
   Naming_Test (PortableServer::POA_ptr poa);
@@ -47,136 +46,148 @@ protected:
   PortableServer::POA_var poa_;
 };
 
+/**
+ * @class Simple_Test
+ *
+ * @brief This class implements a simple Naming Service test.
+ *
+ * The test binds(), resolves(), and unbinds() an object
+ * reference from the given Naming Context.
+ */
 class Simple_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a simple Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test binds(), resolves(), and unbinds() an object
-  //    reference from the given Naming Context.
 public:
   Simple_Test (PortableServer::POA_ptr poa);
 
+  /// Execute the simple test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the simple test code.
 };
 
+/**
+ * @class MT_Test
+ *
+ * @brief This class implements a simple Multithreaded (multiclient) Naming Service test.
+ *
+ * The test spawns multiple threads: each attempts to
+ * bind(), resolve(), and unbind() an object
+ * reference using the same name, and the same Naming Context.
+ */
 class MT_Test : public Naming_Test, public ACE_Task_Base
 {
-  // = TITLE
-  //    This class implements a simple Multithreaded (multiclient) Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test spawns multiple threads: each attempts to
-  //    bind(), resolve(), and unbind() an object
-  //    reference using the same name, and the same Naming Context.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer and number of threads to spawn.
   MT_Test (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa,
            int size = 10);
-  // Constructor.  Takes in an orb pointer and number of threads to spawn.
 
+  /// Execute the MT test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the MT test code.
 
+  /// This code is executed by each thread.
   virtual int svc (void);
-  // This code is executed by each thread.
 
 private:
+  /// Number of threads to spawn.  By default is set to 10.
   int size_;
-  // Number of threads to spawn.  By default is set to 10.
 
+  /// A pointer to our ORB.
   CORBA::ORB_var orb_;
-  // A pointer to our ORB.
 
+  /**
+   * IOR in the string format for Naming Service we are to deal with.
+   * Each thread will use string_to_object() and this IOR to create
+   * its own NamingContext stub for invoking operations on the
+   * Naming Service.  If all threads try to use the same stub, bad things
+   * happen...
+   */
   CORBA::String_var name_service_ior_;
-  // IOR in the string format for Naming Service we are to deal with.
-  // Each thread will use string_to_object() and this IOR to create
-  // its own NamingContext stub for invoking operations on the
-  // Naming Service.  If all threads try to use the same stub, bad things
-  // happen...
 
   // This can be replaced with CORBA::String_var when <string_to_object>
   // is fixed - this will clean up the memory properly.
 
+  /// Holds name used for registering the object with Naming Service.
   CosNaming::Name test_name_;
-  // Holds name used for registering the object with Naming Service.
 
+  /// Holds object to be registered with the Naming Service by each thread.
   Test_Object_var test_ref_;
-  // Holds object to be registered with the Naming Service by each thread.
 
 };
 
+/**
+ * @class Tree_Test
+ *
+ * @brief This class implements a test of all Naming Service functions
+ * on a tree of Naming Contexts.
+ *
+ * Bind_context() under the root context with the name level1.
+ * Create_new_context(), bind() foo object into it, and
+ * bind the context into root/level1 under the name level2.
+ * Resolve (root/level1/level2/foo).
+ * Unbind (root/level1/level2/foo).
+ * Bind (root/level1/level2/foo, obj)
+ * Create_new_context()
+ * and invoke rebind_context() to substitute it for the current
+ * level2 context.
+ * Bind (root/level1/level2/foo, obj)
+ * Resolve (root/level1/level2/foo).
+ * Rebind() to have a different object under the name bar.
+ * Resolve (root/level1/level2/foo) to make sure correct reference is returned.
+ */
 class Tree_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of all Naming Service functions
-  //    on a tree of Naming Contexts.
-  //
-  // = DESCRIPTION
-  //    Bind_context() under the root context with the name level1.
-  //    Create_new_context(), bind() foo object into it, and
-  //    bind the context into root/level1 under the name level2.
-  //    Resolve (root/level1/level2/foo).
-  //    Unbind (root/level1/level2/foo).
-  //    Bind (root/level1/level2/foo, obj)
-  //    Create_new_context()
-  //    and invoke rebind_context() to substitute it for the current
-  //    level2 context.
-  //    Bind (root/level1/level2/foo, obj)
-  //    Resolve (root/level1/level2/foo).
-  //    Rebind() to have a different object under the name bar.
-  //    Resolve (root/level1/level2/foo) to make sure correct reference is returned.
 public:
+  /// Execute the tree test code.
   Tree_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the tree test code.
 };
 
+/**
+ * @class Iterator_Test
+ *
+ * @brief This class implements a test of Naming Service functions
+ * which involve BindingIterator.
+ *
+ * The test binds foo1, foo2, foo3, and foo4 objects to the
+ * Naming Context.  It lists() one binding and receives
+ * BindingIterator to iterate over the rest of the bindings.  It
+ * then invokes next_one(), next_n(2), next_one(), and destroy()
+ * on the iterator.
+ */
 class Iterator_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of Naming Service functions
-  //    which involve BindingIterator.
-  //
-  // = DESCRIPTION
-  //    The test binds foo1, foo2, foo3, and foo4 objects to the
-  //    Naming Context.  It lists() one binding and receives
-  //    BindingIterator to iterate over the rest of the bindings.  It
-  //    then invokes next_one(), next_n(2), next_one(), and destroy()
-  //    on the iterator.
 public:
+  /// Execute the iterator test code.
   Iterator_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the iterator test code.
 };
 
+/**
+ * @class Exceptions_Test
+ *
+ * @brief This class implements a test of exceptions in the Naming Service.
+ *
+ * Makes sure that Naming Service throws exceptions as expected, and
+ * data inside exceptions is set correctly.  The test creates a tree of
+ * of Naming Contexts: root context -> level1 -> level2.  It then binds() an
+ * object with the name foo to each of Naming Contexts in the tree.
+ * Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
+ * Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
+ * Invoke bind( level1/foo, obj) on root context - make sure we get AlreadyBound exc.
+ * Invoke unbind( level1/level2/bar) on root context - make sure we get NotFound exc.
+ * with why = not_object, rest_of_name = bar.
+ * Invoke unbind( level1/level3/foo) on root context - make sure we get NotFound exc.
+ * with why = missing_node, rest_of_name = level3/foo.
+ * Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
+ * with why = not_context, rest_of_name = foo/foo.
+ */
 class Exceptions_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of exceptions in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Makes sure that Naming Service throws exceptions as expected, and
-  //    data inside exceptions is set correctly.  The test creates a tree of
-  //    of Naming Contexts: root context -> level1 -> level2.  It then binds() an
-  //    object with the name foo to each of Naming Contexts in the tree.
-  //    Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
-  //    Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
-  //    Invoke bind( level1/foo, obj) on root context - make sure we get AlreadyBound exc.
-  //    Invoke unbind( level1/level2/bar) on root context - make sure we get NotFound exc.
-  //    with why = not_object, rest_of_name = bar.
-  //    Invoke unbind( level1/level3/foo) on root context - make sure we get NotFound exc.
-  //    with why = missing_node, rest_of_name = level3/foo.
-  //    Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
-  //    with why = not_context, rest_of_name = foo/foo.
 public:
+  /// Execute the exceptions test code.
   Exceptions_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the exceptions test code.
 
 private:
   // the following functions isolate specific tests due to the
@@ -190,24 +201,24 @@ private:
   void not_found_test3 (TAO_Naming_Client &root_context);
 };
 
+/**
+ * @class Destroy_Test
+ *
+ * @brief This class implements a test of destroy() function
+ * in the Naming Service.
+ *
+ * Create a context and bind an object under it.
+ * Attempt to destroy the context - NotEmpty exception should be raised.
+ * Unbind the object and call destroy on the context.
+ * Attempt to call destroy on the object again - OBJECT_NOT_EXIST
+ * exception should be raised.
+ */
 class Destroy_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of destroy() function
-  //    in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Create a context and bind an object under it.
-  //    Attempt to destroy the context - NotEmpty exception should be raised.
-  //
-  //    Unbind the object and call destroy on the context.
-  //    Attempt to call destroy on the object again - OBJECT_NOT_EXIST
-  //    exception should be raised.
-  //
 public:
+  /// Execute the destroy test code.
   Destroy_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the destroy test code.
 
 private:
   // = The following functions isolate specific tests.
@@ -215,130 +226,138 @@ private:
   void not_exist_test (CosNaming::NamingContext_var &ref);
 };
 
+/**
+ * @class Persistent_Test_Begin
+ *
+ * @brief This class implements the first part of the Persistent Naming
+ * Service test.
+ *
+ * This test creates the Naming Context hierarchy:
+ * root -> level1_context -> level2_context,
+ * and prints out the ior of the <level1_context>.
+ */
 class Persistent_Test_Begin : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the first part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //    This test creates the Naming Context hierarchy:
-  //    root -> level1_context -> level2_context,
-  //    and prints out the ior of the <level1_context>.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer.
   Persistent_Test_Begin (CORBA::ORB_ptr orb,
                          PortableServer::POA_ptr poa,
                          FILE * ior_output_file);
-  // Constructor.  Takes in an orb pointer.
 
+  /// Destructor.
   virtual ~Persistent_Test_Begin (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 1) code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 1) code.
 
 private:
 
+  /// A pointer to our ORB (needed for object/string conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (needed for object/string conversion).
 
+  /// File where we output the ior for use by part 2 of persistent test.
   FILE *file_;
-  // File where we output the ior for use by part 2 of persistent test.
 };
 
+/**
+ * @class Persistent_Test_End
+ *
+ * @brief This class implements the second part of the Persistent Naming
+ * Service test.
+ *
+ * This test attempts to resolve <level2_context> both through the
+ * <root> Naming Context, which it gets from <resolve_initial_references>, and
+ * through <level1_context> stringified ior, which it gets from part 1 of
+ * the persistent test.  The results of both methods are then
+ * compared for equality.
+ */
 class Persistent_Test_End : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the second part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //   This test attempts to resolve <level2_context> both through the
-  //   <root> Naming Context, which it gets from <resolve_initial_references>, and
-  //   through <level1_context> stringified ior, which it gets from part 1 of
-  //   the persistent test.  The results of both methods are then
-  //   compared for equality.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer and the ior received from
+  /// <Persistent_Test_Begin>.
   Persistent_Test_End (CORBA::ORB_ptr orb,
                        PortableServer::POA_ptr poa,
                        const ACE_TCHAR * ior);
-  // Constructor.  Takes in an orb pointer and the ior received from
-  // <Persistent_Test_Begin>.
 
+  /// Destructor.
   virtual ~Persistent_Test_End (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 2).
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 2).
 
 private:
 
+  /// A pointer to our ORB (used for string/object conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (used for string/object conversion).
 
+  /// IOR of <level1_context> recorded during the run of part 1 of
+  /// persistent test.
   const ACE_TCHAR* ior_;
-  // IOR of <level1_context> recorded during the run of part 1 of
-  // persistent test.
 };
 
+/**
+ * @class Persistent_List_Test
+ *
+ * @brief This class implements the third part of the Persistent Naming
+ * Service test.
+ *
+ * This test attempts to invoke various list() methods on different
+ * known contexts.
+ */
 class Persistent_List_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the third part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //   This test attempts to invoke various list() methods on different
-  //   known contexts.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer.
   Persistent_List_Test (CORBA::ORB_ptr orb,
                         PortableServer::POA_ptr poa);
-  // Constructor.  Takes in an orb pointer.
 
+  /// Destructor.
   virtual ~Persistent_List_Test (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 3).
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 3).
 
 private:
 
+  /// A pointer to our ORB (used for string/object conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (used for string/object conversion).
 };
 
+/**
+ * @class CosNaming_Client
+ *
+ * @brief Defines a class that encapsulates behaviour of the CosNaming
+ * client example.  Provides a better understanding of the logic
+ * in an object-oriented way.
+ *
+ * This class declares an interface to run the example client for
+ * CosNaming CORBA server.  All the complexity for initializing
+ * the server is hidden in the class.  Just the <run> interface
+ * is needed.
+ */
 class CosNaming_Client
 {
-  // = TITLE,
-  //    Defines a class that encapsulates behaviour of the CosNaming
-  //    client example.  Provides a better understanding of the logic
-  //    in an object-oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    CosNaming CORBA server.  All the complexity for initializing
-  //    the server is hidden in the class.  Just the <run> interface
-  //    is needed.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   CosNaming_Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~CosNaming_Client (void);
-  // Destructor.
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with server.
 
   // = Symbolic ids.
   enum OBJ_ID
@@ -348,22 +367,22 @@ public:
   };
 
 private:
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// A pointer to the specific Naming Service test a client will
+  /// execute.
   Naming_Test *test_;
-  // A pointer to the specific Naming Service test a client will
-  // execute.
 
+  /// Our ORB manager helper class.
   TAO_ORB_Manager orbmgr_;
-  // Our ORB manager helper class.
 
+  /// Our naming client helper class.
   TAO_Naming_Client naming_client_;
-  // Our naming client helper class.
 };
diff --git a/orbsvcs/tests/Simple_Naming/run_test.pl b/orbsvcs/tests/Simple_Naming/run_test.pl
index 3cf845a3e17..78cfc80e755 100755
--- a/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -67,7 +67,7 @@ $test->DeleteFile($persistent_log_file);
 sub name_server
 {
     my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "$startdir/../../Naming_Service/Naming_Service";
+    my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
 
     $SV = $test->CreateProcess ("$prog", "$args");
 
@@ -151,7 +151,7 @@ foreach $o (@opts) {
     $SV->Kill ();
 
     ## For some reason, only on Windows XP, we need to
-    ## wait before starting another Naming_Service when
+    ## wait before starting another tao_cosnaming when
     ## the mmap persistence option is used
     if ($^O eq "MSWin32") {
       sleep(1);
diff --git a/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
index 75d04a4e2fa..5ef2c750ed4 100755
--- a/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
+++ b/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
@@ -44,7 +44,7 @@ $test->DeleteFile($persistent_ior_file);
 sub name_server
 {
     my $args = "-ORBNameServicePort $ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "../../Naming_Service/Naming_Service";
+    my $prog = "../../Naming_Service/tao_cosnaming";
 
     $SV = $test->CreateProcess ("$prog", "$args");
 
@@ -125,7 +125,7 @@ foreach $o (@opts) {
     $SV->Kill ();
 
     ## For some reason, only on Windows XP, we need to
-    ## wait before starting another Naming_Service when
+    ## wait before starting another tao_cosnaming when
     ## the mmap persistence option is used
     if ($^O eq "MSWin32") {
       sleep(1);
diff --git a/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
index bd1aba10894..363ca918d35 100755
--- a/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
+++ b/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
@@ -67,7 +67,7 @@ $test->DeleteFile($persistent_ior_file);
 sub name_server
 {
     my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "$startdir/../../Naming_Service/Naming_Service";
+    my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
 
     $SV = $test->CreateProcess ("$prog", "$args");
 
@@ -150,7 +150,7 @@ foreach $o (@opts) {
     $SV->Kill ();
 
     ## For some reason, only on Windows XP, we need to
-    ## wait before starting another Naming_Service when
+    ## wait before starting another tao_cosnaming when
     ## the mmap persistence option is used
     if ($^O eq "MSWin32") {
       sleep(1);
diff --git a/orbsvcs/tests/Time/Client_i.cpp b/orbsvcs/tests/Time/Client_i.cpp
index 4ebf36f362b..91b296ff008 100644
--- a/orbsvcs/tests/Time/Client_i.cpp
+++ b/orbsvcs/tests/Time/Client_i.cpp
@@ -11,7 +11,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID(Time_Service, Client_i, "$Id$")
+
 
 // Constructor.
 
diff --git a/orbsvcs/tests/Time/Client_i.h b/orbsvcs/tests/Time/Client_i.h
index 7bc002f65bd..e49a5b5a7f7 100644
--- a/orbsvcs/tests/Time/Client_i.h
+++ b/orbsvcs/tests/Time/Client_i.h
@@ -1,99 +1,100 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Time_Service
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    This class implements a simple CORBA client that accesses a Time Service
-//    server.
-//
-// = AUTHORS
-//    Vishal Kachroo <vishal@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements a simple CORBA client that accesses a Time Service
+ *  server.
+ *
+ *
+ *  @author Vishal Kachroo <vishal@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/TimeServiceC.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
+/**
+ * @class Client_i
+ *
+ * @brief Client implementation to access the Time Service server.
+ *
+ * Class wrapper for a client that gets the IOR of the clerk
+ * running on its machine and uses it to get the globally
+ * synchronized time
+ */
 class Client_i
 {
-  // = TITLE
-  //     Client implementation to access the Time Service server.
-  //
-  // = DESCRIPTION
-  //     Class wrapper for a client that gets the IOR of the clerk
-  //     running on its machine and uses it to get the globally
-  //     synchronized time
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Client_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Client_i (void);
-  // Destructor.
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with server.
 
+  /**
+   * This test throws an exception that the operation
+   * <secure_universal_time> has not been currently implemented in the
+   * given server.
+   */
   void test_for_secure_universal_time (void);
-  // This test throws an exception that the operation
-  // <secure_universal_time> has not been currently implemented in the
-  // given server.
 
+  /// Tests if the server returns a valid time.
   void test_for_universal_time (void);
-  // Tests if the server returns a valid time.
 
+  /// Tests if the server returns a new UTO filled with the given time.
   void test_for_new_universal_time (void);
-  // Tests if the server returns a new UTO filled with the given time.
 
+  /// Tests if the returned UTO has the same value as the given UTC.
   void test_for_uto_from_utc (void);
-  // Tests if the returned UTO has the same value as the given UTC.
 
+  /// Tests if a new TIO is created according to the given bounds.
   void test_for_new_interval (void);
-  // Tests if a new TIO is created according to the given bounds.
 
 private:
+  /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the server IOR from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// To initialize the naming service and get a clerk IOR.
    int obtain_initial_references (void);
-  // To initialize the naming service and get a clerk IOR.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// IOR of the obj ref of the server.
   char *ior_;
-  // IOR of the obj ref of the server.
 
+  /// Number of times to invoke the <time> operation.
   u_int loop_count_;
-  // Number of times to invoke the <time> operation.
 
+  /// Flag for server shutdown.
   int shutdown_;
-  // Flag for server shutdown.
 
+  /// Time Service Server object ptr.
   CosTime::TimeService_var clerk_;
-  // Time Service Server object ptr.
 
+  /// An instance of the name client used for resolving the Time
+  /// Service object.
   TAO_Naming_Client my_name_client_;
-  // An instance of the name client used for resolving the Time
-  // Service object.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
 };
diff --git a/orbsvcs/tests/Time/Makefile.am b/orbsvcs/tests/Time/Makefile.am
deleted file mode 100644
index 6beaf43556d..00000000000
--- a/orbsvcs/tests/Time/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Time_Orbsvcs_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Client_i.cpp \
-  client.cpp \
-  Client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Time/client.cpp b/orbsvcs/tests/Time/client.cpp
index 855b3ef59e4..463436ae292 100644
--- a/orbsvcs/tests/Time/client.cpp
+++ b/orbsvcs/tests/Time/client.cpp
@@ -3,7 +3,7 @@
 #include "Client_i.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Time, client, "$Id$")
+
 
 // This function runs the Time Service client test.
 
diff --git a/orbsvcs/tests/Time/run_test.pl b/orbsvcs/tests/Time/run_test.pl
index e6e798a372a..2f164522d22 100755
--- a/orbsvcs/tests/Time/run_test.pl
+++ b/orbsvcs/tests/Time/run_test.pl
@@ -34,8 +34,8 @@ $clerk->DeleteFile($srv_ior);
 $clerk->DeleteFile($clk_ior);
 $client->DeleteFile($clk_ior);
 
-$SV = $server->CreateProcess ("../../Time_Service/Time_Service_Server", "-o $server_srv_ior");
-$CK = $server->CreateProcess ("../../Time_Service/Time_Service_Clerk",
+$SV = $server->CreateProcess ("../../Time_Service/tao_costime_server", "-o $server_srv_ior");
+$CK = $server->CreateProcess ("../../Time_Service/tao_costime_clerk",
                               "-f $clerk_srv_ior -o $clerk_clk_ior -t 2");
 $CL = $client->CreateProcess ("client", "-f $client_clk_ior");
 
diff --git a/orbsvcs/tests/Trading/Makefile.am b/orbsvcs/tests/Trading/Makefile.am
deleted file mode 100644
index 83bd8465203..00000000000
--- a/orbsvcs/tests/Trading/Makefile.am
+++ /dev/null
@@ -1,218 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Trading_Test_Lib.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TTestC.cpp \
-  TTestC.h \
-  TTestC.inl \
-  TTestS.cpp \
-  TTestS.h \
-  TTestS.inl
-
-CLEANFILES = \
-  TTest-stamp \
-  TTestC.cpp \
-  TTestC.h \
-  TTestC.inl \
-  TTestS.cpp \
-  TTestS.h \
-  TTestS.inl
-
-TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl: TTest-stamp
-
-TTest-stamp: $(srcdir)/TTest.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -I..\..\.. -I..\..\..\orbsvcs -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libTTest.la
-
-libTTest_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TTEST_BUILD_DLL
-
-libTTest_la_SOURCES = \
-  Offer_Exporter.cpp \
-  Offer_Importer.cpp \
-  Service_Type_Exporter.cpp \
-  Simple_Dynamic.cpp \
-  TT_Info.cpp \
-  TTestC.cpp \
-  TTestS.cpp
-
-noinst_HEADERS = \
-  Offer_Exporter.h \
-  Offer_Importer.h \
-  Service_Type_Exporter.h \
-  Simple_Dynamic.h \
-  TT_Info.h \
-  TTest.idl \
-  TTestC.h \
-  TTestC.inl \
-  TTestS.h \
-  TTestS.inl \
-  ttest_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Trading_Colocated_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += colocated_test
-
-colocated_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-colocated_test_SOURCES = \
-  colocated_test.cpp \
-  Offer_Exporter.h \
-  Offer_Importer.h \
-  Service_Type_Exporter.h \
-  Simple_Dynamic.h \
-  TT_Info.h \
-  ttest_export.h
-
-colocated_test_LDADD = \
-  libTTest.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Trading_Export_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += export_test
-
-export_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-export_test_SOURCES = \
-  export_test.cpp \
-  Offer_Exporter.h \
-  Offer_Importer.h \
-  Service_Type_Exporter.h \
-  Simple_Dynamic.h \
-  TT_Info.h \
-  ttest_export.h
-
-export_test_LDADD = \
-  libTTest.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Trading_Import_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += import_test
-
-import_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-import_test_SOURCES = \
-  import_test.cpp \
-  Offer_Exporter.h \
-  Offer_Importer.h \
-  Service_Type_Exporter.h \
-  Simple_Dynamic.h \
-  TT_Info.h \
-  ttest_export.h
-
-import_test_LDADD = \
-  libTTest.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Trading/Offer_Exporter.cpp b/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 37d47ce97a9..670a64a50e2 100644
--- a/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -4,7 +4,7 @@
 #include "ace/INET_Addr.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Trading, Offer_Exporter, "$Id$")
+
 
 TAO_Offer_Exporter::
 TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
diff --git a/orbsvcs/tests/Trading/Offer_Importer.cpp b/orbsvcs/tests/Trading/Offer_Importer.cpp
index 020b8a3357b..ac8b5a1014f 100644
--- a/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -2,7 +2,7 @@
 
 #include "Offer_Importer.h"
 
-ACE_RCSID(Trading, Offer_Importer, "$Id$")
+
 
 TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
                                         CORBA::Boolean verbose)
diff --git a/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 7c031fbd322..3de513e69a9 100644
--- a/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -2,7 +2,7 @@
 
 #include "Service_Type_Exporter.h"
 
-ACE_RCSID(Trading, Service_Type_Exporter, "$Id$")
+
 
 TAO_Service_Type_Exporter::
 TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
diff --git a/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index a7731f8777b..8e20d0f6d71 100644
--- a/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -5,7 +5,7 @@
 
 #include "Simple_Dynamic.h"
 
-ACE_RCSID(Trading, Simple_Dynamic, "$Id$")
+
 
 template <class T>
 TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
diff --git a/orbsvcs/tests/Trading/TT_Info.cpp b/orbsvcs/tests/Trading/TT_Info.cpp
index 249235b8fb0..56617c9fdab 100644
--- a/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/orbsvcs/tests/Trading/TT_Info.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Trading, TT_Info, "$Id$")
+
 
 const char* TT_Info::INTERFACE_NAMES[] =
 {
diff --git a/orbsvcs/tests/Trading/colocated_test.cpp b/orbsvcs/tests/Trading/colocated_test.cpp
index 5278a192b6b..884e1caff30 100644
--- a/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/orbsvcs/tests/Trading/colocated_test.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Trader/Trader.h"
 #include "orbsvcs/Trader/Service_Type_Repository.h"
 
-ACE_RCSID (Trading,
-           colocated_test,
-           "$Id$")
-
 void
 parse_args (int argc, ACE_TCHAR *argv[],
             CORBA::Boolean& verbose)
diff --git a/orbsvcs/tests/Trading/export_test.cpp b/orbsvcs/tests/Trading/export_test.cpp
index 6be271ef53e..5ed77a2cbc3 100644
--- a/orbsvcs/tests/Trading/export_test.cpp
+++ b/orbsvcs/tests/Trading/export_test.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Trader/Service_Type_Repository.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Trading,
-           export_test,
-           "$Id$")
-
 const ACE_TCHAR *done_file = ACE_TEXT("export_test_ready");
 
 int
diff --git a/orbsvcs/tests/Trading/import_test.cpp b/orbsvcs/tests/Trading/import_test.cpp
index 967aa928e1f..e1200d35c19 100644
--- a/orbsvcs/tests/Trading/import_test.cpp
+++ b/orbsvcs/tests/Trading/import_test.cpp
@@ -3,7 +3,7 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "Offer_Importer.h"
 
-ACE_RCSID(Trading, import_test, "$Id$")
+
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/Trading/run_test.pl b/orbsvcs/tests/Trading/run_test.pl
index 0335a86ee00..6a399032b54 100755
--- a/orbsvcs/tests/Trading/run_test.pl
+++ b/orbsvcs/tests/Trading/run_test.pl
@@ -41,7 +41,7 @@ $import_test->DeleteFile($iorbase);
 my $export_ready_file = $export_test->LocalFile ($ready);
 $export_test->DeleteFile($ready);
 
-$SV = $server->CreateProcess ("../../Trading_Service/Trading_Service",
+$SV = $server->CreateProcess ("../../Trading_Service/tao_costrading",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndpoint iiop://:$port " .
                               "-TSdumpior $server_iorfile");
diff --git a/orbsvcs/tests/ior_corbaname/Makefile.am b/orbsvcs/tests/ior_corbaname/Makefile.am
deleted file mode 100644
index 402c86fcc33..00000000000
--- a/orbsvcs/tests/ior_corbaname/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ior_corbaname_idl.am
-
-BUILT_SOURCES = \
-  corbanameC.cpp \
-  corbanameC.h \
-  corbanameC.inl \
-  corbanameS.cpp \
-  corbanameS.h \
-  corbanameS.inl
-
-CLEANFILES = \
-  corbaname-stamp \
-  corbanameC.cpp \
-  corbanameC.h \
-  corbanameC.inl \
-  corbanameS.cpp \
-  corbanameS.h \
-  corbanameS.inl
-
-corbanameC.cpp corbanameC.h corbanameC.inl corbanameS.cpp corbanameS.h corbanameS.inl: corbaname-stamp
-
-corbaname-stamp: $(srcdir)/corbaname.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/corbaname.idl
-	@touch $@
-
-noinst_HEADERS = \
-  corbaname.idl
-
-## Makefile.ior_corbaname_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  corbanameC.cpp \
-  ior_corbaname_client_i.cpp \
-  ior_corbaname_client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ior_corbaname_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  corbanameC.cpp \
-  corbanameS.cpp \
-  server.cpp \
-  status_i.cpp \
-  status_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ior_corbaname/client.cpp b/orbsvcs/tests/ior_corbaname/client.cpp
index ebd1dbce9dc..38bc49a4ee9 100644
--- a/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/orbsvcs/tests/ior_corbaname/client.cpp
@@ -1,23 +1,18 @@
-// $Id$
-//
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaname/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//     This implements a simple CORBA client for the
-//     corbaname: style IOR parser
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *   This implements a simple CORBA client for the
+ *   corbaname: style IOR parser
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ior_corbaname_client_i.h"
 
diff --git a/orbsvcs/tests/ior_corbaname/corbaname.idl b/orbsvcs/tests/ior_corbaname/corbaname.idl
index d0650d5d6b9..5544216a4a3 100644
--- a/orbsvcs/tests/ior_corbaname/corbaname.idl
+++ b/orbsvcs/tests/ior_corbaname/corbaname.idl
@@ -2,19 +2,19 @@
 
 module corbaname
 {
-  
+
   interface Status
   {
     // = TITLE
-    //     A simple interface to check the status of 
+    //     A simple interface to check the status of
     //     connection between the client and the server.
     //
     // = DESCRIPTION
     //     Prints out the status.
 
     boolean print_status ();
-    // Return <true> if the server received the 
+    // Return <true> if the server received the
     // request from the client.
-        
+
   };
 };
diff --git a/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index 901bed185e4..00e39c3e1c6 100644
--- a/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -1,23 +1,19 @@
-// $Id$
-//
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaname/
-//
-// = FILENAME
-//    ior_corbaname_client_i.cpp
-//
-// = DESCRIPTION
-//    This example implements a simple client which sends a corbaname:
-//    style url to the server and gets a response from the
-//    server to indicate that the server has received the request.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ior_corbaname_client_i.cpp
+ *
+ *  $Id$
+ *
+ *  This example implements a simple client which sends a corbaname:
+ *  style url to the server and gets a response from the
+ *  server to indicate that the server has received the request.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ior_corbaname_client_i.h"
 #include "ace/Get_Opt.h"
diff --git a/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 18ab287ea32..01b69e8bbfc 100644
--- a/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaname/
-//
-// = FILENAME
-//    ior_corbaname_client_i.h
-//
-// = DESCRIPTION
-//    This class implements a simple client which sends a corbaname:
-//    style url to the server and gets a response from the
-//    server to indicate that the server has received the request.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ior_corbaname_client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements a simple client which sends a corbaname:
+ *  style url to the server and gets a response from the
+ *  server to indicate that the server has received the request.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #if !defined (IOR_CORBANAME_CLIENT_I_H)
 #define IOR_CORBANAME_CLIENT_I_H
@@ -25,38 +22,39 @@
 #include "corbanameC.h"
 #include "orbsvcs/CosNamingC.h"
 
+/**
+ * @class IOR_corbaname_Client_i
+ *
+ * @brief NContextExt Client Implementation
+ *
+ */
 class IOR_corbaname_Client_i
 {
-  // = TITLE
-  //     NContextExt Client Implementation
-  //
-  // = DESCRIPTION
-  //
 
  public:
   // = Constructor and destructor.
   IOR_corbaname_Client_i (void);
   ~IOR_corbaname_Client_i (void);
 
+  /// Execute the client example code.
   int run (void);
-  // Execute the client example code.
 
+  /// Initialize the client communication endpoint with the server.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with the server.
 
  private:
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// ORB
   CORBA::ORB_var orb_;
-  // ORB
 
+  /// Naming context
   CosNaming::NamingContextExt_var naming_context_;
-  // Naming context
 };
 
 #endif /* IOR_CORBANAME_CLIENT_I_H */
diff --git a/orbsvcs/tests/tests_svc_loader/Makefile.am b/orbsvcs/tests/tests_svc_loader/Makefile.am
deleted file mode 100644
index 31eae6825ea..00000000000
--- a/orbsvcs/tests/tests_svc_loader/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.tests_svc_loader.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = tests_svc_loader
-
-tests_svc_loader_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-tests_svc_loader_SOURCES = \
-  tests_svc_loader.cpp
-
-tests_svc_loader_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index 75926732c39..b90b58eef5a 100644
--- a/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -1,26 +1,23 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/tests/tests_svc_loader
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//   This directory contains a client that checks if a given object
-//   reference points to an existing object or not and prints a debug
-//   statement to reflect the same. This client is to be used in
-//   conjunction with testing the dynamically loadable services. If
-//   the service is loaded successfully, the object reference from the
-//   server would be a valid one and the corresponding debug statement
-//   is printed out. Or viceversa.
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    tests_svc_loader.cpp
+ *
+ *  $Id$
+ *
+ * This directory contains a client that checks if a given object
+ * reference points to an existing object or not and prints a debug
+ * statement to reflect the same. This client is to be used in
+ * conjunction with testing the dynamically loadable services. If
+ * the service is loaded successfully, the object reference from the
+ * server would be a valid one and the corresponding debug statement
+ * is printed out. Or viceversa.
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "tao/Object.h"
@@ -30,10 +27,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (tests_svc_loader,
-           tests_svc_loader,
-           "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 {
   try
diff --git a/orbsvcs/tests/unit/Makefile.am b/orbsvcs/tests/unit/Makefile.am
deleted file mode 100644
index f625b1eaf6a..00000000000
--- a/orbsvcs/tests/unit/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Notify \
-        Trading
-
diff --git a/orbsvcs/tests/unit/Notify/MC/Control/Makefile.am b/orbsvcs/tests/unit/Notify/MC/Control/Makefile.am
deleted file mode 100644
index 36de58cb465..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/Control/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Control.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = Control
-
-Control_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Control_SOURCES = \
-  Control.cpp
-
-Control_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/unit/Notify/MC/Makefile.am b/orbsvcs/tests/unit/Notify/MC/Makefile.am
deleted file mode 100644
index 55d478023e5..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Control \
-        MonitorControlExt \
-        MonitorManager \
-        NotificationServiceMonitor \
-        Statistic \
-        Statistic_Registry
-
diff --git a/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am b/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am
deleted file mode 100644
index 845eaf08bb0..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.MonitorControlExt.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = MonitorControlExt
-
-MonitorControlExt_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-MonitorControlExt_SOURCES = \
-  MonitorControlExt.cpp
-
-MonitorControlExt_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC_Ext.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp b/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
index 63fc5154dae..dda9336defb 100644
--- a/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
+++ b/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
@@ -35,17 +35,17 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-      
+
       CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (obj.in ());
-        
+
       PortableServer::POAManager_var poa_manager = poa->the_POAManager ();
       poa_manager->activate ();
 
       TAO_Notify_Service* notify_service =
         TAO_Notify_Service::load_default ();
-      
+
       if (notify_service == 0)
         {
           error ("Unable to load the Notify Service");
@@ -59,7 +59,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
          notify_service->create (poa.in (), ecf_name.c_str ());
       NotifyMonitoringExt::EventChannelFactory_var monitor_ec_factory =
         NotifyMonitoringExt::EventChannelFactory::_narrow (ecf.in ());
-        
+
       if (CORBA::is_nil (monitor_ec_factory.in ()))
         {
          error ("Unable to create the Monitoring Event Channel Factory");
@@ -69,7 +69,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       CosNotification::AdminProperties admin_prop;
       CosNotifyChannelAdmin::ChannelID id;
       const ACE_CString ec_name ("test1");
-      
+
       CosNotifyChannelAdmin::EventChannel_var ec =
         monitor_ec_factory->create_named_channel (qos_prop,
                                                   admin_prop,
@@ -77,7 +77,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                                                   ec_name.c_str ());
       NotifyMonitoringExt::EventChannel_var mec =
         NotifyMonitoringExt::EventChannel::_narrow (ec.in ());
-        
+
       if (CORBA::is_nil (mec.in ()))
         {
           error ("Unable to narrow the event channel");
@@ -104,9 +104,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         ecf_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::InactiveEventChannelCount);
-        
+
       Monitor_Base* stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find InactiveEventChannelCount statistic");
@@ -114,8 +114,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       double count = stat->last_sample ();
-      
-      if (count != 1)
+
+      if (!ACE::is_equal (count, 1.0))
         {
           error ("Invalid inactive event channel count");
         }
@@ -124,9 +124,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         ecf_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::ActiveEventChannelCount);
-        
+
       stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find ActiveEventChannelCount statistic");
@@ -134,8 +134,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       count = stat->last_sample ();
-      
-      if (count != 0)
+
+      if (!ACE::is_equal (count, 0.0))
         {
           error ("Invalid active event channel count");
         }
@@ -144,9 +144,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         ecf_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::InactiveEventChannelNames);
-        
+
       stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find InactiveEventChannels statistic");
@@ -154,14 +154,14 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       Monitor_Control_Types::NameList list = stat->get_list ();
-      
+
       if (list.size () != 1)
         {
           error ("Invalid inactive event channel list");
         }
 
       ACE_CString full_ec_name (ecf_name + "/" + ec_name);
-      
+
       if (list[0] != full_ec_name)
         {
           error ("Wrong event channel name");
@@ -179,7 +179,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
             mec->named_new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                                           aid,
                                           "TestSupplierAdmin");
-                                          
+
           error ("Expected a SupplierAdmin "
                  "NotifyMonitoringExt::NameAlreadyUsed exception");
         }
@@ -197,7 +197,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       NotifyMonitoringExt::SupplierAdmin_var madmin =
         NotifyMonitoringExt::SupplierAdmin::_narrow (admin.in ());
-        
+
       if (CORBA::is_nil (madmin.in ()))
         {
           error ("Could not narrow the supplier admin");
@@ -215,7 +215,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
           CosNotifyChannelAdmin::ProxyConsumer_var fake =
             madmin->obtain_named_notification_push_consumer
             (CosNotifyChannelAdmin::STRUCTURED_EVENT, pid, "supplier");
-            
+
           error ("Expected a ProxyConsumer "
                  "NotifyMonitoringExt::NameAlreadyUsed exception");
         }
@@ -230,9 +230,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         + ec_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::EventChannelSupplierCount);
-        
+
       stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find the event channel suppliers statistic");
@@ -240,8 +240,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       count = stat->last_sample ();
-      
-      if (count != 1)
+
+      if (!ACE::is_equal (count, 1.0))
         {
           error ("Invalid supplier count");
         }
@@ -277,7 +277,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
             mec->named_new_for_consumers (CosNotifyChannelAdmin::AND_OP,
                                           aid,
                                           "TestConsumerAdmin");
-                                          
+
           error ("Expected a ConsumerAdmin "
                  "NotifyMonitoringExt::NameAlreadyUsed exception");
         }
@@ -295,7 +295,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       NotifyMonitoringExt::ConsumerAdmin_var mcadmin =
         NotifyMonitoringExt::ConsumerAdmin::_narrow (cadmin.in ());
-        
+
       if (CORBA::is_nil (mcadmin.in ()))
         {
           error ("Could not narrow the consumer admin");
@@ -314,7 +314,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
               CosNotifyChannelAdmin::STRUCTURED_EVENT,
               pid,
               "consumer");
-              
+
           error ("Expected a ProxySupplier "
                  "NotifyMonitoringExt::NameAlreadyUsed exception");
         }
@@ -329,9 +329,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         + ec_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::EventChannelConsumerCount);
-        
+
       stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find the event channel consumers statistic");
@@ -339,8 +339,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       count = stat->last_sample ();
-      
-      if (count != 1)
+
+      if (!ACE::is_equal (count, 1.0))
         {
           error ("Invalid consumer count");
         }
diff --git a/orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile.am b/orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile.am
deleted file mode 100644
index 992187c9ef8..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MonitorManager_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS += MonitorClient
-
-MonitorClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-MonitorClient_SOURCES = \
-  MonitorClient.cpp
-
-MonitorClient_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Makefile.MonitorManager_Server.am
-
-noinst_PROGRAMS += MonitorManager
-
-MonitorManager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-MonitorManager_SOURCES = \
-  MonitorManager.cpp
-
-MonitorManager_LDADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf b/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf
index 74f5e5224b2..1d72c863f98 100644
--- a/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf
+++ b/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic TAO_MonitorAndControl Service_Object * TAO_CosNotification_MC:_make_TAO_MonitorAndControl () "-NoNameSvc -ORBArg -ORBListenEndpoints -ORBArg iiop://127.0.0.1:32101"
diff --git a/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile.am b/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile.am
deleted file mode 100644
index 0e0f057a3c1..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.NotificationServiceMonitor.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = NotificationServiceMonitor
-
-NotificationServiceMonitor_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-NotificationServiceMonitor_SOURCES = \
-  NotificationServiceMonitor.cpp
-
-NotificationServiceMonitor_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp b/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
index 18d10324597..81c20d2f598 100644
--- a/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
+++ b/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
@@ -128,7 +128,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       index = start_size + 1;
       num = data[index].data_union.num ();
 
-      if (num.average != 4.5)
+      if (!ACE::is_equal (num.average, 4.5))
         {
           error ("get_statistics() return the wrong data");
         }
diff --git a/orbsvcs/tests/unit/Notify/MC/Statistic/Makefile.am b/orbsvcs/tests/unit/Notify/MC/Statistic/Makefile.am
deleted file mode 100644
index 7c4cdda1f45..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/Statistic/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Statistic.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = Statistic
-
-Statistic_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Statistic_SOURCES = \
-  Statistic.cpp
-
-Statistic_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp b/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
index 2db160fceb1..c6a81b78d8c 100644
--- a/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
+++ b/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
@@ -27,8 +27,8 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       counter.receive (0.0);
       counter.receive (0.0);
       counter.receive (0.0);
-      
-      if (counter.last_sample() != 3)
+
+      if (!ACE::is_equal (counter.last_sample(), 3.0))
         {
           error ("Counter Monitor_Control::receive() failed");
         }
@@ -40,23 +40,23 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       number.receive (size);
       size = 42;
       number.receive (size);
-      
-      if (number.average () != 20)
+
+      if (!ACE::is_equal (number.average (), 20.0))
         {
           error ("Number Monitor_Base::average() failed");
         }
-        
-      if (number.minimum_sample () != 8)
+
+      if (!ACE::is_equal (number.minimum_sample (), 8.0))
         {
           error ("Number Monitor_Base::minimum_sample() failed");
         }
-        
-      if (number.maximum_sample () != 42)
+
+      if (!ACE::is_equal (number.maximum_sample (), 42.0))
         {
           error ("Number Monitor_Base::maximum_sample() failed");
         }
-        
-      if (number.sum_of_squares () != 1928)
+
+      if (!ACE::is_equal (number.sum_of_squares (), 1928.0))
         {
           error ("Number Monitor_Base::sum_of_squares() failed");
         }
@@ -65,18 +65,18 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       stime.receive (1183466309.01234);
       stime.receive (1183466377.9922);
       stime.receive (1083466309.88374);
-      
-      if (stime.average () != 1150132998.96276)
+
+      if (!ACE::is_equal (stime.average (), 1150132998.96276))
         {
           error ("Time Monitor_Base::average() failed");
         }
-        
-      if (stime.minimum_sample () != 1083466309.88374)
+
+      if (!ACE::is_equal (stime.minimum_sample (), 1083466309.88374))
         {
           error ("Time Monitor_Base::minimum_sample() failed");
         }
-        
-      if (stime.maximum_sample () != 1183466377.9922)
+
+      if (!ACE::is_equal (stime.maximum_sample (), 1183466377.9922))
         {
           error ("Time Monitor_Base::maximum_sample() failed");
         }
@@ -85,7 +85,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       interval.receive (.8);
       interval.receive (.1);
       interval.receive (.42);
-      
+
       // This multiplication and casting is necessary since the machine
       // representation of the floating point values in the receive()
       // calls are not exactly what is represented by the text of the code.
@@ -93,17 +93,17 @@ ACE_TMAIN (int, ACE_TCHAR*[])
         {
           error ("Interval Monitor_Base::average() failed");
         }
-        
-      if (interval.minimum_sample () != .1)
+
+      if (!ACE::is_equal (interval.minimum_sample (), 0.1))
         {
           error ("Interval Monitor_Base::minimum_sample() failed");
         }
-        
-      if (interval.maximum_sample () != .8)
+
+      if (!ACE::is_equal (interval.maximum_sample (), 0.8))
         {
           error ("Interval Monitor_Base::maximum_sample() failed");
         }
-        
+
       if (static_cast<int> (interval.sum_of_squares () * 10000) != 8264)
         {
           error ("Interval Monitor_Base::sum_of_squares() failed");
@@ -115,7 +115,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       l.push_back ("two");
       l.push_back ("three");
       list.receive (l);
-      
+
       if (list.count () != 3)
         {
           error ("List Monitor_Base::receive() failed");
diff --git a/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile.am b/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile.am
deleted file mode 100644
index a5989740c23..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Statistic_Registry.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = Statistic_Registry
-
-Statistic_Registry_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Statistic_Registry_SOURCES = \
-  Statistic_Registry.cpp
-
-Statistic_Registry_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp b/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
index c3f330b31b8..6d3a54b2593 100644
--- a/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
+++ b/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
@@ -29,7 +29,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
 
       // Test registry acquisition.
       Monitor_Point_Registry* reg = Monitor_Point_Registry::instance ();
-      
+
       if (reg == 0)
         {
           error ("Monitor_Point_Registry::instance() failed");
@@ -75,7 +75,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
                       Monitor_Base ("test1",
                                     Monitor_Control_Types::MC_COUNTER),
                       2);
-                      
+
       if (reg->add (s) == false)
         {
           error ("re-addition Monitor_Point_Registry::add() failed");
@@ -85,7 +85,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
                       Monitor_Base ("test2",
                                     Monitor_Control_Types::MC_NUMBER),
                       2);
-                      
+
       if (reg->add (s) == false)
         {
           error ("second Monitor_Point_Registry::add() failed");
diff --git a/orbsvcs/tests/unit/Notify/Makefile.am b/orbsvcs/tests/unit/Notify/Makefile.am
deleted file mode 100644
index 78e59ea6b49..00000000000
--- a/orbsvcs/tests/unit/Notify/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        MC
-
diff --git a/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
index edc28721c2c..10c97dc3c24 100644
--- a/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
+++ b/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
@@ -16,14 +16,14 @@ public:
   virtual int visit_constraint (TAO_Unary_Constraint*);
 
   virtual int visit_with (TAO_Unary_Constraint*) { return 1; }
-  virtual int visit_min (TAO_Unary_Constraint*) { return 1; }  
-  virtual int visit_max (TAO_Unary_Constraint*) { return 1; }  
+  virtual int visit_min (TAO_Unary_Constraint*) { return 1; }
+  virtual int visit_max (TAO_Unary_Constraint*) { return 1; }
   virtual int visit_first (TAO_Noop_Constraint*) { return 1; }
   virtual int visit_random (TAO_Noop_Constraint*) { return 1; }
 
   virtual int visit_and (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_or (TAO_Binary_Constraint*) { return 1; }  
-  virtual int visit_not (TAO_Unary_Constraint*) { return 1; }   
+  virtual int visit_or (TAO_Binary_Constraint*) { return 1; }
+  virtual int visit_not (TAO_Unary_Constraint*) { return 1; }
 
   virtual int visit_exist (TAO_Unary_Constraint*) { return 1; }
   virtual int visit_unary_minus (TAO_Unary_Constraint*) { return 1; }
@@ -31,7 +31,7 @@ public:
   virtual int visit_add (TAO_Binary_Constraint*) { return 1; }
   virtual int visit_sub (TAO_Binary_Constraint*) { return 1; }
   virtual int visit_mult (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_div (TAO_Binary_Constraint*) { return 1; }  
+  virtual int visit_div (TAO_Binary_Constraint*) { return 1; }
 
   virtual int visit_twiddle (TAO_Binary_Constraint*) { return 1; }
   virtual int visit_in (TAO_Binary_Constraint*) { return 1; }
@@ -129,7 +129,7 @@ Literal_Interpreter<const char*>::compare (const char* expected) const
 template<class T> bool
 Literal_Interpreter<T>::compare (T expected) const
 {
-  return (static_cast<T> (this->constraint_) == expected);
+  return ACE::is_equal (static_cast<T> (this->constraint_), expected);
 }
 
 template<class T> void
diff --git a/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am b/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am
deleted file mode 100644
index af99264e7ad..00000000000
--- a/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Interpreter.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Interpreter
-
-Interpreter_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Interpreter_SOURCES = \
-  Interpreter.cpp
-
-Interpreter_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/unit/Trading/Makefile.am b/orbsvcs/tests/unit/Trading/Makefile.am
deleted file mode 100644
index add42f9d0ae..00000000000
--- a/orbsvcs/tests/unit/Trading/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Interpreter
-