Shorten file headers

69 files changed, 0 insertions, 146 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index 5b060c804f8..b83bbeb5c48 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -49,7 +49,6 @@ SENDER_ENDPOINT_STRATEGY;
  *
  * @brief Class is responsible for streaming (and pacing) data to a
  * receiver.
- *
  */
 class Sender
 {
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
index b5d524b6951..c3e99f7402e 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
@@ -2,7 +2,6 @@
  * @file ORB_Task.cpp
  *
  * @author Carlos O'Ryan <coryan@atdesk.com>
- *
  */
 #include "ORB_Task.h"
 #include "tao/Messaging/Messaging.h"
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h
index 36be419b5d1..b188a5f28f6 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h
@@ -4,7 +4,6 @@
  * @file ORB_Task.h
  *
  * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- *
  */
 #include "tao/ORB.h"
 #include "ace/Task.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
index 33a055d29db..59a997ec94b 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
@@ -5,8 +5,6 @@
  *  @file    Client_i.h
  *
  *  A helper class for the client
- *
- *
  */
 //=============================================================================
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
index 6f44cfc6a2a..38b1816f083 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
@@ -3,7 +3,6 @@
 //=============================================================================
 /**
  * @file Server_Request_Interceptor.h
- *
  */
 //=============================================================================
 
@@ -28,8 +27,6 @@
  * @class Server_Request_Interceptor
  *
  * @brief Simple concrete server request interceptor.
- *
- *
  */
 class Server_Request_Interceptor
   : public virtual Simple_ServerRequestInterceptor,
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
index 4acbf40b38a..6cb92c1a182 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
@@ -2,7 +2,6 @@
 
 //=============================================================================
 /**
- *
  */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER_H
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
index 6a9ad6f4132..25981453292 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
@@ -2,7 +2,6 @@
 
 //=============================================================================
 /**
- *
  */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
index 4952ea01cfc..bc80c93dc19 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
@@ -2,7 +2,6 @@
 
 //=============================================================================
 /**
- *
  */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
index 6a9ad6f4132..25981453292 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
@@ -2,7 +2,6 @@
 
 //=============================================================================
 /**
- *
  */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
index 5a577083a7a..c059e811515 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
@@ -2,7 +2,6 @@
 
 //=============================================================================
 /**
- *
  */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
index 0c63e591c5d..8e0ee7c8d61 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
@@ -2,7 +2,6 @@
 
 //=============================================================================
 /**
- *
  */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER_H
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h
index 7513dfe900a..55063792acd 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h
@@ -3,8 +3,6 @@
 //=============================================================================
 /**
  *  @file     ClientORBInitializer.h
- *
- *
  */
 //=============================================================================
 #ifndef CLIENTORBINITIALIZER_H
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
index 0f3f82910fb..53d5ad3bed2 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
@@ -2,8 +2,6 @@
 //=============================================================================
 /**
  *  @file     ClientRequest_Interceptor.h
- *
- *
  */
 //=============================================================================
 #ifndef CLIENTREQUEST_INTERCEPTOR_H
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
index 742b857aee7..3a10627bd0a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
@@ -21,7 +21,6 @@
  * @class Consumer
  *
  * @brief Simple consumer object
- *
  */
 class Consumer : public EC_Counting_Consumer
 {
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 0c4f3571421..2ea495a6405 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -21,7 +21,6 @@
  * @class EC_BCast
  *
  * @brief Test the EC bcast
- *
  */
 class EC_BCast : public EC_Driver
 {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h
index 01eb0b27baf..52d038d67e7 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.h
@@ -21,7 +21,6 @@
  * @class Consumer
  *
  * @brief Simple consumer object
- *
  */
 class Consumer : public EC_Counting_Consumer
 {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index 33a8abf2a8a..120af473405 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -67,7 +67,6 @@ private:
  * @class EC_Observer
  *
  * @brief Test the EC observers
- *
  */
 class EC_Observer : public EC_Driver
 {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
index 248b14a3a4f..03c07d71439 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
@@ -21,7 +21,6 @@
  * @class EC_Inversion
  *
  * @brief Measure priority inversions in the EC.
- *
  */
 class EC_Inversion : public EC_Driver
 {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
index 008bf055e9c..4082f96ecbd 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
@@ -21,7 +21,6 @@
  * @class EC_Throughput
  *
  * @brief Test the EC throughput
- *
  */
 class EC_Throughput : public EC_Driver
 {
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
index abd4b6c697c..8fcedfd7426 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -32,8 +32,6 @@
  * @class Server_Request_Interceptor
  *
  * @brief Simple concrete server request interceptor.
- *
- *
  */
 class Server_Request_Interceptor
   : public virtual ForwardRequestTest::ServerRequestInterceptor,
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
index 9027bcc8ef5..d8074e356af 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
@@ -2,7 +2,6 @@
  * @file ORB_Task.cpp
  *
  * @author Carlos O'Ryan <coryan@atdesk.com>
- *
  */
 #include "ORB_Task.h"
 #include "tao/Environment.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.h
index fda63bd38ac..e249384b599 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.h
@@ -2,7 +2,6 @@
  * @file ORB_Task.h
  *
  * @author Carlos O'Ryan <coryan@atdesk.com>
- *
  */
 #ifndef IMR_REGRESSION_ORB_TASK_H
 #define IMR_REGRESSION_ORB_TASK_H
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 14768a74dd3..355918a32e2 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -25,7 +25,6 @@
  * @class NContextExt_Client_i
  *
  * @brief NContextExt Client Implementation
- *
  */
 class NContextExt_Client_i
 {
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
index 169217e342e..d6e981cadca 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
@@ -1,6 +1,5 @@
 /* -*- C++ -*- */
 /**
- *
  */
 
 #ifndef TEST_SAVER_H
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
index 0d99bdb12d0..a12b440e707 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
@@ -1,5 +1,4 @@
 /**
- *
  */
 
 #include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
index c10823eca06..eaa28d78de7 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
@@ -3,8 +3,6 @@
  *  @file RT_Application_Command.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_RT_APPLICATION_COMMAND_H
@@ -23,7 +21,6 @@
  * @class TAO_Notify_Tests_RT_Application_Command
  *
  * @brief
- *
  */
 class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Application_Command : public TAO_Notify_Tests_Application_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
index 297b2d91600..19188d711f6 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
@@ -3,8 +3,6 @@
  *  @file RT_POA_Command.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_RT_POA_COMMAND_H
@@ -27,7 +25,6 @@
  * @class TAO_Notify_Tests_RT_POA_Command
  *
  * @brief Command for managing RTCORBA POAs.
- *
  */
 class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_POA_Command : public TAO_Notify_Tests_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
index 4bdfd6cc62e..10adc098929 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
@@ -3,8 +3,6 @@
  *  @file RT_Priority_Mapping.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_RT_PRIORITY_MAPPING_H
@@ -24,7 +22,6 @@
  * @class TAO_Notify_Tests_RT_Priority_Mapping
  *
  * @brief Delegates to a RTCORBA::PriorityMapping
- *
  */
 class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Priority_Mapping : public TAO_Notify_Tests_Priority_Mapping
 {
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index 83cc15df650..11fca2d5a0c 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -3,8 +3,6 @@
  *  @file RT_Test_Filter.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_RT_Test_FILTER_H
@@ -28,7 +26,6 @@
  * @class TAO_RT_Test_Filter
  *
  * @brief Implementation of CosNotifyFilter::Filter servant.
- *
  */
 class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_Filter
   : public POA_CosNotifyFilter::Filter
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index b08fea2f937..67545801b90 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -3,8 +3,6 @@
  *  @file RT_Test_FilterFactory.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_RT_Test_FILTERFACTORY_H
@@ -29,7 +27,6 @@
  * @class TAO_Notify_Tests_RT_Test_FilterFactory
  *
  * @brief
- *
  */
 class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_FilterFactory
   : public virtual POA_CosNotifyFilter::FilterFactory
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index b64b0b5bdc6..facf3fed8dd 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -1,5 +1,4 @@
 /**
- *
  */
 
 #include "orbsvcs/CosNotificationC.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index 980db7b7766..ad1133a038a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -3,8 +3,6 @@
  *  @file Activation_Manager.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_ACTIVATION_MANAGER_H
@@ -33,7 +31,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
  * @class TAO_Notify_Tests_Activation_Manager
  *
  * @brief Class to handle Suppliers and Consumers.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Activation_Manager : public TAO_Notify_Tests_Task_Callback
                                                        , public POA_Notify_Test::Activation_Manager
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index b997dc2e48c..7304c92558e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -3,8 +3,6 @@
  *  @file Application_Command.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_APPLICATION_COMMAND_H
@@ -26,7 +24,6 @@ class TAO_Notify_Tests_Application_Command;
  * @class TAO_Notify_Tests_Application_Command
  *
  * @brief Command to control the Application.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Application_Command : public TAO_Notify_Tests_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h
index 9cf6c95e054..6b5ce7b68fc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -3,8 +3,6 @@
  *  @file Command.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_COMMAND_H
@@ -32,7 +30,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
  * @class TAO_Notify_Tests_Command
  *
  * @brief Base Class for all command objects.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
index 70b2a00eb53..0a808080a62 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
@@ -3,8 +3,6 @@
  *  @file Command_Builder.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_COMMAND_BUILDER_H
@@ -32,7 +30,6 @@ class TAO_Notify_Tests_Command;
  * @class TAO_Notify_Tests_Command_Builder
  *
  * @brief Class for collating and serially executing command objects.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Builder : public ACE_Service_Object
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
index 0cf0f4b509f..8a9238ac437 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
@@ -3,8 +3,6 @@
  *  @file Command_Factory.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_COMMAND_FACTORY_H
@@ -23,7 +21,6 @@ class TAO_Notify_Tests_Command;
  * @class TAO_Notify_Tests_Command_Factory
  *
  * @brief Base class for Factory to create command objects.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Factory
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
index 26f865db163..4a36c2364ff 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
@@ -3,8 +3,6 @@
  *  @file Command_Factory_T.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_COMMAND_FACTORY_T_H
@@ -26,7 +24,6 @@ class TAO_Notify_Tests_Command;
  * @class TAO_Command_Factory_T
  *
  * @brief Template class to create COMMAND specific factories.
- *
  */
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index b8602728e41..c211128edf0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -3,8 +3,6 @@
  *  @file ConsumerAdmin_Command.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_CONSUMERADMIN_COMMAND_H
@@ -25,7 +23,6 @@
  * @class TAO_Notify_Tests_ConsumerAdmin_Command
  *
  * @brief Command for ConsumerAdmin objects.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_ConsumerAdmin_Command  : public TAO_Notify_Tests_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 62cad1c6e98..695d29076db 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -3,8 +3,6 @@
  *  @file Consumer_T.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_CONSUMER_T_H
@@ -37,7 +35,6 @@ class TAO_Notify_Tests_ConsumerAdmin_Ext_Traits
  * @class TAO_Notify_Tests_Consumer_T
  *
  * @brief Base template to implement Consumers.
- *
  */
 template <class Consumer_Traits>
 class TAO_Notify_Tests_Consumer_T : public TAO_Notify_Tests_Peer_T <Consumer_Traits>
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
index 8d075ac11b4..23817fc250b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
@@ -3,8 +3,6 @@
  *  @file Direct_Consumer.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_DIRECT_CONSUMER_H
@@ -23,7 +21,6 @@
  * @class TAO_Notify_Tests_Direct_Consumer
  *
  * @brief Does not connect to the Notification Service. The Direct Supplier supplies events directly.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Direct_Consumer : public TAO_Notify_Tests_Periodic_Consumer
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
index 00cda6b3335..b06ea5f9afc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
@@ -3,8 +3,6 @@
  *  @file Direct_Supplier.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_DIRECT_SUPPLIER_H
@@ -23,7 +21,6 @@
  * @class TAO_Notify_Tests_Direct_Supplier
  *
  * @brief Send Directly to a consumer.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Direct_Supplier : public TAO_Notify_Tests_Periodic_Supplier
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index c13dad8730b..51400d8712f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -3,8 +3,6 @@
  *  @file Driver.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_DRIVER_H
@@ -31,7 +29,6 @@ class TAO_Notify_Tests_Activation_Manager;
  * @class TAO_Notify_Tests_Worker
  *
  * @brief A Task to execute commands asynchronously.
- *
  */
 class TAO_Notify_Tests_Worker : public ACE_Task_Base
 {
@@ -86,7 +83,6 @@ private:
  * @class TAO_Notify_Tests_Driver
  *
  * @brief A default Application Starter.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Driver : public TAO_Notify_Tests_Driver_Base
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h b/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h
index 56d70ab1e17..4a0c994ac33 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h
@@ -3,8 +3,6 @@
  *  @file Driver_Base.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_APPLICATION_STARTER_H
@@ -21,7 +19,6 @@
  * @class TAO_Notify_Tests_Driver_Base
  *
  * @brief Base class for Driver.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Driver_Base
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index a3953e72307..dadd213d8c1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -3,8 +3,6 @@
  *  @file EventChannel_Command.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_EVENTCHANNEL_COMMAND_H
@@ -30,7 +28,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
  * @class TAO_Notify_Tests_EventChannel_Command
  *
  * @brief Command object for event channels.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_EventChannel_Command : public TAO_Notify_Tests_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.h b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.h
index b02cf6c5f7c..d22bb52cfe8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.h
@@ -3,8 +3,6 @@
  *  @file Factories_Define.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_FACTORIES_DEFINE_H
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index e66828ede48..3389c9b0186 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -3,8 +3,6 @@
  *  @file Filter_Command.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_FILTER_COMMAND_H
@@ -25,7 +23,6 @@
  * @class TAO_Notify_Tests_Filter_Command
  *
  * @brief Command for Filter Objects.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Filter_Command : public TAO_Notify_Tests_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index 70bb02ccd15..6b1db928a77 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -3,8 +3,6 @@
  *  @file LookupManager.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_LOOKUPMANAGER_H
@@ -33,7 +31,6 @@ class TAO_Notify_Tests_Priority_Mapping;
  * @class TAO_Notify_Tests_LookupManager
  *
  * @brief Utility to register and resolve object references.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_LookupManager
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.h b/TAO/orbsvcs/tests/Notify/lib/Name.h
index 48c0d1b94bd..c4aeced1b6d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.h
@@ -3,8 +3,6 @@
  *  @file Name.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_NAME_H
@@ -21,7 +19,6 @@
  * @class TAO_Notify_Tests_Name
  *
  * @brief Define the names for command objects and other common strings.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Name
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index 6e034b5f5b3..655b44e80cf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -22,7 +22,6 @@
  * @class TAO_Notify_Tests_Options_Parser
  *
  * @brief Common Options parsing code.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Options_Parser
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index 82c02ef293b..d4ee7d05813 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -3,8 +3,6 @@
  *  @file Peer.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PEER_H
@@ -26,7 +24,6 @@
  * @class TAO_Notify_Tests_Peer
  *
  * @brief
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Peer
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index 70615b3e042..e74225f343b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -20,7 +20,6 @@
  * @class TAO_Notify_Tests_Peer_T
  *
  * @brief Base implementation for all Supplier and Consumer Classes.
- *
  */
 template <class Peer_Traits>
 class TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits::SKELETON
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 687324be86a..3ce0155662e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -29,7 +29,6 @@ class TAO_Notify_Tests_Task_Callback;
  * @class TAO_Notify_Tests_Periodic_Consumer
  *
  * @brief Receives Structured events periodically.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index 380203258e1..fab2d15add8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -25,7 +25,6 @@ class TAO_Notify_Tests_Periodic_Consumer;
  * @class TAO_Notify_Tests_Periodic_Consumer_Command
  *
  * @brief Options for Periodic Consumers.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer_Command : public TAO_Notify_Tests_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 4b7d584e741..87e51a72053 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -28,7 +28,6 @@ class TAO_Notify_Tests_Task_Callback;
  * @class TAO_Notify_Tests_Periodic_Supplier
  *
  * @brief A Periodic Supplier.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier : public TAO_Notify_Tests_StructuredPushSupplier, public ACE_Task <ACE_SYNCH>
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 9b1974b0f31..8d2be6a6a5b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -25,7 +25,6 @@ class TAO_Notify_Tests_Periodic_Supplier;
  * @class TAO_Notify_Tests_Periodic_Supplier_Command
  *
  * @brief Command for Periodic Suppliers.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier_Command : public TAO_Notify_Tests_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
index 8a5be1c74c5..2af5dd5c60b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
@@ -3,8 +3,6 @@
  *  @file Priority_Mapping.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PRIORITY_MAPPING_H
@@ -23,7 +21,6 @@
  * @class TAO_Notify_Tests_Priority_Mapping
  *
  * @brief A default Priority mapping. simply returns the same number.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Priority_Mapping
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 8f041113206..e9e3406e68e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -3,8 +3,6 @@
  *  @file PushConsumer.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PUSHCONSUMER_H
@@ -54,7 +52,6 @@ typedef TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_PushConsumer_Traits> TAO_No
  * @class TAO_Notify_Tests_PushConsumer
  *
  * @brief PushConsumer implementation.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer : public TAO_Notify_Tests_PushConsumer_Base
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index ba5e54a2905..a0889463f96 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -3,8 +3,6 @@
  *  @file PushSupplier.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PUSHSUPPLIER_H
@@ -54,7 +52,6 @@ typedef TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_PushSupplier_Traits> TAO_No
  * @class TAO_Notify_Tests_PushSupplier
  *
  * @brief PushSupplier Implementation.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier : public TAO_Notify_Tests_PushSupplier_Base
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index 80ba71745f9..e41b059d7cc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -3,8 +3,6 @@
  *  @file Relay_Consumer.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_RELAY_CONSUMER_H
@@ -23,7 +21,6 @@
  * @class TAO_Notify_Tests_Relay_Consumer
  *
  * @brief Relay events to a destination consumer.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Relay_Consumer : public TAO_Notify_Tests_Direct_Consumer
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index bd789c30581..05dec1bb49d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -3,8 +3,6 @@
  *  @file SequencePushConsumer.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_SEQUENCEPUSHCONSUMER_H
@@ -54,7 +52,6 @@ typedef TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_SequencePushConsumer_Traits
  * @class TAO_Notify_Tests_SequencePushConsumer
  *
  * @brief SequencePushConsumer Implementation.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer : public TAO_Notify_Tests_SequencePushConsumer_Base
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index 3f649e9cd4c..d047bcf2f02 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -3,8 +3,6 @@
  *  @file SequencePushSupplier.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_SEQUENCEPUSHSUPPLIER_H
@@ -54,7 +52,6 @@ typedef TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_SequencePushSupplier_Traits
  * @class TAO_Notify_Tests_SequencePushSupplier
  *
  * @brief SequencePushSupplier Implementation.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier : public TAO_Notify_Tests_SequencePushSupplier_Base
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
index b19125f5049..e7216cff97e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
@@ -3,8 +3,6 @@
  *  @file StructuredEvent.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_STRUCTUREDEVENT_H
@@ -23,7 +21,6 @@
  * @class TAO_Notify_Tests_StructuredEvent
  *
  * @brief Helper class to populate a CosNotification::StructuredEvent.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredEvent
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index bdf6eedec2a..6c6e71a1749 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -3,8 +3,6 @@
  *  @file StructuredPushConsumer.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_STRUCTUREDPUSHCONSUMER_H
@@ -54,7 +52,6 @@ typedef TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_StructuredPushConsumer_Trai
  * @class TAO_Notify_Tests_StructuredPushConsumer
  *
  * @brief StructuredPushConsumer Implementation.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer_Base
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index 2d46da1becc..72a1bf22d23 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -3,8 +3,6 @@
  *  @file StructuredPushSupplier.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_STRUCTUREDPUSHSUPPLIER_H
@@ -54,7 +52,6 @@ typedef TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_StructuredPushSupplier_Trai
  * @class TAO_Notify_Tests_StructuredPushSupplier
  *
  * @brief StructuredPushSupplier Implementation.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier_Base
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index 643d28c0698..aa4119f149d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -3,8 +3,6 @@
  *  @file SupplierAdmin_Command.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_SUPPLIERADMIN_COMMAND_H
@@ -25,7 +23,6 @@
  * @class TAO_Notify_Tests_SupplierAdmin_Command
  *
  * @brief Command for Supplier Admins.
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SupplierAdmin_Command : public TAO_Notify_Tests_Command
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index b474933b4e2..ce16c5c31a4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -3,8 +3,6 @@
  *  @file Supplier_T.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_SUPPLIER_T_H
@@ -37,7 +35,6 @@ class TAO_Notify_Tests_SupplierAdmin_Ext_Traits
  * @class TAO_Notify_Tests_Supplier_T
  *
  * @brief Base template to implement Suppliers.
- *
  */
 template <class Supplier_Traits>
 class TAO_Notify_Tests_Supplier_T : public TAO_Notify_Tests_Peer_T <Supplier_Traits>
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
index 00e78fb4ea5..fa25715f91d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
@@ -3,8 +3,6 @@
  *  @file Task_Callback.h
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_TASK_CALLBACK_H
@@ -24,7 +22,6 @@ class TAO_Notify_Tests_Periodic_Consumer;
  * @class TAO_Notify_Tests_Task_Callback
  *
  * @brief
- *
  */
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Task_Callback
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
index a50a6975c37..90c1e76fec5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
@@ -22,7 +22,6 @@
  * @class Base_Time
  *
  * @brief maintains readings recorded by tasks.
- *
  */
 class TAO_NOTIFY_TEST_Export Base_Time
 {
@@ -37,7 +36,6 @@ typedef ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX> BASE_TIME;
  * @class Task_Stats
  *
  * @brief maintains readings recorded by tasks.
- *
  */
 class TAO_NOTIFY_TEST_Export Task_Stats
 {
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 43d7e94874e..452834a115f 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -24,7 +24,6 @@
  * @class IOR_corbaname_Client_i
  *
  * @brief NContextExt Client Implementation
- *
  */
 class IOR_corbaname_Client_i
 {