summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PortableServer')
-rw-r--r--TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp2
-rw-r--r--TAO/tao/PortableServer/Active_Object_Map.cpp2
-rw-r--r--TAO/tao/PortableServer/Active_Object_Map_Entry.cpp2
-rw-r--r--TAO/tao/PortableServer/Active_Policy_Strategies.cpp2
-rw-r--r--TAO/tao/PortableServer/BD_String_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Basic_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp2
-rw-r--r--TAO/tao/PortableServer/Creation_Time.cpp2
-rw-r--r--TAO/tao/PortableServer/Default_Acceptor_Filter.cpp2
-rw-r--r--TAO/tao/PortableServer/Default_Policy_Validator.cpp2
-rw-r--r--TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp2
-rw-r--r--TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp2
-rw-r--r--TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentStrategy.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ImR_Client_Adapter.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationStrategy.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp2
-rw-r--r--TAO/tao/PortableServer/Key_Adapters.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyPersistent.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyTransient.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/Network_Priority_Hook.cpp2
-rw-r--r--TAO/tao/PortableServer/Non_Servant_Upcall.cpp2
-rw-r--r--TAO/tao/PortableServer/ORT_Adapter_Factory.cpp2
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.cpp2
-rw-r--r--TAO/tao/PortableServer/Object_Adapter_Factory.cpp2
-rw-r--r--TAO/tao/PortableServer/Object_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp2
-rw-r--r--TAO/tao/PortableServer/POAManager.cpp2
-rw-r--r--TAO/tao/PortableServer/POAManagerFactory.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Cached_Policies.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Current.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Current_Factory.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Current_Impl.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Guard.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Policy_Set.cpp2
-rw-r--r--TAO/tao/PortableServer/PortableServer.cpp1
-rw-r--r--TAO/tao/PortableServer/PortableServer_Functions.cpp2
-rw-r--r--TAO/tao/PortableServer/PortableServer_WFunctions.cpp2
-rw-r--r--TAO/tao/PortableServer/Regular_POA.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp1
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp2
-rw-r--r--TAO/tao/PortableServer/Root_POA.cpp2
-rw-r--r--TAO/tao/PortableServer/SUpcall_commands.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/Servant_Base.cpp2
-rw-r--r--TAO/tao/PortableServer/Servant_Dispatcher.cpp2
-rw-r--r--TAO/tao/PortableServer/Servant_Upcall.cpp2
-rw-r--r--TAO/tao/PortableServer/Servant_var.cpp2
-rw-r--r--TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/StrategyFactory.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategy.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategyORBControl.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategySingle.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/UB_String_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Upcall_Command.cpp2
-rw-r--r--TAO/tao/PortableServer/Upcall_Wrapper.cpp2
-rw-r--r--TAO/tao/PortableServer/Var_Array_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Var_Size_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Vector_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/poa_macros.h2
-rw-r--r--TAO/tao/PortableServer/portableserver_export.h1
97 files changed, 0 insertions, 191 deletions
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
index b89a7dce30e..926749e8204 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Acceptor_Filter_Factory.h"
#include "tao/PortableServer/Default_Acceptor_Filter.h"
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 6197d346b35..706cd08e023 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Active_Object_Map.h"
#include "tao/PortableServer/Active_Object_Map_Entry.h"
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
index 61041390c8b..84d938be575 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Active_Object_Map_Entry.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
index ce322b8f0e8..c67e751dd84 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Active_Policy_Strategies.h"
#include "tao/PortableServer/POA_Cached_Policies.h"
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
index a69b65eb075..292af28f3fe 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BD_STRING_SARGUMENT_T_CPP
#define TAO_BD_STRING_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
index 7854e33eee0..b94ab234a86 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BASIC_SARGUMENT_T_CPP
#define TAO_BASIC_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
index 2c36b1863ad..c0624954643 100644
--- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
+++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Collocated_Arguments_Converter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Creation_Time.cpp b/TAO/tao/PortableServer/Creation_Time.cpp
index e9ee2dade56..65a764fcb0a 100644
--- a/TAO/tao/PortableServer/Creation_Time.cpp
+++ b/TAO/tao/PortableServer/Creation_Time.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Creation_Time.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index a8786cbabaf..7c4a1d1412e 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Default_Acceptor_Filter.h"
#include "tao/Transport_Acceptor.h"
#include "tao/MProfile.h"
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index 8e19fb20bcb..1c852f9d8a4 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Default_Policy_Validator.h"
#include "tao/ORB_Core.h"
#include "tao/Policy_Set.h"
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 20b16a3dbc5..ec83ebed582 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Default_Servant_Dispatcher.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/Network_Priority_Hook.h"
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index 56e68d482d9..09f21adaec4 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
#if (TAO_HAS_MINIMUM_CORBA == 0)
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
index 3767425538c..7ffd4bb26f4 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_FIXED_ARRAY_SARGUMENT_T_CPP
#define TAO_FIXED_ARRAY_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
index 285d90da9c5..ae9db025549 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_FIXED_SIZE_SARGUMENT_T_CPP
#define TAO_FIXED_SIZE_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
index c564ce60c39..449065c15c2 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/IdAssignmentPolicy.h"
#include "tao/PortableServer/PortableServer.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
index 504f311821d..aa56af91575 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdAssignmentStrategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
index 0e35e72667f..35a5119f07d 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h"
#include "tao/PortableServer/IdAssignmentStrategy.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
index 79dbb0f6e21..dd95809054b 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/IdAssignmentStrategySystem.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
index e30a3b897fe..8a70ac0e4b1 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdAssignmentStrategyUser.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
index d4e8360b914..aedf4a9b876 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/IdUniquenessPolicy.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
index 20d16cf497b..1d6a722f548 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h"
#include "tao/PortableServer/IdUniquenessStrategy.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index 338f133ab6a..fde3e6c68e2 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/IdUniquenessStrategyMultiple.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
index ef86863e04d..de5e3c291f4 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
index 884b5b7157e..037d8733c2f 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h"
#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
index 310cf51b8db..a21645d1b04 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ImR_Client_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
index 139dd439472..a2429e9d9a0 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationPolicy.h"
#include "tao/PortableServer/PortableServer.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
index 4f825caab71..41e8002c1c9 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationStrategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
index 29455fc7a9f..30859b6a30e 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index 0ad1d25ed95..a488aeaa7c9 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h"
#include "ace/Dynamic_Service.h"
#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
index e50ad89be99..c7694743bad 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index c8c9d520c30..c7ccba1f38c 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Key_Adapters.h"
#include "ace/ACE.h"
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
index 87a41ea8abb..e9d7a4bcd43 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanPolicy.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index cba6cc54506..d7e4388c991 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyFactoryImpl.h"
#include "tao/PortableServer/LifespanStrategy.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index bbf189d97f2..c20461a0a74 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyPersistent.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/POAManager.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index 21c978c7dec..e5c8f46a06f 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h"
#include "ace/Dynamic_Service.h"
#include "tao/PortableServer/LifespanStrategyPersistent.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
index afe60a9b338..a701ad0398c 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyTransient.h"
#include "ace/OS_NS_sys_time.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index f95bd64abbe..522eeee81b9 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h"
#include "ace/Dynamic_Service.h"
#include "tao/PortableServer/LifespanStrategyTransient.h"
diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
index b1965c31be2..5a31a807668 100644
--- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp
+++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Network_Priority_Hook.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/POA_Cached_Policies.h"
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
index 0c99cbe2881..e00befdbd1d 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Non_Servant_Upcall.h"
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
index 99d72a4ee81..e499d3aa1b0 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ORT_Adapter_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 315d6d19c9f..74af2512196 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// -- PortableServer Include --
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Non_Servant_Upcall.h"
diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
index 9461e6264d9..5bf4c071810 100644
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Object_Adapter_Factory.h"
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp
index 163a0813883..b3289bcd7e5 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_OBJECT_SARGUMENT_T_CPP
#define TAO_OBJECT_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
index 13e7de29186..51d1022d3cb 100644
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Operation_Table.h"
#include "tao/ORB.h"
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
index e03cc272ccd..bff7610bab2 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Operation_Table_Binary_Search.h"
#include "tao/Timeprobe.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
index 6674ec34112..5f8f5eda365 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Operation_Table_Dynamic_Hash.h"
#include "tao/Timeprobe.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
index 7f74c9b14b0..58505e0f0ca 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Operation_Table_Linear_Search.h"
#include "tao/Timeprobe.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index 8bda68e2ab6..c6f94fc891e 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
#include "tao/Timeprobe.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index b1525a38043..bd72b717853 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POAManager.h"
#include "tao/PortableServer/POAManagerFactory.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp
index d4e04746ab1..bc1b2cb69c7 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.cpp
+++ b/TAO/tao/PortableServer/POAManagerFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/POAManagerFactory.h"
#include "tao/PortableServer/POAManager.h"
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 9c2c871978c..64b5098bdfe 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POA_Cached_Policies.h"
#include "tao/PortableServer/POA_Policy_Set.h"
#include "tao/PortableServer/IdAssignmentPolicyC.h"
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
index 34712dbbae5..506f938fb96 100644
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// -- PortableServer Include --
#include "tao/PortableServer/POA_Current.h"
#include "tao/PortableServer/POA_Current_Impl.h"
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp
index 970dcca48f5..7cad00bf77c 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POA_Current_Factory.h"
#include "tao/PortableServer/POA_Current.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
index 03ba7d7efa2..a3d4e509474 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// -- PortableServer Include --
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/POA_Current_Impl.h"
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
index abbf64ef1d9..0a2353e4fda 100644
--- a/TAO/tao/PortableServer/POA_Guard.cpp
+++ b/TAO/tao/PortableServer/POA_Guard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POA_Guard.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index 18c8aa44eff..9b0df5c9089 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POA_Policy_Set.h"
#include "tao/PortableServer/POA_Cached_Policies.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
index 00f1d8f6d04..cf2d613695c 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/PortableServer/PortableServer.h"
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Object_Adapter_Factory.h"
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp
index 1d3ca4f2678..853bd2b7ea2 100644
--- a/TAO/tao/PortableServer/PortableServer_Functions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/PortableServer_Functions.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
index a8dcae59c7e..25fcbaf3738 100644
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/PortableServer_WFunctions.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
index b9dc40d458a..fad1bcc1272 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Regular_POA.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index 033ac4356c2..8145883a4cc 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 37cdca63018..7827a2189b3 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB_Constants.h"
#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
#include "tao/PortableServer/ServantManagerC.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
index 2926b1c345e..b47cf080db1 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h"
#include "tao/PortableServer/RequestProcessingStrategy.h"
#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index 5d32202278f..201a95b1eb2 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
index 37de98b0d91..2b16cbeca96 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
index 58fc42ee29d..4e08fdbc1f8 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h"
#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index 3e3b01db9fa..52082c26dd2 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
index 243c668dbf1..0bed4c8c56d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index e1beec91ede..e83bd3afe65 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index 10fe91d4753..d0d9c811d16 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index 2a7241cb207..73981faf582 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 497ed456c83..a8d0dc1ba64 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/Regular_POA.h"
diff --git a/TAO/tao/PortableServer/SUpcall_commands.cpp b/TAO/tao/PortableServer/SUpcall_commands.cpp
index 366b1c8a6fa..6ccba4791cb 100644
--- a/TAO/tao/PortableServer/SUpcall_commands.cpp
+++ b/TAO/tao/PortableServer/SUpcall_commands.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/SUpcall_commands.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
index fcf4cd21f7e..c716959b96f 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index ebf256b0a4f..79988662a34 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h"
#include "tao/PortableServer/ServantRetentionStrategy.h"
#include "tao/debug.h"
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index bc00bd2f036..cf399e19de6 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
index b530d045063..dc226731af2 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h"
#include "tao/PortableServer/ServantRetentionStrategy.h"
#include "tao/PortableServer/ServantRetentionStrategyRetain.h"
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 269da3c3fdc..9abb539aab1 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Servant_Base.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/Operation_Table.h"
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
index d61fb7e36a7..fe0524cd9d1 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Servant_Dispatcher.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index e172081ef7c..e08ac1ae707 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Servant_Upcall.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp
index ee9a2675b01..7786d181e32 100644
--- a/TAO/tao/PortableServer/Servant_var.cpp
+++ b/TAO/tao/PortableServer/Servant_var.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_PORTABLESERVER_SERVANT_VAR_CPP
#define TAO_PORTABLESERVER_SERVANT_VAR_CPP
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
index 6fc56c84267..8846e19f05b 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
#define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp
index e6277bf7292..dc03abc1ed4 100644
--- a/TAO/tao/PortableServer/StrategyFactory.cpp
+++ b/TAO/tao/PortableServer/StrategyFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/StrategyFactory.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index a2174748b65..c7f2869db2b 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp
index 085784f481a..7b36ab1a869 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ThreadStrategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
index c9281b877e7..8a6b8f49b1a 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ThreadStrategyFactoryImpl.h"
#include "tao/PortableServer/ThreadStrategy.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
index 4b638689160..e611c4e193b 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ThreadStrategyORBControl.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
index 040a2ad69d9..00840d2f40f 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index 28ee4688c2d..a89644c05b0 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
index d66915ae066..dc9cd4b4b93 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_UB_STRING_SARGUMENT_T_CPP
#define TAO_UB_STRING_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp
index 050d1853f5e..52dc05020e2 100644
--- a/TAO/tao/PortableServer/Upcall_Command.cpp
+++ b/TAO/tao/PortableServer/Upcall_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Upcall_Command.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index 746830cf864..7b1036012b4 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Upcall_Wrapper.h"
#include "tao/PortableServer/Upcall_Command.h"
#include "tao/PortableServer/Collocated_Arguments_Converter.h"
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
index 70600dbfbbd..199c000a022 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VAR_ARRAY_SARGUMENT_T_CPP
#define TAO_VAR_ARRAY_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
index eb1e13e4cb3..bd8aadcc542 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VAR_SIZE_SARGUMENT_T_CPP
#define TAO_VAR_SIZE_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.cpp b/TAO/tao/PortableServer/Vector_SArgument_T.cpp
index a55fed0717e..c813f99ed9e 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VECTOR_SARGUMENT_T_CPP
#define TAO_VECTOR_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index a3504f16672..5be8ff1fc58 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_POA_MACROS_H
#define TAO_POA_MACROS_H
diff --git a/TAO/tao/PortableServer/portableserver_export.h b/TAO/tao/PortableServer/portableserver_export.h
index 81c9200c157..ba60584a27b 100644
--- a/TAO/tao/PortableServer/portableserver_export.h
+++ b/TAO/tao/PortableServer/portableserver_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------