Perl files

author: Johnny Willemsen <jwillemsen@remedy.nl> 2015-01-07 16:56:24 +0100
committer: Johnny Willemsen <jwillemsen@remedy.nl> 2015-01-07 16:56:24 +0100
commit: 169db677980c71427658d590f1d7d2f5365a94b9 (patch)
tree: 12d6ab68bcaf8e03cef59651fc39a5a8e05c3e40 /TAO/orbsvcs/tests
parent: d3a107625182634ae0be8f003d9130f8bb5c3567 (diff)
download: ATCD-169db677980c71427658d590f1d7d2f5365a94b9.tar.gz
444 files changed, 71 insertions, 516 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
index 2969753c16c..efe8ce8c041 100755
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
index fc3027f3164..869c8c2788d 100755
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf b/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf
index 3384dd0187e..5111aeb9788 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 #
 
 # This configuration file is used to use only the default TAO
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
index 6ba74fc7770..253923f098b 100755
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
index 4c48c39bccf..0ec7c761eb8 100755
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl
index b2158898318..7c61f832ee5 100755
--- a/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf
index 580f3233481..362c7711b42 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
index 78128ef34fc..e90d89b40e3 100755
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf
index fd70a6b6c7b..99f9241e162 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 #
 #static Advanced_Resource_Factory "-ORBresources global -ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
 #static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
index 0ad321e25b7..793decde130 100755
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
index ff8ed76bf9c..872e135487f 100755
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
index 7e3996c2608..f5fdd2b9d55 100755
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
index 4f128a1530f..71cad2ef683 100755
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
index fe3aa213aac..cef32bfd247 100755
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf
index befaf7cda62..19b02db42cc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic AV_Default_Resource_Factory Service_Object * TAO_AV:_make_TAO_AV_Default_Resource_Factory() ""
 dynamic TimeStamp_Protocol_Factory Service_Object * TAO_TS:_make_TimeStamp_Protocol_Factory() ""
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
index 0dd3f388e65..5925c882345 100755
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
index 6b822f19ce1..1e9efe3cb4b 100755
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
index 6b822f19ce1..1e9efe3cb4b 100755
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
index 959027251ff..f830392f7e5 100755
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs some Naming Service tests.
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl
index a32c695222c..568ac14f54d 100755
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl
@@ -1,5 +1,4 @@
 
-# $Id$
 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
index fffd0bf4161..1ad9289c14c 100755
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
@@ -3,7 +3,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      if 0;
 
 # -*- perl -*-
-# $Id$
 
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl
index 0e7cb9f2f87..af122499256 100755
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
index 5e399f43fdb..66dd0f0b1c1 100755
--- a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl
index d0d1f3be8bc..45884aada56 100755
--- a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl
index 492320b2a85..63d205ad449 100755
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl
index f34afe84489..c7631ad0802 100755
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2112_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2112_Regression/run_test.pl
index b625ebe7487..edc9bcf43bc 100755
--- a/TAO/orbsvcs/tests/Bug_2112_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2112_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2137_Regression/run_test.pl
index be0b87f8c8e..2ab57b490f9 100755
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl
index ad407167945..16a49ae7da4 100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
index 3f639ba1591..5b03a2c6a1d 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl
index 6194ef0b2e0..54a95ebb2c4 100755
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
index b13c3915082..42309b06223 100755
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl
index 018f2f5eac3..74814da603e 100755
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl
index 6194ef0b2e0..54a95ebb2c4 100755
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/svc.conf b/TAO/orbsvcs/tests/Bug_2316_Regression/svc.conf
index 5099f572598..dc61e466299 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/svc.conf
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
index d7375ec2b88..a16d55ba475 100755
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl
index 0e50c0d55e2..c5b53db250b 100755
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/svc.conf b/TAO/orbsvcs/tests/Bug_2377_Regression/svc.conf
index 9fa10a35d9f..fd30f6c71c7 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/svc.conf
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl
index 10e7d173aa4..9bf1162b0b5 100755
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl
index 953172a670c..e7b8fbbf3fa 100755
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl
index e6bfe97b362..cdb00ddac27 100755
--- a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl
index 2278230ca21..5356fbb2ee3 100755
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
index dcfb93f9dc7..630ddffee67 100755
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # This is a Perl script that runs a Naming Service test.  It starts
 # all the servers and clients as necessary.
 # -*- perl -*-
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl
index 5a906d21c11..533274571aa 100755
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl b/TAO/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl
index 7f548cc0884..23461f1724e 100755
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/svc.conf b/TAO/orbsvcs/tests/Bug_2925_Regression/svc.conf
index 9fa10a35d9f..fd30f6c71c7 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/svc.conf
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl
index 9d5b15d0ea3..935ad390058 100755
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3216_Regression/run_test.pl
index 018f2f5eac3..74814da603e 100755
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf b/TAO/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf
index e7e13170555..a4cfadd3f9e 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static TAO_CosNotify_Service "-DispatchingThreads 1"
 #dynamic TAO_MonitorAndControl Service_Object * TAO_CosNotification_MC:_make_TAO_MonitorAndControl () "-ORBArg "-ORBDefaultInitRef iiop://dvlcps2a-pri:12345""
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl
index d802120f688..dc22f976026 100755
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-#$Id$
 
 use Env (ACE_ROOT);
 use lib "$ACE_ROOT/bin";
diff --git a/TAO/orbsvcs/tests/Bug_3418_Regression/b.conf b/TAO/orbsvcs/tests/Bug_3418_Regression/b.conf
index 5847fa22a03..faad11a3830 100644
--- a/TAO/orbsvcs/tests/Bug_3418_Regression/b.conf
+++ b/TAO/orbsvcs/tests/Bug_3418_Regression/b.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Bug_3418_Regression/m.conf b/TAO/orbsvcs/tests/Bug_3418_Regression/m.conf
index 02b5f165e45..8b137891791 100644
--- a/TAO/orbsvcs/tests/Bug_3418_Regression/m.conf
+++ b/TAO/orbsvcs/tests/Bug_3418_Regression/m.conf
@@ -1,2 +1 @@
-# $Id$
 
diff --git a/TAO/orbsvcs/tests/Bug_3418_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3418_Regression/run_test.pl
index e3ccc533c32..be63ab5323f 100755
--- a/TAO/orbsvcs/tests/Bug_3418_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3418_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf b/TAO/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf
index a9376895eac..72ab32e5970 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic DIOP_Factory Service_Object * TAO_Strategies:_make_TAO_DIOP_Protocol_Factory() ""
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory() "-ORBProtocolFactory DIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf b/TAO/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf
index 5099f572598..dc61e466299 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl
index 51ce276ec70..76b0ff6cf72 100755
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{'ACE_ROOT'}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/run_test_ipv6.pl b/TAO/orbsvcs/tests/Bug_3444_Regression/run_test_ipv6.pl
index 620d90c60d2..a28b56d28fa 100755
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/run_test_ipv6.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{'ACE_ROOT'}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/sciop_svc.conf b/TAO/orbsvcs/tests/Bug_3444_Regression/sciop_svc.conf
index 0651dd0bb3a..023cf4dc2bd 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/sciop_svc.conf
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/sciop_svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 dynamic SCIOP_Factory Service_Object * TAO_Strategies:_make_TAO_SCIOP_Protocol_Factory() ""
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory() "-ORBProtocolFactory SCIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3486_Regression/run_test.pl
index 1f3ca6f81f8..cece99cc3b4 100755
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3598b_Regression/run_test.pl
index 5691617f53d..e26566dbc48 100755
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3673_Regression/run_test.pl
index 2278230ca21..5356fbb2ee3 100755
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_3891_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3891_Regression/run_test.pl
index f054190c492..8fc7f262df5 100755
--- a/TAO/orbsvcs/tests/Bug_3891_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3891_Regression/run_test.pl
@@ -1,4 +1,3 @@
-# $Id$
 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_4080_Regression/run_test.pl
index fa35d56679c..517cea52da8 100755
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/svc.conf b/TAO/orbsvcs/tests/Bug_4080_Regression/svc.conf
index 242adec98f6..5aff2cca6d7 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/svc.conf
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl
index 5217da1c9bb..95a852b7261 100755
--- a/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/run_test.pl b/TAO/orbsvcs/tests/COIOP_Naming_Test/run_test.pl
index e931ae0a181..a0d5dea54b5 100755
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl
index 305e0e4bd2f..e060c4e5661 100755
--- a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs the client and all the other servers that
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf b/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf
index ddc08485f9a..040c9ed3c12 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static CEC_Factory "-CECReactivePullingPeriod 10000"
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/cosevent.conf b/TAO/orbsvcs/tests/CosEvent/Timeout/cosevent.conf
index fb4042955e1..3c6d5825559 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/cosevent.conf
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/cosevent.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static CEC_Factory "-CECSupplierControl reactive -CECConsumerControl reactive -CECDispatching mt -CECConsumerOperationTimeout 3000000 -CECSupplierOperationTimeout 3000000"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl
index 0733beabda8..2963a434268 100755
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index 3134151727d..aea88ee2344 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
index d0a2cf0ad34..008e4a4376e 100755
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/svc.conf b/TAO/orbsvcs/tests/EC_MT_Mcast/svc.conf
index 62619ef796e..71b35d97b68 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/svc.conf
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFiltering per-supplier"
 static Client_Strategy_Factory "-ORBClientConnectionHandler MT"
diff --git a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
index 9f9c9f97bcc..e08a69de638 100755
--- a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/EC_Mcast/svc.conf b/TAO/orbsvcs/tests/EC_Mcast/svc.conf
index 06cdae7a509..3130461f130 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/svc.conf
+++ b/TAO/orbsvcs/tests/EC_Mcast/svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier -ECObserver basic"
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
index 9c0dbe4cabd..3add0becd10 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec.conf b/TAO/orbsvcs/tests/EC_Throughput/ec.conf
index 056cb5a366e..a30fafc4968 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ec.conf
+++ b/TAO/orbsvcs/tests/EC_Throughput/ec.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static EC_Factory "-ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECsupplierfiltering per-supplier"
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index b0b895329d4..fbcff3492c0 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
index f14d715d09e..45c5ec09f4e 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Event/Basic/control.conf b/TAO/orbsvcs/tests/Event/Basic/control.conf
index 72c79a15f2b..441fb32ecb3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/control.conf
+++ b/TAO/orbsvcs/tests/Event/Basic/control.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"
diff --git a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl
index 633e3d5fdc1..0e8c34d4670 100755
--- a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl
+++ b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs the client and all the other servers that
diff --git a/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf b/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf
index 7b3c1adee6f..6beb36c655c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf
+++ b/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECObserver null -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Basic/observer.conf b/TAO/orbsvcs/tests/Event/Basic/observer.conf
index bfd14ad37e3..8ac6c97ab1d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/observer.conf
+++ b/TAO/orbsvcs/tests/Event/Basic/observer.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECDispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Basic/run_test.pl b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
index 7a2f65a7226..fd8c77bf008 100755
--- a/TAO/orbsvcs/tests/Event/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs the client and all the other servers that
diff --git a/TAO/orbsvcs/tests/Event/Basic/sched.conf b/TAO/orbsvcs/tests/Event/Basic/sched.conf
index bfc09bc8bdf..e2bff6cafe5 100644
--- a/TAO/orbsvcs/tests/Event/Basic/sched.conf
+++ b/TAO/orbsvcs/tests/Event/Basic/sched.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 dynamic EC_Factory Service_Object * TAO_RTSchedEvent:_make_TAO_EC_Sched_Factory() "-ECDispatching priority -ECScheduling priority -ECFiltering priority -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list  -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf b/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf
index 6c00cf04975..fd8bf0d8b0d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf
+++ b/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECfiltering prefix -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Basic/svc.conf b/TAO/orbsvcs/tests/Event/Basic/svc.conf
index 09d8c58d194..8caef34ad40 100644
--- a/TAO/orbsvcs/tests/Event/Basic/svc.conf
+++ b/TAO/orbsvcs/tests/Event/Basic/svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf
index 1d65bf87fe8..201ea4835ba 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static EC_Factory "-ECObserver basic -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService receiver -ECGHandler complex -ECGAddressServer type -ECGAddressServerArg '17@230.100.0.7:12700 18@230.100.0.8:12700 19@230.100.0.9:12700'"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
index 7fa7648f7e7..0b310b361cc 100755
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf
index 17d535d40f5..a7360585751 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService sender -ECGAddressServer type -ECGAddressServerArg '17@230.100.0.7:12700 18@230.100.0.8:12700 19@230.100.0.9:12700'"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl
index ca08884713e..6c5bc173f78 100755
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
index eb17a579188..113a4379f66 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECobserver basic -ECConsumerControl Reactive"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer-ec.conf b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer-ec.conf
index 838d1461384..8404d74375a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer-ec.conf
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer-ec.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService receiver -ECGAddressServerArg 230.100.1.7:26700"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
index 286196cc55f..314f73cbe9b 100755
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs Simple EC Mcast example.  It starts
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier-ec.conf b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier-ec.conf
index 7fe85696513..a4b6b419291 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier-ec.conf
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier-ec.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService sender -ECGAddressServerArg 230.100.1.7:26700"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/udp-consumer-ec.conf b/TAO/orbsvcs/tests/Event/Mcast/Simple/udp-consumer-ec.conf
index 334731adc75..c19d189c79a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/udp-consumer-ec.conf
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/udp-consumer-ec.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService receiver -ECGHandler udp -ECGAddressServerArg 127.0.0.1:27500"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/udp-supplier-ec.conf b/TAO/orbsvcs/tests/Event/Mcast/Simple/udp-supplier-ec.conf
index 084dd36bf67..337655026ff 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/udp-supplier-ec.conf
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/udp-supplier-ec.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService sender -ECGAddressServerArg 127.0.0.1:27500"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf
index 01725399041..2b48cc5e892 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService two_way -ECGAddressServerArg 230.100.1.7:26700"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
index 96cad33de96..2e8610c5bd8 100755
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs Simple EC Mcast example.  It starts
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.list.conf b/TAO/orbsvcs/tests/Event/Performance/ec.list.conf
index 0abb338df0e..49320427347 100644
--- a/TAO/orbsvcs/tests/Event/Performance/ec.list.conf
+++ b/TAO/orbsvcs/tests/Event/Performance/ec.list.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECProxyPushConsumerCollection st:delayed:list -ECProxyPushSupplierCollection st:delayed:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf b/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf
index a5e1e08f1ac..905fec1c176 100644
--- a/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf
+++ b/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECDispatching mt -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf b/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf
index 1b8f1e89741..75162ec121a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf
+++ b/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECProxyPushConsumerCollection st:delayed:rb_tree -ECProxyPushSupplierCollection st:delayed:rb_tree -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.st.conf b/TAO/orbsvcs/tests/Event/Performance/ec.st.conf
index 725d02ac3a1..d8ada914a4f 100644
--- a/TAO/orbsvcs/tests/Event/Performance/ec.st.conf
+++ b/TAO/orbsvcs/tests/Event/Performance/ec.st.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECProxyPushConsumerCollection st:immediate:list -ECProxyPushSupplierCollection st:immediate:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"
diff --git a/TAO/orbsvcs/tests/Event/Performance/latency.conf b/TAO/orbsvcs/tests/Event/Performance/latency.conf
index df7a3a2dc55..af699d5a9fd 100644
--- a/TAO/orbsvcs/tests/Event/Performance/latency.conf
+++ b/TAO/orbsvcs/tests/Event/Performance/latency.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 # tp is now the default reactor type
 # static Resource_Factory "-ORBReactorType tp"
diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
index d2f0a3b4a35..b894e0031b2 100755
--- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs the client and all the other servers that
diff --git a/TAO/orbsvcs/tests/Event/UDP/run_test.pl b/TAO/orbsvcs/tests/Event/UDP/run_test.pl
index 9dc75dc9c84..e32f94cc764 100755
--- a/TAO/orbsvcs/tests/Event/UDP/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/UDP/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
diff --git a/TAO/orbsvcs/tests/Event/UDP/svc.conf b/TAO/orbsvcs/tests/Event/UDP/svc.conf
index 9b72e028412..e39d6939e70 100644
--- a/TAO/orbsvcs/tests/Event/UDP/svc.conf
+++ b/TAO/orbsvcs/tests/Event/UDP/svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFilter per-supplier"
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_basic.pl b/TAO/orbsvcs/tests/FT_App/run_test_basic.pl
index a0344bced45..77383086883 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_basic.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_basic.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_demo.pl b/TAO/orbsvcs/tests/FT_App/run_test_demo.pl
index 4ed9b4fa641..553f9aa40b7 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_demo.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_demo.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # Purpose:
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_detector.pl b/TAO/orbsvcs/tests/FT_App/run_test_detector.pl
index f1c992aa1f9..b009e2f7e8b 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_detector.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_detector.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # Purpose:
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_fault_consumer.pl b/TAO/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
index ae538957384..f2a5312aa27 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # Purpose:
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_notifier.pl b/TAO/orbsvcs/tests/FT_App/run_test_notifier.pl
index f7c64ef1da6..b75aaa61e3b 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_notifier.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_notifier.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # Purpose:
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_registry.pl b/TAO/orbsvcs/tests/FT_App/run_test_registry.pl
index ef7689ddce0..95586777ed1 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_registry.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_registry.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # Purpose:
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_rmnotifier.pl b/TAO/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
index de1938d0a3c..7a029fe3231 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # Purpose:
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_rmregistry.pl b/TAO/orbsvcs/tests/FT_App/run_test_rmregistry.pl
index 95b802a8f10..fcf62fd3b0d 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_rmregistry.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_rmregistry.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # Purpose:
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
index 70ffe60cc3c..c650bee8b59 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
index a72ddcbf57a..bb853f187bb 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
index 9df036e82bb..82ad0816ca5 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
index f69cccd341d..c8c4fe9dccf 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl
index 46143cf9615..56dc7e1c51a 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
index a005fcca1ac..ad43caf54c3 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # This is a Perl script that runs a Naming Service test.  It starts
 # all the servers and clients as necessary.
 # -*- perl -*-
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
index d3e8e10845d..8a0585241d9 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs a Naming Service test.  It starts
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/svc.conf b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/svc.conf
index b6856698e51..ab2b42f124c 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/svc.conf
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf
index e02d5089fce..a7837c0fa34 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
index c0573a0c4d8..22c0a13caa7 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs a Naming Service test.  It starts
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl
index 3b97ff11228..015d2c08307 100755
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl b/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl
index 0fdb2aaa12f..fd9082ca605 100755
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl
index 2f6ab1eea3c..7f49b412e8c 100755
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/FtRtEvent/svc.conf b/TAO/orbsvcs/tests/FtRtEvent/svc.conf
index 539a8fe48c6..53afc9e3e3f 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/svc.conf
+++ b/TAO/orbsvcs/tests/FtRtEvent/svc.conf
@@ -1,5 +1,4 @@
-## $Id$
-
+#
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
 static FT_ClientService_Activate
 static FTRT_ClientORB_Service "-ORBTransactionDepth $FTEC_TransactionDepth"
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/exclusive.conf b/TAO/orbsvcs/tests/HTIOP/AMI/exclusive.conf
index 75cf010d3f9..7df4f045924 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/exclusive.conf
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/exclusive.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/muxed.conf b/TAO/orbsvcs/tests/HTIOP/AMI/muxed.conf
index 18ed71ce0ef..8d89b69d043 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/muxed.conf
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/muxed.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/run_test.pl b/TAO/orbsvcs/tests/HTIOP/AMI/run_test.pl
index a8b1e8e6ee0..7cdc8f8fde5 100755
--- a/TAO/orbsvcs/tests/HTIOP/AMI/run_test.pl
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.conf b/TAO/orbsvcs/tests/HTIOP/AMI/server.conf
index dada9646a63..63765f2c44b 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.conf
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 #
 
 dynamic HTIOP_Factory Service_Object *
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/svc.conf b/TAO/orbsvcs/tests/HTIOP/AMI/svc.conf
index 9657f158c19..8809246ffa6 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/svc.conf
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory () ""
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/inside.conf b/TAO/orbsvcs/tests/HTIOP/BiDirectional/inside.conf
index db8240efb56..5f7809b15e4 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/inside.conf
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/inside.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory () "-inside 1"
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/outside.conf b/TAO/orbsvcs/tests/HTIOP/BiDirectional/outside.conf
index 48cf6669bb2..10fb006f05f 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/outside.conf
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/outside.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl b/TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl
index 7b86d30207f..ddef9c95c73 100755
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/HTIOP/HT_Config.conf b/TAO/orbsvcs/tests/HTIOP/HT_Config.conf
index 722033221ce..134e4f1431d 100644
--- a/TAO/orbsvcs/tests/HTIOP/HT_Config.conf
+++ b/TAO/orbsvcs/tests/HTIOP/HT_Config.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 [htbp]
 # The Proxy_port and proxy_host values control how the HTIOP "inside" peers
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/outside.conf b/TAO/orbsvcs/tests/HTIOP/Hello/outside.conf
index 219a83417be..1452959d1b4 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/outside.conf
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/outside.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/run_test.pl b/TAO/orbsvcs/tests/HTIOP/Hello/run_test.pl
index ec0de31327f..66d3b33eda1 100755
--- a/TAO/orbsvcs/tests/HTIOP/Hello/run_test.pl
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/svc.conf b/TAO/orbsvcs/tests/HTIOP/Hello/svc.conf
index 13a0987cc86..333a7a3bba4 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/svc.conf
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
diff --git a/TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl b/TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl
index d82301a1cf3..9a2c92f36f2 100755
--- a/TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl
index 7db496ad976..64e838ea3c1 100755
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl
index be993491fa8..4705cacbee7 100755
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
index c0814c6973d..e77707d49a2 100755
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
index aa6e68e3414..4c558928466 100755
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl
index b324cd59b58..3d59f6fee81 100755
--- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
index dec7a1fba99..fb17409ea59 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl
index fa6d30ff67c..70a343dc31f 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/client.conf b/TAO/orbsvcs/tests/ImplRepo/RestartServer/client.conf
index 409ad4afe86..e2bd539ab1f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/client.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/client.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static Client_Strategy_Factory "-ORBForwardOnTransientLimit 20"
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl
index cbcf8beb827..f438778143e 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl
@@ -1,4 +1,3 @@
-# $Id$
 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/clt.conf b/TAO/orbsvcs/tests/ImplRepo/double_start/clt.conf
index d13115a6a59..6a7ff0060f5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/clt.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/clt.conf
@@ -1,2 +1 @@
-#$Id$
 static Client_Strategy_Factory "-ORBForwardOnObjectNotExistLimit 1 -ORBForwardOnTransientLimit 5 -ORBForwardOnCommFailureLimit 5 -ORBForwardOnReplyClosedLimit 5 -ORBDefaultSyncScope Server -ORBWaitStrategy mt_noupcall"
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/double_start/run_test.pl
index 4acc73d0bb8..a4156dd2f80 100755
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
index 19023449c8e..07163e84580 100755
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl
index a81fc495e48..ede38443f69 100755
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl
index abc9be8ec62..c329c3359b9 100755
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
index ce09e2aa427..e630b7409b6 100755
--- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl
index d6f5e2614d3..5540851d696 100755
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 #
 # 1. Register server as MANUAL start
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/defsync.conf b/TAO/orbsvcs/tests/ImplRepo/oneway/defsync.conf
index 8e411c3e407..44d26631cda 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/defsync.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/defsync.conf
@@ -1,2 +1 @@
-#$Id$
 static Client_Strategy_Factory "-ORBDefaultSyncScope Server"
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
index 5b7212d9ced..9e1e79e5197 100755
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl
index fdb71282609..efa412deabc 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index 831d0e0e887..409a097c19b 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -3,7 +3,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.conf b/TAO/orbsvcs/tests/ImplRepo/scale/client.conf
index 2a50e68f218..7ecf7a7379c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 # This file is here just in case you want to run some of the tests manually
 # and don't want the client to jump back in the reactor during the
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl
index a1046ed3baf..40c96630e51 100755
--- a/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl
index 1e5f12834d5..8247005334c 100755
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
index a298fbb8417..b07c749f85d 100755
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl
index 5393ca5f3c0..8e23518fce3 100755
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl
index f99e68c7a0c..c958010149e 100755
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 ###############################################################################
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
index 59de7ee6a6c..c2ee0a24296 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
index 7183a29b2a1..159b8472317 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
index 904b0962e00..bf273a45e39 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
index da59c80ef20..d81cf930f94 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
index 3775c2138e2..3af997650de 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl
index 8b9cf6f3503..4da354dd963 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl
index 9416cb1dbb6..586b371c569 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl
index af326620b2d..f6cc28cd300 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
@@ -89,7 +88,6 @@ $client->DeleteFile($iorbase);
 
 exit $status;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
index 5a00c31e3dc..0a7f917cbed 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl
index 0e65910adfb..dac5d245efa 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
index db72c527087..6c7548886aa 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl
index 730bbad28a0..8c541730246 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
index 671dea8d432..d2fb1c0d254 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl
index 8c5b05b1f78..1e803108ed4 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
index de3b93855ef..cdafdc04f59 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf
index b6856698e51..ab2b42f124c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl
index 5b23ca74b7b..8bb7ccda4d7 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl
index 3d21cdd25f0..c012275fcf0 100755
--- a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
index 23770a7b286..1ef3e736f16 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf
index b6856698e51..ab2b42f124c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
index e02d5089fce..a7837c0fa34 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf
index 687382aac65..71a480cbc72 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
index 1a4e8ea13ed..d3f640869e4 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/svc.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/svc.conf
index ea66c67064d..04085baefd0 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/svc.conf
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/svc.conf
@@ -1,2 +1 @@
-# $Id$
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf
index 0cc4559a431..4f6470d94c6 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf
index 687382aac65..71a480cbc72 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
index 1f868f756c5..97effd66342 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 & eval 'exec perl -S $0 $argv:q'
 if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf
index 0cc4559a431..4f6470d94c6 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
index d3adbd6af18..9e6613ce73b 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
index e02d5089fce..a7837c0fa34 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
index 65b12717476..243e54741ab 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
index e02d5089fce..a7837c0fa34 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl
index 8a2495f4e98..82fa6ab7197 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl
index f4f800fa36c..b1b44318d6b 100755
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test.pl b/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test.pl
index 38cd051aaa5..539c5139a91 100755
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test.pl
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl b/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl
index 55b1b3343ee..f27e53aff88 100755
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf
index 0b49ba12ea8..24a4517829a 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf
index 54785b279a0..bd037a53d48 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf
index 3b7a44ed19e..5e37ac7b023 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf
index 5286fbd046e..752d9f5f9ea 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl
index a0cd207dd21..ec700de4024 100755
--- a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl
+++ b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/svc.conf b/TAO/orbsvcs/tests/Miop/McastHello/svc.conf
index 5b4ee787f0b..3d19812cf13 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/svc.conf
+++ b/TAO/orbsvcs/tests/Miop/McastHello/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "-ORBListenOnAll 1"
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/run_test.pl b/TAO/orbsvcs/tests/Miop/McastLocal/run_test.pl
index 3ebd57a4b95..e99e822bf26 100755
--- a/TAO/orbsvcs/tests/Miop/McastLocal/run_test.pl
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/svc_client.conf b/TAO/orbsvcs/tests/Miop/McastLocal/svc_client.conf
index 84ef77cf1c6..94acd7e4ab2 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/svc_client.conf
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/svc_client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/svc_server1.conf b/TAO/orbsvcs/tests/Miop/McastLocal/svc_server1.conf
index db74ea90e3f..020532846d0 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/svc_server1.conf
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/svc_server1.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "-ORBListenerInterfaces *=127.0.0.1"
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/svc_server2.conf b/TAO/orbsvcs/tests/Miop/McastLocal/svc_server2.conf
index 01848bc7c5f..b4fabb34706 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/svc_server2.conf
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/svc_server2.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "-ORBListenerInterfaces CopyPreferredInterfaces"
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/miop_svc.conf b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/miop_svc.conf
index 5099f572598..dc61e466299 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/miop_svc.conf
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/miop_svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/miop_svc_ipv6.conf b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/miop_svc_ipv6.conf
index 8cafee524be..dc1e10edee3 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/miop_svc_ipv6.conf
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/miop_svc_ipv6.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "-ORBListenOnAll 1"
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/run_test.pl b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/run_test.pl
index c49cb9beba2..64177d00fd1 100755
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/run_test.pl
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{'ACE_ROOT'}/bin";
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/run_test_ipv6.pl b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/run_test_ipv6.pl
index 3ad562c98af..9176598d148 100755
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/run_test_ipv6.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{'ACE_ROOT'}/bin";
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/run_test.pl b/TAO/orbsvcs/tests/Miop/McastZIOP/run_test.pl
index 34fdb77c954..881085ce7e4 100755
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/run_test.pl
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/svc.conf b/TAO/orbsvcs/tests/Miop/McastZIOP/svc.conf
index 84ef77cf1c6..94acd7e4ab2 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/svc.conf
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/adminproperties.conf b/TAO/orbsvcs/tests/Notify/Basic/adminproperties.conf
index 7ed22785ab7..ddedeffd7f7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/adminproperties.conf
+++ b/TAO/orbsvcs/tests/Notify/Basic/adminproperties.conf
@@ -1,5 +1,4 @@
-## $Id$
-
+#
 ## Load the static Cos Notification Service
 ## We must use the following settings, because the supplier and consumer are co-located, and
 ## the test needs to prevent the threads from mixing during upcalls.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/notify.mt.conf b/TAO/orbsvcs/tests/Notify/Basic/notify.mt.conf
index c29d66b76e5..22d84f25d88 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/notify.mt.conf
+++ b/TAO/orbsvcs/tests/Notify/Basic/notify.mt.conf
@@ -1,3 +1,2 @@
-##$Id$
-
+#
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 2"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/notify.reactive.conf b/TAO/orbsvcs/tests/Notify/Basic/notify.reactive.conf
index dff4aaaa23e..e6e792c25e3 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/notify.reactive.conf
+++ b/TAO/orbsvcs/tests/Notify/Basic/notify.reactive.conf
@@ -1,3 +1,2 @@
-##$Id$
-
+#
 static Notify_Default_Event_Manager_Objects_Factory ""
diff --git a/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf b/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
index 66d57097409..afba9c780d6 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
+++ b/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
index 02ee408a13d..ff8a6305f95 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
index fd4cf5dd974..261502d1c9a 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/notify.conf b/TAO/orbsvcs/tests/Notify/Blocking/notify.conf
index 4b52ccb153a..28d4a76cae7 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Blocking/notify.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 ## The BlockingPolicy requires the notify service to use the following settings to prevent
 ## dispatch threads from handling supplier-side requests. This would allow dispatch threads
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl
index c8049870a7b..9e0eb883efb 100755
--- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf
index 4b52ccb153a..28d4a76cae7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 ## The BlockingPolicy requires the notify service to use the following settings to prevent
 ## dispatch threads from handling supplier-side requests. This would allow dispatch threads
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl
index 3bcef988967..87a1b5bfe70 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf
index 8a700d63f50..090c054c0ea 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory()  "-save_base_path ./persistency.notif  -load_base_path  ./persistency.notif  -backup_count 1 -v"
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl
index 76161b1c493..9d9bf4b1c71 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf
index d99984b593b..08c816cb969 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf
@@ -1,4 +1,3 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 static TAO_CosNotify_Service "-DispatchingThreads 1 -DefaultConsumerAdminFilterOp AND -DefaultSupplierAdminFilterOp AND"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf
index 6610095fa1f..25c73ed145d 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf
@@ -1,4 +1,3 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 static TAO_CosNotify_Service "-DispatchingThreads 1"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl
index ff03d8ca531..d36c3bf08cf 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/notify.conf b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/notify.conf
index a465090391d..14b81219573 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/notify.conf
@@ -1,4 +1,3 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -DispatchingThreads 1"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl
index b1a0704fbc5..27d3d6b9aad 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/run_test.pl
index 3569ed334c9..3b0346b0e64 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/run_test.pl
index 3569ed334c9..3b0346b0e64 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl
index 68621bd68c7..1e9e37a3217 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/run_test.pl
index 3569ed334c9..3b0346b0e64 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl
index cd6ddd55cd0..c7abe1cb159 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/run_test.pl
index 37057a1737b..899ce39f8fc 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/run_test.pl
index 0f0f1485b57..8b312cf298d 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl
index 868bb9bcb7e..ca7373336bf 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/run_test.pl
index 3569ed334c9..3b0346b0e64 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/notify.conf b/TAO/orbsvcs/tests/Notify/Discarding/notify.conf
index a465090391d..14b81219573 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Discarding/notify.conf
@@ -1,4 +1,3 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -DispatchingThreads 1"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
index 561fb5199e1..c0e239cc85a 100755
--- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
index b1cb8925002..455f0c593bf 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/notify.conf b/TAO/orbsvcs/tests/Notify/Lanes/notify.conf
index d1479eec5d8..6086822fead 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/notify.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
index b77703511bd..c7e14a522e1 100755
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf b/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
index 78ecd334aa8..202d13b880e 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-## This file has the following configuration:
+### This file has the following configuration:
 ## EventChannel ec1 with 1 Thread
 ## SupplierAdmim sa1 with 1 Thread
 ## SupplierAdmin sa2
diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl
index 9f91eb1ea4d..59156e275f6 100755
--- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf
index 007cca48967..1ebe29a4eb2 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf
@@ -1,4 +1,3 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 2"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf
index d8608059bad..97d7d48910f 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf
@@ -1,2 +1 @@
-## $Id$
-static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1 -SourceThreads 2"
+#static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1 -SourceThreads 2"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf
index 111787f6e31..d5e4a83a0ca 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf
@@ -1,2 +1 @@
-## $Id$
-static Notify_Default_Event_Manager_Objects_Factory ""
+#static Notify_Default_Event_Manager_Objects_Factory ""
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
index 6ab17265e41..d5cdcf52f29 100755
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/notify.conf b/TAO/orbsvcs/tests/Notify/Ordering/notify.conf
index 1a52da7b7ec..3636e4361b5 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Ordering/notify.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 ## DispatchThreads creates a queue for the consumer side
 ## SourceThreads creates a queue for the supplier side
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
index 5d8f51278f9..b523c3fb0f9 100755
--- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/NS.conf b/TAO/orbsvcs/tests/Notify/Persistent_Filter/NS.conf
index 20a0b65985f..eb90785460a 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/NS.conf
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/NS.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static TAO_CosNotify_Service "-AllocateTaskPerProxy -DispatchingThreads 1 -SourceThreads 1 -AllowReconnect -ValidateClient -ValidateClientDelay 1 -ValidateClientInterval 10 "
 
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl
index 7c75cc1a151..ff53a833e79 100755
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
index 5b675c57c69..d5e9d41db6b 100755
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf b/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf
index 2f3e1e99e58..63b5faf531b 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TopologyFactory Service_Object * NotifyPlugTop:_make_Test_Topology_Factory() ""
 #dynamic TopologyFactory Service_Object * TAO_CosNotification:_make_XML_Topology_Factory() ""
 \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf
index 4b454a220b1..9e8c8a5660a 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 #
 static TAO_CosNotify_Service "-AllowReconnect"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf
index a1a23b01338..4a29a6640ef 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 #
 ## -DispatchingThreads N - creates a thread pool for dispatching and consumer side filter eval
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
index bd5b1a06bc7..26a5a2427b1 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static TAO_CosNotify_Service "-DispatchingThreads 2 -SourceThreads 2 -AllowReconnect"
 #
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
index 621898f97cc..9fd4905cc0a 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static TAO_CosNotify_Service "-DispatchingThreads 2 -SourceThreads 2 -AllowReconnect"
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-base_path ./reconnect_test"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st.conf
index a1d4cb4bfea..fc890d01fc2 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static TAO_CosNotify_Service "-AllowReconnect"
 
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
index bef31a80273..a91922128f8 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static TAO_CosNotify_Service "-AllowReconnect"
 #
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
index 4aef148abe4..3d8a044dd0c 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static TAO_CosNotify_Service "-AllowReconnect"
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -base_path ./reconnect_test"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl
index c480127704c..c93e620213e 100755
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf
index 751ea3700a2..dbfb9ac1e4f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf
@@ -1,4 +1,3 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
index 5339c6bf664..4ad2cb183b0 100755
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf
index 0e4ab7e2a46..49541cc6a77 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
index f01efb1d81a..e1a678e3550 100755
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/notify.conf b/TAO/orbsvcs/tests/Notify/Structured_Filter/notify.conf
index c8b44b649f0..663732a0404 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/notify.conf
@@ -1,3 +1,2 @@
-## $Id$
-#
+##
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
index 51105e42a9d..f954fae6858 100755
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf
index a1c39a03050..5c60f47edaf 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf
@@ -1,4 +1,3 @@
-## $Id$
-#
+##
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
index 282592ff95d..d37697bca7e 100755
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf b/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf
index e603c22efa9..e596c5300d9 100644
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/notify.conf b/TAO/orbsvcs/tests/Notify/ThreadPool/notify.conf
index 50c432612e5..566b38462ee 100644
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/notify.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
index 49f88ff5158..4b0d2475da6 100755
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf b/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf
index 846fb7a81c4..76beb09a05c 100644
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-## This file has the following configuration:
+### This file has the following configuration:
 ## EventChannel ec1 with 1 Thread
 ## SupplierAdmim sa1 with 1 Thread
 ## SupplierAdmin sa2
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl
index 04384ec2fa9..ef933ed7431 100755
--- a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/notify.conf b/TAO/orbsvcs/tests/Notify/Validate_Client/notify.conf
index 4bd43d29c0c..af734c6463e 100644
--- a/TAO/orbsvcs/tests/Notify/Validate_Client/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Validate_Client/notify.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static TAO_CosNotify_Service "-AllocateTaskPerProxy -DispatchingThreads 1 -SourceThreads 1 -AllowReconnect -ValidateClient -ValidateClientDelay 1 -ValidateClientInterval 2"
 
diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl b/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl
index bd749040b32..e4f0e68e05e 100755
--- a/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl b/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl
index 4ee469b5206..790cc8d496a 100755
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf b/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf
index b748463e64a..6912887b73e 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -save_base_path ./abc -load_base_path ./loadtest -backup_count 2 -no_timestamp"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/notify.conf
index 93af5f9d812..1ddf2bdba68 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/notify.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ## Load the static Cos Notification Service
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
index 88fc0406dd1..c122595de2c 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
index 9d3a088919d..7cc5a94bbb3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
@@ -1,5 +1,4 @@
-## $Id$
-
+#
 static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -DispatchingThreads 1"
 
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
index 8fb85f0082f..fda3e95fe6e 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
@@ -1,3 +1,2 @@
-## $Id$
-
+#
 static Notify_Default_Event_Manager_Objects_Factory "-SourceThreads 2"
 \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf
index d4399938cec..c5c1a33f71b 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf
@@ -1,3 +1,2 @@
-## $Id$
-static Notify_Default_Event_Manager_Objects_Factory ""
+#static Notify_Default_Event_Manager_Objects_Factory ""
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
index cd32f090a3e..2f0cea4b3d9 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf
index 878eb245f3d..7edd3f1eb4c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 static Resource_Factory "-ORBReactorMaskSignals 0"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf
index 81477a4a545..4eb29f19c71 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf
index 9a4ca3d23f7..5a614f34171 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf
index 5a3ca3273ec..d579da129ae 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf
index 353afa04682..b048a453ee5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf
index 9a8d150acab..b245639ad78 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf
index 011249c3b88..06e29a43e8c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf
index 26514354e70..df477a9f0c0 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf
index 213334fb39e..ad0d235d45c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf
index 70eaaf4a6b5..2ba217c4419 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf
index fa3586d0188..ef1eb7dbdcb 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf
index f44743cf7c2..45985869489 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/consumer.conf
index 07249b105c8..df632c94f47 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/consumer.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
index 7e1c32ee057..c7f3e1da741 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
@@ -1,4 +1,3 @@
-## $Id$
-
+#
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
index c58381f28ec..f64f786a76a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
@@ -1,5 +1,4 @@
-## $Id$
-
+#
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_all.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_all.pl
index 8de394cf131..cb56c10ee35 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_all.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_all.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
index 1154c82070a..263d9cb476e 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
index 92db23547f9..10fad3b3597 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
index 38ac8442cec..7f86196ac4c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
index f7656f36930..d1dc3c538e2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
index 14074a2f482..f96146f6a53 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
index b4954b4fd87..e272c2476d0 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
index 034fad03e3c..658afca3435 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
index 69dfaecb51a..8711b985071 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
index f84fd889d57..532bc98c805 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
index 37d1090a90f..bb661f1f863 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
index 1403c8b429e..f0010848ac6 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
index d6d1c14e7d8..21501c7032f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf
index 5639b258ca4..c39d1f9ee77 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
index 18d4f90968b..1683014f541 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
index 4c20b15d32f..9ed0970d021 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl
index 08a3ccb6e3a..05fe3de4a77 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
index 7d4bd7e216f..9bf5f9060f8 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf
index 0f95a246f56..0a31c78d819 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
index 393c5812cb4..82bfb7dabf3 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf
index fef4d975c5d..818b0e8bcfe 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
index d7b6d405f92..577b2639ba4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
index 3a759aeb3b2..10189c75ef2 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
index 3b7a027668c..e1592a15d92 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf
index 8bfc893a7a9..ae94a4ff47d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf
index de27feabe08..b364c4a7452 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
index 3ca61b9dda4..4467d13e858 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf
index 2cdad84a16a..2479521a4dc 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
index d7b6d405f92..577b2639ba4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
index 15313407835..2ef85e4b0e4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
index 520c3289059..f3a665dcdd6 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf
index e9c9452944a..b034e25c078 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-## This file has the following configuration:
+### This file has the following configuration:
 ##
 #
 ##---- Load the Factories------
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
index 26063b38c14..3a84d811cfe 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
@@ -1,4 +1,3 @@
-#$Id$
 #
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
index 6b0f5032ee3..a156aeec81f 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
index 18976ea0ad2..b5b98f60a9d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
@@ -1,4 +1,3 @@
-#$Id$
 #
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
index 009ac28cfad..ef99e205c60 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
@@ -3,7 +3,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf
index 4bedda340f5..8138d04af5f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf
@@ -1,5 +1,4 @@
-## $Id$
-#
+##
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
 #
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
index aff8be2188f..3dd61cd4601 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
index 7348bd02884..b539a56f25d 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf
index 7a59c06f755..77afcafbf35 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf
index 9b515bcb52c..c1325cb945f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
index 4c20b15d32f..9ed0970d021 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
index 0e1050e731a..3746f296364 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
index 81836c43a5c..1692977e6ba 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
@@ -1,5 +1,4 @@
-## $Id$
-##
+###
 #
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl
index 5ca047d1270..51f12c4f734 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_1/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_1/other_paths.conf
index 92cead2565b..5f85a3a7251 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_1/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_1/other_paths.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf
index f79dccd419b..6c999dac806 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf
index e6de590526f..294ce7dcccc 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_3/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_3/other_paths.conf
index 4d53387c72f..5970114bd17 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_3/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_3/other_paths.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf
index b3eed2c65d4..e7e6da34f0d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
index 18d4f90968b..1683014f541 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf
index 093a1f720c7..b3f7324fd0a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf
@@ -1,5 +1,4 @@
-## $Id$
-##---- Load the Factories------
+###---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
 dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
index 4c20b15d32f..9ed0970d021 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_all.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_all.pl
index 33bf0bc2f99..2988c600bad 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_all.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_all.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_high_path.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_high_path.pl
index ccb5adb94fa..181140230d4 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_high_path.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_high_path.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
index be792c12a4a..d5a41164e4e 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_other_paths.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_other_paths.pl
index 5686184ffe1..75317dab036 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_other_paths.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_other_paths.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
index 4ea15e40ba8..b45faeff8bf 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/run_all.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/run_all.pl
index 72380903c8e..9835bcedd53 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/run_all.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/run_all.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl
index bc53ac19b04..33607e6c8a6 100755
--- a/TAO/orbsvcs/tests/Property/run_test.pl
+++ b/TAO/orbsvcs/tests/Property/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
index e89dc202e66..fb4e72fbf63 100755
--- a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs a Naming Service test.  It starts
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.conf b/TAO/orbsvcs/tests/Security/BiDirectional/client.conf
index b65ac0f47e6..65d8237b32d 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.conf
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
   TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl b/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl
index f74a43b8f30..dbad4c1aa5a 100755
--- a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.conf b/TAO/orbsvcs/tests/Security/BiDirectional/server.conf
index 39bf82dd312..c527b07ac50 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.conf
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
   TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.conf b/TAO/orbsvcs/tests/Security/Big_Request/client.conf
index 5847fa22a03..faad11a3830 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.conf
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl b/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
index 0876be7b4a3..dae070b6e3b 100755
--- a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.conf b/TAO/orbsvcs/tests/Security/Big_Request/server.conf
index ee0ef1aa57c..9a547dcbc48 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.conf
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf
index 5847fa22a03..faad11a3830 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl
index 52d2e262eb0..c58515e5014 100755
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf
index ee0ef1aa57c..9a547dcbc48 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/client.conf b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/client.conf
index 80454cc7eab..56065163ec7 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/client.conf
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:ssl/client-key.pem -SSLCertificate PEM:ssl/client-cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl
index c74ecb636e3..3515d52e5be 100755
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/server.conf b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/server.conf
index 783717ec1ee..8d17d9873d1 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/server.conf
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:ssl/server-key.pem -SSLCertificate PEM:ssl/server-cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.conf b/TAO/orbsvcs/tests/Security/Callback/client.conf
index 5847fa22a03..faad11a3830 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.conf
+++ b/TAO/orbsvcs/tests/Security/Callback/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Callback/run_test.pl b/TAO/orbsvcs/tests/Security/Callback/run_test.pl
index 4a72131711c..979a665f0b8 100755
--- a/TAO/orbsvcs/tests/Security/Callback/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Callback/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.conf b/TAO/orbsvcs/tests/Security/Callback/server.conf
index ee0ef1aa57c..9a547dcbc48 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.conf
+++ b/TAO/orbsvcs/tests/Security/Callback/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.conf b/TAO/orbsvcs/tests/Security/Crash_Test/client.conf
index 5847fa22a03..faad11a3830 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.conf
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl b/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl
index 900fefac7f1..f896dfed436 100755
--- a/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.conf b/TAO/orbsvcs/tests/Security/Crash_Test/server.conf
index ee0ef1aa57c..9a547dcbc48 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.conf
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/run_test.pl b/TAO/orbsvcs/tests/Security/EndpointPolicy/run_test.pl
index 52e211e3ffb..94b24cc9249 100755
--- a/TAO/orbsvcs/tests/Security/EndpointPolicy/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/svc.conf b/TAO/orbsvcs/tests/Security/EndpointPolicy/svc.conf
index 05966f6443c..6f3231c6716 100644
--- a/TAO/orbsvcs/tests/Security/EndpointPolicy/svc.conf
+++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/svc.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/client.conf b/TAO/orbsvcs/tests/Security/InsecureReferences/client.conf
index 05966f6443c..6f3231c6716 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/client.conf
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/run_test.pl b/TAO/orbsvcs/tests/Security/InsecureReferences/run_test.pl
index 8e30cbdfbf1..45f5661140a 100755
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf
index 13aca91454e..15820556c94 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * 
   TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/run_test.pl b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/run_test.pl
index a6125da53b2..077505527a6 100755
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf
index 6453d89749c..140605c91e6 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 #
 dynamic SSLIOP_Factory Service_Object * 
   TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
index fe8f854a0dd..8b1a56a22f3 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
@@ -1,4 +1,3 @@
-#$Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl
index 8f31fb9cb32..18642b19936 100755
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
index c2d659f95eb..d0148e31dee 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
@@ -1,4 +1,3 @@
-#$Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf
index 5403109ed69..623dfbfebe5 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl
index a266fda1ae7..719e7f4f64a 100755
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
index 555136050b4..016bb2dfb98 100755
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl
index 926c13ad9b7..0019737ff8b 100755
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf
index fec138accdb..31d7b2979b8 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf b/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf
index 6f9b70c667b..77d13141db9 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLNoProtection -SSLAuthenticate SERVER -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/run_test.pl b/TAO/orbsvcs/tests/Security/Null_Cipher/run_test.pl
index ebe91e9334c..adce83f39cf 100755
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf b/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf
index 55ccaaceecb..01e92cd924b 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLNoProtection -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf
index 602c52b482e..b699c25f0ea 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf
index cf52d7cc4c4..d2ff84e44ad 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
index ebe91e9334c..adce83f39cf 100755
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf
index c0a310504f5..bf856b68637 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf
index 52c7340e359..9b71f29cbbe 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf
index 01db313e9fb..76beb5ed958 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf b/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf
index 5847fa22a03..faad11a3830 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client_none.conf b/TAO/orbsvcs/tests/Security/mixed_security_test/client_none.conf
index b351c69d88a..6afe5adc49e 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client_none.conf
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client_none.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf b/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf
index c485fa19f3a..6e4b6c27af8 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/run_test.pl b/TAO/orbsvcs/tests/Security/mixed_security_test/run_test.pl
index 18afc2d3e21..4d907756d6a 100755
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf b/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf
index 52ecf6d11ff..ef0d5085cf8 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
 TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf b/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf
index e445c19615f..3c638c143cb 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf b/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf
index 19cd88ba742..f75d68daf05 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/client.conf b/TAO/orbsvcs/tests/Security/ssliop_CSD/client.conf
index 78e939b5c7e..ae24fac8ec5 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/client.conf
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:clientkey.pem -SSLCertificate PEM:clientcert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/client1.conf b/TAO/orbsvcs/tests/Security/ssliop_CSD/client1.conf
index daafe5fdf58..ace6782ecc4 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/client1.conf
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/client1.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:clientkey.pem -SSLCertificate PEM:clientcert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/csd.conf b/TAO/orbsvcs/tests/Security/ssliop_CSD/csd.conf
index 4eccadbc649..2c51d558c28 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/csd.conf
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/csd.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 dynamic TAO_CSD_TP_Strategy_Factory Service_Object * TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_CSD/run_test.pl
index 8938778c9b3..49bf16f5162 100755
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop-csd.conf b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop-csd.conf
index 6a60cfc16d1..6113f89c9dc 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop-csd.conf
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop-csd.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:serverkey.pem -SSLCertificate PEM:servercert.pem"
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop.conf b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop.conf
index f27e9c5d968..fcc5ee3f810 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop.conf
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:serverkey.pem -SSLCertificate PEM:servercert.pem"
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
index 4624af11b7a..f1ebc8c1b57 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
index 90c93878d60..fc09f50e2ef 100755
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs some Naming Service tests.
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
index fec138accdb..31d7b2979b8 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
@@ -1,4 +1,3 @@
-# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl b/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl
index c9205bda74a..74275e3aa54 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl
@@ -1,4 +1,3 @@
-# $Id$
 # -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 78cfc80e755..7d7af0428bd 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs some Naming Service tests.
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
index 0fcea3d6fd1..ecd1f4774dc 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs additional Naming Service tests.
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
index b2b85681179..9e62c2e1141 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs some Naming Service tests
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
index 363ca918d35..6d197fcb7ac 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 # This is a Perl script that runs some Naming Service tests.
diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl
index 2f164522d22..a04a4175f85 100755
--- a/TAO/orbsvcs/tests/Time/run_test.pl
+++ b/TAO/orbsvcs/tests/Time/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl
index 666a635e8fb..0f4e1921ebb 100755
--- a/TAO/orbsvcs/tests/Trading/run_test.pl
+++ b/TAO/orbsvcs/tests/Trading/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Control/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/Control/run_test.pl
index 3c9b3dd64e4..cda50b28c0e 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Control/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Control/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl
index 540a416a985..4fef8860375 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/svc.conf b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/svc.conf
index 2dab5e48531..a6794940eb5 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/svc.conf
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/svc.conf
@@ -1,4 +1,3 @@
-## $Id$
-
+#
 dynamic TAO_MonitorAndControl Service_Object * TAO_CosNotification_MC:_make_TAO_MonitorAndControl () "-NoNameSvc -ORBArg -ORBListenEndpoints -ORBArg iiop://127.0.0.1:32101"
 dynamic TAO_MC_Notify_Service Service_Object * TAO_CosNotification_MC_Ext:_make_TAO_MC_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl
index 177395a75d8..f57014ddf48 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf
index 1d72c863f98..702180bd878 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf
@@ -1,3 +1,2 @@
-# $Id$
 
 dynamic TAO_MonitorAndControl Service_Object * TAO_CosNotification_MC:_make_TAO_MonitorAndControl () "-NoNameSvc -ORBArg -ORBListenEndpoints -ORBArg iiop://127.0.0.1:32101"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl
index 1151f336b44..ad214d7abc1 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl
index 0704812ce96..9f5817d4bf5 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl
index f775c421ccf..608d3dc4745 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl b/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl
index 3ec54109515..82395bccca0 100755
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl
@@ -2,7 +2,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
author	Johnny Willemsen <jwillemsen@remedy.nl>	2015-01-07 16:56:24 +0100
committer	Johnny Willemsen <jwillemsen@remedy.nl>	2015-01-07 16:56:24 +0100
commit	169db677980c71427658d590f1d7d2f5365a94b9 (patch)
tree	12d6ab68bcaf8e03cef59651fc39a5a8e05c3e40 /TAO/orbsvcs/tests
parent	d3a107625182634ae0be8f003d9130f8bb5c3567 (diff)
download	ATCD-169db677980c71427658d590f1d7d2f5365a94b9.tar.gz