removed id and shorter headers

34 files changed, 11 insertions, 73 deletions

diff --git a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.tpp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.tpp
index d81b7bed143..b431c99f68a 100644
--- a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.tpp
+++ b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.tpp
@@ -1,6 +1,5 @@
 // file      : XMLSchema/TypeInfo.tpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
 
 namespace XMLSchema
 {
diff --git a/ACE/ace/XML_Utils/XML_Helper.tpp b/ACE/ace/XML_Utils/XML_Helper.tpp
index e65785968f1..bd74e5a923c 100644
--- a/ACE/ace/XML_Utils/XML_Helper.tpp
+++ b/ACE/ace/XML_Utils/XML_Helper.tpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "XML_Helper.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
diff --git a/ACE/ace/XML_Utils/XML_Schema_Resolver.tpp b/ACE/ace/XML_Utils/XML_Schema_Resolver.tpp
index dba9261e1af..3b5a68b5d08 100644
--- a/ACE/ace/XML_Utils/XML_Schema_Resolver.tpp
+++ b/ACE/ace/XML_Utils/XML_Schema_Resolver.tpp
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef XML_SCHEMA_RESOLVER_TPP
 #define XML_SCHEMA_RESOLVER_TPP
 
diff --git a/ACE/ace/XML_Utils/XSCRT/Traversal.tpp b/ACE/ace/XML_Utils/XSCRT/Traversal.tpp
index 0af71ae2c37..4d6d8b05b90 100644
--- a/ACE/ace/XML_Utils/XSCRT/Traversal.tpp
+++ b/ACE/ace/XML_Utils/XSCRT/Traversal.tpp
@@ -1,6 +1,5 @@
 // file      : XSCRT/Traversal.tpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
 
 namespace XSCRT
 {
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index e7558b8cd5a..513db739dcc 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -72,6 +72,11 @@ BEGIN{undef $/;} s/ \*\n \*\n/ \*\n/smg;
 BEGIN{undef $/;} s/\/\/\n\/\/\n/\/\/\n/smg;
 BEGIN{undef $/;} s/ \n/\n/smg;
 
+BEGIN{undef $/;} s/\/\/ cvs-id    :\n//smg;
+
 # Empty header
 BEGIN{undef $/;} s/\/\*\n \*\/\n//smg;
+BEGIN{undef $/;} s/\/\*\*\n \*\/\n//smg;
+BEGIN{undef $/;} s/\/\*\*\n \*\n \*\/\n//smg;
+BEGIN{undef $/;} s/\/\*\*\n\*\n\*\/\n//smg;
 
diff --git a/ACE/contrib/minizip/mztools.h b/ACE/contrib/minizip/mztools.h
index 94a124fde76..36816cee218 100644
--- a/ACE/contrib/minizip/mztools.h
+++ b/ACE/contrib/minizip/mztools.h
@@ -2,7 +2,7 @@
   Additional tools for Minizip
   Code: Xavier Roche '2004
   License: Same as ZLIB (www.gzip.org)
-  
+
 */
 
 #ifndef _zip_tools_H
diff --git a/ACE/tests/Compiler_Features_20_DLL.cpp b/ACE/tests/Compiler_Features_20_DLL.cpp
index e7ced4f052f..94e48d0fb2b 100644
--- a/ACE/tests/Compiler_Features_20_DLL.cpp
+++ b/ACE/tests/Compiler_Features_20_DLL.cpp
@@ -1,7 +1,5 @@
 
 //=============================================================================
-/**
- */
 //=============================================================================
 
 
diff --git a/ACE/tests/Compiler_Features_22_DLL.cpp b/ACE/tests/Compiler_Features_22_DLL.cpp
index 5226f2dfeea..71d52977b14 100644
--- a/ACE/tests/Compiler_Features_22_DLL.cpp
+++ b/ACE/tests/Compiler_Features_22_DLL.cpp
@@ -1,7 +1,5 @@
 
 //=============================================================================
-/**
- */
 //=============================================================================
 
 
diff --git a/DAnCE/dance/DAnCE_Utility.tpp b/DAnCE/dance/DAnCE_Utility.tpp
index 5dc50f58a16..0a5fdb57f5b 100644
--- a/DAnCE/dance/DAnCE_Utility.tpp
+++ b/DAnCE/dance/DAnCE_Utility.tpp
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef DAnCE_Utility_TPP
 #define DAnCE_Utility_TPP
 
diff --git a/DAnCE/tools/Config_Handlers/DnC_Dump.h b/DAnCE/tools/Config_Handlers/DnC_Dump.h
index a7b4c1a6bd4..b8057a2d462 100644
--- a/DAnCE/tools/Config_Handlers/DnC_Dump.h
+++ b/DAnCE/tools/Config_Handlers/DnC_Dump.h
@@ -2,7 +2,7 @@
 /**
 *  @file  DnC_Dump.h
 *
-* 
+*
 *
 *  @author Gan Deng <gan.deng@vanderbilt.edu>
 */
diff --git a/DAnCE/tools/Config_Handlers/DnC_Dump_T.h b/DAnCE/tools/Config_Handlers/DnC_Dump_T.h
index 977f33c6744..c07dba01f66 100644
--- a/DAnCE/tools/Config_Handlers/DnC_Dump_T.h
+++ b/DAnCE/tools/Config_Handlers/DnC_Dump_T.h
@@ -2,7 +2,7 @@
 /**
 *  @file  DnC_Dump_T.h
 *
-* 
+*
 *
 *  @author Gan Deng <gan.deng@vanderbilt.edu>
 */
diff --git a/DAnCE/tools/Config_Handlers/Dump_Obj.h b/DAnCE/tools/Config_Handlers/Dump_Obj.h
index 272d1deef95..6bbe7a4d961 100644
--- a/DAnCE/tools/Config_Handlers/Dump_Obj.h
+++ b/DAnCE/tools/Config_Handlers/Dump_Obj.h
@@ -2,7 +2,7 @@
 /**
 *  @file  Dump_Obj.h
 *
-* 
+*
 *
 *  @author Gan Deng <gan.deng@vanderbilt.edu>
 */
diff --git a/DAnCE/tools/Config_Handlers/IDREF_Base.h b/DAnCE/tools/Config_Handlers/IDREF_Base.h
index 4c29f92a036..cea710c1402 100644
--- a/DAnCE/tools/Config_Handlers/IDREF_Base.h
+++ b/DAnCE/tools/Config_Handlers/IDREF_Base.h
@@ -1,5 +1,5 @@
 /**
-* 
+*
 * @file IDREF_Base.h
 * @author Will Otte <wotte@dre.vanderbilt.edu>
 *
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
index 0a34e87a184..00cd8c37974 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef STOCK_DATABASE_TPP
 #define STOCK_DATABASE_TPP
 // local headers
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index f4d04e58984..a05fe2197c8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -49,8 +49,6 @@ Activator_NT_Service::handle_control (DWORD control_code)
 }
 
 
-/**
- */
 int
 Activator_NT_Service::handle_exception (ACE_HANDLE)
 {
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
index bca211909d0..cd1ca302346 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
@@ -2,7 +2,7 @@
 /**
 *  @file   ImR_ResponseHandler.cpp
 *
-*  
+*
 */
 //=============================================================================
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 11a4540d19b..0ba84a23c44 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -46,8 +46,6 @@ Locator_NT_Service::handle_control (DWORD control_code)
 }
 
 
-/**
- */
 int
 Locator_NT_Service::handle_exception (ACE_HANDLE)
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
index be8d7782a8f..cca2468ef84 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
@@ -17,8 +17,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-/**
- */
 class Dynamic_Bitset
 {
   typedef unsigned block;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
index 6cb92c1a182..407a3fbf348 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER_H
 #define 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 25981453292..f129227aee5 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER2_H
 #define TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
index 91368b40a87..2377c6e4250 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 
 #ifndef TAO249_SERVER_REQUEST_INTERCEPTOR_H
@@ -19,9 +17,6 @@
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
 
-/**
-* 
-*/
 class TAO249_ServerRequest_Interceptor
 : public virtual PortableInterceptor::ServerRequestInterceptor,
   public virtual ::CORBA::LocalObject
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
index 50392dc9b9a..11dedcb34eb 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 
 #ifndef TAO249_SERVER_REQUEST_INTERCEPTOR2_H
@@ -20,9 +18,6 @@
 #include "tao/PI_Server/PI_Server.h"
 #include "tao/TimeBaseC.h"
 
-/**
-* 
-*/
 class TAO249_ServerRequest_Interceptor2
 : public virtual PortableInterceptor::ServerRequestInterceptor,
   public virtual ::CORBA::LocalObject
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
index bc80c93dc19..318497270b3 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER2_H
 #define TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index 927b070b6fa..22e5cc5d3a7 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 
 #ifndef TAO249_SERVER_REQUEST_INTERCEPTOR2_H
@@ -20,9 +18,6 @@
 #include "tao/PI_Server/PI_Server.h"
 #include "tao/TimeBaseC.h"
 
-/**
-* 
-*/
 class TAO249_ServerRequest_Interceptor2
 : public virtual PortableInterceptor::ServerRequestInterceptor,
   public virtual ::CORBA::LocalObject
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
index 25981453292..f129227aee5 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER2_H
 #define TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
index f55a1de44e5..4a114e34de9 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 
 #ifndef TAO249_SERVER_REQUEST_INTERCEPTOR2_H
@@ -19,9 +17,6 @@
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
 
-/**
-* 
-*/
 class ServerRequest_Interceptor2
 : public virtual PortableInterceptor::ServerRequestInterceptor,
   public virtual ::CORBA::LocalObject
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
index c059e811515..a880888c4b6 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER2_H
 #define TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
index 927b070b6fa..22e5cc5d3a7 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 
 #ifndef TAO249_SERVER_REQUEST_INTERCEPTOR2_H
@@ -20,9 +18,6 @@
 #include "tao/PI_Server/PI_Server.h"
 #include "tao/TimeBaseC.h"
 
-/**
-* 
-*/
 class TAO249_ServerRequest_Interceptor2
 : public virtual PortableInterceptor::ServerRequestInterceptor,
   public virtual ::CORBA::LocalObject
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
index 8e0ee7c8d61..4903df3c1c3 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 #ifndef TAO249_SERVER_ORBINITIALIZER_H
 #define TAO249_SERVER_ORBINITIALIZER_H
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
index 4a20cb9416c..aa0aee92ea5 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 
 //=============================================================================
-/**
- */
 //=============================================================================
 
 #ifndef TAO249_SERVER_REQUEST_INTERCEPTOR_H
@@ -19,9 +17,6 @@
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
 
-/**
-* 
-*/
 class TAO249_ServerRequest_Interceptor
 : public virtual PortableInterceptor::ServerRequestInterceptor,
   public virtual ::CORBA::LocalObject
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
index d6e981cadca..92d46065980 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
@@ -1,6 +1,4 @@
 /* -*- C++ -*- */
-/**
- */
 
 #ifndef TEST_SAVER_H
 #define TEST_SAVER_H
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
index a12b440e707..15fa9de6a2e 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
@@ -1,5 +1,3 @@
-/**
- */
 
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 //#include <orbsvcs/CosNotifyCommS.h>
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index facf3fed8dd..f57023d75e0 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -1,5 +1,3 @@
-/**
- */
 
 #include "orbsvcs/CosNotificationC.h"
 #include "orbsvcs/NotifyExtC.h"
diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp
index 85cbe05efec..8171f77019c 100644
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ b/TAO/tests/Bug_2669_Regression/client.cpp
@@ -1,7 +1,5 @@
 
 //=============================================================================
-/**
- */
 //=============================================================================