Handle perl files

53 files changed, 8 insertions, 108 deletions

diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl
index 098f07f48d3..3a562ad9b9f 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 1;
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl
index 77d2495a741..e9d28e8fecf 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl
index 28efe90c4d5..716cebfa602 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 $testbed = "conf/testbed";
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl
index 5588f6cdd1f..fcf41e632b2 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/killbench.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/killbench.pl
index db9b0368632..42c616a79e0 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/killbench.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/killbench.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl
index c1bdb727fba..6e14d731bfc 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl
 #
-#$Id$
-#
 #  mine-logs.pl:
 #       script to transform access logs into WebStone workload
 #
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/move-filelist.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/move-filelist.pl
index eb263a04bf5..0155b83f972 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/move-filelist.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/move-filelist.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/move-runs.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/move-runs.pl
index 3412f992008..a4ca528f034 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/move-runs.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/move-runs.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/runbench.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/runbench.pl
index fdd12e4d530..81071504f1a 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/runbench.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/runbench.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/view-results.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/view-results.pl
index ac375746e8a..7ff961efcca 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/view-results.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/view-results.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl
index c6fc280b023..2935b9f56fe 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 # write new values from form to $wd/conf/testbed, and run WebStone
 #
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl
index 27ef003655f..b2f14428477 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl
 #
-#$Id$
-#
 # $Header$
 # updated version of the old wscollect script which goes through
 # webstone run directories and summarizes the output in tabular
diff --git a/ACE/bin/FOCUS/FOCUS.pl b/ACE/bin/FOCUS/FOCUS.pl
index b037b928b20..9237976db27 100755
--- a/ACE/bin/FOCUS/FOCUS.pl
+++ b/ACE/bin/FOCUS/FOCUS.pl
@@ -27,8 +27,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 #
 # @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
 #
-# $Id$
-#
 ########################################################################
 use Getopt::Long;
 
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index 59b313879a1..78ed63c55f7 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -2,19 +2,17 @@ eval '(exit $?0)' && eval 'exec perl -pi -S $0 ${1+"$@"}'
     & eval 'exec perl -0 -S $0 $argv:q'
     if 0;
 
-# $Id$
-#
 # You may want to run the "find" command with this script, which maybe
 # something like this:
 #
-# find . -type f \( -name "*.inl" -o -name "*.h" -o -name "*.cpp" -o -name "*.mpc" -o -name "*.idl" -o -name "*.conf" -o -name "*.mpb" -o -name "*.hpp" \) -print | xargs $ACE_ROOT/bin/zap_svn_id.pl
+# find . -type f \( -name "*.inl" -o -name "*.h" -o -name "*.cpp" -o -name "*.mpc" -o -name "*.idl" -o -name "*.conf" -o -name "*.mpb" -o -name "*.hpp" -o -name "*.pl"  \) -print | xargs $ACE_ROOT/bin/zap_svn_id.pl
 
 # The first three lines above let this script run without specifying the
 # full path to perl, as long as it is in the user's PATH.
 # Taken from perlrun man page.
 
 # Replace the old cvs-id tag with nothing
-BEGIN{undef $/;} s/cvs-id    : //smg;
+BEGIN{undef $/;} s///smg;
 # Replace a single doxygen style with two spaces before the Id with one space
 BEGIN{undef $/;} s/ \*\n \*  \$Id\$\n \*\n/ \*\n \* \$Id\$\n \*\n/smg;
 # Replace a three line doxygen style Id tag with just line *
@@ -47,3 +45,8 @@ BEGIN{undef $/;} s/\/\*\n \* \$Id\$\n \*\n/\/\*\n/smg;
 BEGIN{undef $/;} s/\/\* \$Id\$ \*\/\n\n//smg;
 # Replace a one line c++-style id tag with an empty line below that with nothing
 BEGIN{undef $/;} s/\/\* \$Id\$ \*\/\n//smg;
+# Replace a three perl style Id tag with just line #
+BEGIN{undef $/;} s/ \#\n \# \$Id\$\n \#\n/ \#\n/smg;
+BEGIN{undef $/;} s/\#\n\# \$Id\$\n\#\n/\#\n/smg;
+BEGIN{undef $/;} s/ \#\n \#\$Id\$\n \#\n/ \#\n/smg;
+BEGIN{undef $/;} s/\#\n\#\$Id\$\n\#\n/\#\n/smg;
diff --git a/CIAO/bin/generate_component_mpc.pl b/CIAO/bin/generate_component_mpc.pl
index 6289c75b83d..d410ae318ad 100755
--- a/CIAO/bin/generate_component_mpc.pl
+++ b/CIAO/bin/generate_component_mpc.pl
@@ -286,8 +286,7 @@ else {
 
 }
 
-$mpc_template = '// $Id$
-// This file is generated with "'."generate_component_mpc.pl $flags".'"
+$mpc_template = '// This file is generated with "'."generate_component_mpc.pl $flags".'"
 
 project('."$unique_prefix"."$com_name".'_idl_gen) : componentidldefaults' . "$base_projs" . '{
   custom_only = 1'."
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/svc.conf b/CIAO/performance-tests/Benchmark/Multi_Threaded/svc.conf
index 46ff5409fdf..adb400aae78 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/svc.conf
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/svc.conf
@@ -1,5 +1,3 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf b/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf
index 3041c06f5e3..6dfec619589 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE-ORBClientConnectionHandler RW"
diff --git a/CIAO/performance-tests/Benchmark/svc.conf b/CIAO/performance-tests/Benchmark/svc.conf
index 40babaf2989..bcb0083d041 100644
--- a/CIAO/performance-tests/Benchmark/svc.conf
+++ b/CIAO/performance-tests/Benchmark/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/docs/tutorials/Quoter/AMI/svc.conf b/TAO/docs/tutorials/Quoter/AMI/svc.conf
index 9fb75aeb0dd..7bc5587289c 100644
--- a/TAO/docs/tutorials/Quoter/AMI/svc.conf
+++ b/TAO/docs/tutorials/Quoter/AMI/svc.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED"
diff --git a/TAO/examples/AMH/Sink_Server/st_server.conf b/TAO/examples/AMH/Sink_Server/st_server.conf
index 75f547672a1..e796fbc3da1 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.conf
+++ b/TAO/examples/AMH/Sink_Server/st_server.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 
 # We want an optimised single threaded Reactive server
 #
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf
index 40babaf2989..bcb0083d041 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl
index 09196685fcc..ae8ac9b2f88 100755
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl
@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 #
-# $Id$
-#
 
 use English;
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl
index f39e43497d6..193c196319f 100755
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl
@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 #
-# $Id$
-#
 
 foreach $t (@ARGV) {
   print "plot '", $t, "_delta.32.histo.dat'\n";
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/svc.conf b/TAO/orbsvcs/tests/EC_Custom_Marshal/svc.conf
index 527d5e23bf6..e4ad14640b9 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/svc.conf
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/svc.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/TAO/orbsvcs/tests/EC_Multiple/histo.pl b/TAO/orbsvcs/tests/EC_Multiple/histo.pl
index dcd13f27320..128fcc8059f 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/histo.pl
+++ b/TAO/orbsvcs/tests/EC_Multiple/histo.pl
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 # Extract a histogram, minimum, maximum and average from a file,
 # filtering by a given RE.
 #
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf b/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf
index f0b21964ce3..0e5eee1b0a3 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf
+++ b/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECDispatching mt -ECDispatchingThreads 4 -ECFiltering basic -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf
index d507abaeb6f..a863a1fdc89 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf
+++ b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 
 static EC_QueueFullSimpleActions "discard"
 static EC_Factory "-ECDispatching mt -ECDispatchingThreads 4 -ECFiltering basic -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf
index 64e8f8656ea..9816acb5c2f 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static SHMIOP_Factory "-MMAPFilePrefix server_shmiop -MMAPFileSize 1000000"
diff --git a/TAO/performance-tests/Latency/Collocation/svc.conf b/TAO/performance-tests/Latency/Collocation/svc.conf
index 40babaf2989..bcb0083d041 100644
--- a/TAO/performance-tests/Latency/Collocation/svc.conf
+++ b/TAO/performance-tests/Latency/Collocation/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Latency/DII/svc.conf b/TAO/performance-tests/Latency/DII/svc.conf
index 1b3ec40e989..af2099b5b9d 100644
--- a/TAO/performance-tests/Latency/DII/svc.conf
+++ b/TAO/performance-tests/Latency/DII/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Latency/DSI/svc.conf b/TAO/performance-tests/Latency/DSI/svc.conf
index 1b3ec40e989..af2099b5b9d 100644
--- a/TAO/performance-tests/Latency/DSI/svc.conf
+++ b/TAO/performance-tests/Latency/DSI/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Latency/Deferred/svc.conf b/TAO/performance-tests/Latency/Deferred/svc.conf
index ee3d894e6d1..045fa46d942 100644
--- a/TAO/performance-tests/Latency/Deferred/svc.conf
+++ b/TAO/performance-tests/Latency/Deferred/svc.conf
@@ -1,5 +1,3 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Latency/Single_Threaded/svc.conf b/TAO/performance-tests/Latency/Single_Threaded/svc.conf
index 40babaf2989..bcb0083d041 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/svc.conf
+++ b/TAO/performance-tests/Latency/Single_Threaded/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf b/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf
index f6f2ef699ee..fe849bf5e1f 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW -ORBConnectStrategy blocked"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/TAO/performance-tests/Latency/Thread_Pool/svc.conf b/TAO/performance-tests/Latency/Thread_Pool/svc.conf
index 46ff5409fdf..adb400aae78 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/svc.conf
+++ b/TAO/performance-tests/Latency/Thread_Pool/svc.conf
@@ -1,5 +1,3 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Sequence_Latency/DII/svc.conf b/TAO/performance-tests/Sequence_Latency/DII/svc.conf
index 1b3ec40e989..af2099b5b9d 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/svc.conf
+++ b/TAO/performance-tests/Sequence_Latency/DII/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf
index 1b3ec40e989..af2099b5b9d 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf
+++ b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf
index ee3d894e6d1..045fa46d942 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf
@@ -1,5 +1,3 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf
index 40babaf2989..bcb0083d041 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf
index f6f2ef699ee..fe849bf5e1f 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW -ORBConnectStrategy blocked"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf b/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf
index 46ff5409fdf..adb400aae78 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf
@@ -1,5 +1,3 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/tests/Big_Request_Muxing/svc.conf b/TAO/tests/Big_Request_Muxing/svc.conf
index 9fb75aeb0dd..7bc5587289c 100644
--- a/TAO/tests/Big_Request_Muxing/svc.conf
+++ b/TAO/tests/Big_Request_Muxing/svc.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED"
diff --git a/TAO/tests/Bug_3647_Regression/svc.conf b/TAO/tests/Bug_3647_Regression/svc.conf
index 38a55ae3039..ac2945a0bee 100644
--- a/TAO/tests/Bug_3647_Regression/svc.conf
+++ b/TAO/tests/Bug_3647_Regression/svc.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
diff --git a/TAO/tests/Connect_Strategy_Test/blocked.conf b/TAO/tests/Connect_Strategy_Test/blocked.conf
index bb70bf3b8bb..21212741ef3 100644
--- a/TAO/tests/Connect_Strategy_Test/blocked.conf
+++ b/TAO/tests/Connect_Strategy_Test/blocked.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static Client_Strategy_Factory "-ORBConnectStrategy Blocked"
diff --git a/TAO/tests/Connect_Strategy_Test/reactor.conf b/TAO/tests/Connect_Strategy_Test/reactor.conf
index 75f11aa8a40..6e34aa99cd8 100644
--- a/TAO/tests/Connect_Strategy_Test/reactor.conf
+++ b/TAO/tests/Connect_Strategy_Test/reactor.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static Client_Strategy_Factory "-ORBConnectStrategy Reactive"
diff --git a/TAO/tests/Connection_Purging/server_shmiop.conf b/TAO/tests/Connection_Purging/server_shmiop.conf
index 64e8f8656ea..9816acb5c2f 100644
--- a/TAO/tests/Connection_Purging/server_shmiop.conf
+++ b/TAO/tests/Connection_Purging/server_shmiop.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static SHMIOP_Factory "-MMAPFilePrefix server_shmiop -MMAPFileSize 1000000"
diff --git a/TAO/tests/DII_AMI_Forward/run_test.pl b/TAO/tests/DII_AMI_Forward/run_test.pl
index c64b4a23b20..bc184d4ae14 100755
--- a/TAO/tests/DII_AMI_Forward/run_test.pl
+++ b/TAO/tests/DII_AMI_Forward/run_test.pl
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
diff --git a/TAO/tests/Faults/server.conf b/TAO/tests/Faults/server.conf
index 4db827456eb..fe3efb8d8f4 100644
--- a/TAO/tests/Faults/server.conf
+++ b/TAO/tests/Faults/server.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/TAO/tests/LongUpcalls/svc.conf b/TAO/tests/LongUpcalls/svc.conf
index f04d979d03e..cc1ee5fa2f3 100644
--- a/TAO/tests/LongUpcalls/svc.conf
+++ b/TAO/tests/LongUpcalls/svc.conf
@@ -1,5 +1,3 @@
 #
-# $Id$
-#
 static Resource_Factory "-ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED"
diff --git a/TAO/tests/Muxing/svc.conf b/TAO/tests/Muxing/svc.conf
index 7e53e48c97d..75874a28f82 100644
--- a/TAO/tests/Muxing/svc.conf
+++ b/TAO/tests/Muxing/svc.conf
@@ -1,5 +1,3 @@
 #
-# $Id$
-#
 static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED"
 static Resource_Factory "-ORBMuxedConnectionMax 1"
diff --git a/TAO/tests/No_Server_MT_Connect_Test/blocked.conf b/TAO/tests/No_Server_MT_Connect_Test/blocked.conf
index bb70bf3b8bb..21212741ef3 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/blocked.conf
+++ b/TAO/tests/No_Server_MT_Connect_Test/blocked.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static Client_Strategy_Factory "-ORBConnectStrategy Blocked"
diff --git a/TAO/tests/No_Server_MT_Connect_Test/reactor.conf b/TAO/tests/No_Server_MT_Connect_Test/reactor.conf
index 75f11aa8a40..6e34aa99cd8 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/reactor.conf
+++ b/TAO/tests/No_Server_MT_Connect_Test/reactor.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
 static Client_Strategy_Factory "-ORBConnectStrategy Reactive"
diff --git a/TAO/tests/Object_Loader/svc.conf b/TAO/tests/Object_Loader/svc.conf
index 94f31260de2..6894675fb23 100644
--- a/TAO/tests/Object_Loader/svc.conf
+++ b/TAO/tests/Object_Loader/svc.conf
@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 dynamic TAO_POA Service_Object * TAO_PortableServer:_make_TAO_Object_Adapter_Factory() ""
 dynamic Test_Object Service_Object * Test_DLL:_make_Loader() ""