summaryrefslogtreecommitdiff
path: root/CIAO/connectors/ami4ccm/tests
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/connectors/ami4ccm/tests')
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h2
189 files changed, 0 insertions, 338 deletions
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl
index 0744cd593fe..92b91f62111 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ASYNCHT_IDL
#define ASYNCHT_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc
index ec8953f5d27..0d0b1314243 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_AsynchT_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=ASYNCHT_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl
index 2dd5a084bf4..ae67b6a2c3b 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ASYNCHT_RECEIVER_IDL
#define ASYNCHT_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc
index b1dddc918d2..8459bc0607a 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p AsynchT_Base AsynchT_Receiver"
project(AMI_AsynchT_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp
index 049944f3ce2..9bb758a9cc4 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h
index a1a7a49f0e6..52a25ca5c28 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl
index 162e2ef5cfd..e1c26d67a1f 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ASYNCHT_SENDER_IDL
#define ASYNCHT_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc
index c9f26a083a4..9157a1f5ec9 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p AsynchT_Base AsynchT_Sender"
project(AMI_AsynchT_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp
index 5639f8ee785..13bfa49be17 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h
index 12350e2875f..834e288b46a 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl
index b8d0ad74d4c..a5eb542d1bf 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DELREPLYH_IDL
#define DELREPLYH_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc
index d06ecd8ad05..e36b8b68ee1 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_DelReplyH_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=DELREPLYH_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl
index 0121d62b119..a95470aaddf 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DELREPLYH_RECEIVER_IDL
#define DELREPLYH_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc
index 0c636a532b6..8036398669c 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DelReplyH_Base DelReplyH_Receiver"
project(AMI_DelReplyH_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp
index bdd3653de63..7bb457254b2 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h
index 706d25747ae..2048324bd18 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl
index b7166344466..b26a817331d 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DELREPLYH_SENDER_IDL
#define DELREPLYH_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc
index 45d851c4442..fdd51fd53d1 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DelReplyH_Base DelReplyH_Sender"
project(AMI_DelReplyH_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp
index 13f9be2edf4..56d76aae5b3 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h
index b64f3946d5f..fb624a351af 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl
index ba6ade291f0..f3316b59c7a 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef EXCEPTION_T_IDL
#define EXCEPTION_T_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc
index 8f9119a5b6e..2c8176499dc 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_ExceptionT_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=EXCEPTION_T_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl
index 6795cdc58a5..f07aca3b30b 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef EXCEPTION_T_RECEIVER_IDL
#define EXCEPTION_T_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc
index 6fdfea1de13..c7a34340234 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p ExceptionT_Base ExceptionT_Receiver"
project(AMI_ExceptionT_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp
index 49ddc678fd9..0b6d2a12799 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h
index 90586b5ca2a..e4f6ce3b801 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl
index 09367bac0a4..cfec3871768 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef EXCEPTION_T_SENDER_IDL
#define EXCEPTION_T_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc
index 6a4ada1853a..2fbad2110f6 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p ExceptionT_Base ExceptionT_Sender"
project(AMI_ExceptionT_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp
index a86884cdbb9..b739d2b9dd0 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h
index 9d4897e40c6..a312317cf6f 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.idl b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.idl
index bc8a8b8fae5..e078435b41e 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.idl
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef GETCOMP_T_IDL
#define GETCOMP_T_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc
index c0369ca8354..5811f788877 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_GetComp_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=GETCOMP_T_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl
index 9df1da04739..64e6f7046b5 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef GETCOMP_T_RECEIVER_IDL
#define GETCOMP_T_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc
index 3b8c656eafa..699148e8a95 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p GetComp_Base GetComp_Receiver"
project(AMI_GetCom_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp
index a644163641e..b188dd14433 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h
index 4a52cec70c9..6fed85ee0bc 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl
index 513264d2a76..5868aad537c 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef GETCOMP_T_SENDER_IDL
#define GETCOMP_T_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc
index 4f51e3e5bba..22d65e3f761 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p GetComp_Base GetComp_Sender"
project(AMI_GetComp_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp
index 377d7f164b5..ae18b1a8889 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h
index 582fa6e734d..4c5ba6c5832 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc
index 0368664e2a9..18616452f3a 100644
--- a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc
+++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI4CCM_IDL_Test_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl
index af9b631a22a..ea368e162e3 100644
--- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl
+++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_IDL
#define HELLO_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl
index 753d24939ba..a012fa29e58 100644
--- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl
+++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_SENDER_IDL
#define HELLO_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
index 32bfe262ccd..7cf2d9226ca 100644
--- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
+++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Component"
project(AMI4CCM_ITB_Hello_Comp_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl
index d39973c41e7..cba284a9027 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERINARGS_T_IDL
#define INTERINARGS_T_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc
index 411f52388f6..9c6750e2415 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_InterInArgsT_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=INTERINARGS_T_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl
index 8bd6b9a1c9c..b233217e4c6 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERINARGS_T_RECEIVER_IDL
#define INTERINARGS_T_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc
index d117c93e2de..cf24d5f5c1b 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterInArgsT_Base InterInArgsT_Receiver"
project(AMI_InArgsT_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp
index 1e85c58722d..50fe5517419 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h
index c1937c6e94f..5f391b33df0 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl
index 30564aa34af..3a342a58fbd 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERINARGS_T_SENDER_IDL
#define INTERINARGS_T_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc
index 45aaf485bf6..c280c62041e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterInArgsT_Base InterInArgsT_Sender"
project(AMI_InterInArgsT_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp
index 1e750a4e177..24f64ef426d 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h
index 46cc793e27c..c9d0b7e8d84 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl
index 6bd3177da08..ca36ea71350 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERINOUT_T_IDL
#define INTERINOUT_T_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc
index beaa6404127..446fec794b5 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_InterInOutT_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=INTERINOUT_T_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl
index 2c7754f66e4..4606361276d 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERINOUT_T_RECEIVER_IDL
#define INTERINOUT_T_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc
index 171b4758762..ab234f36888 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterInOutT_Base InterInOutT_Receiver"
project(AMI_InOutT_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp
index 95b76ca8822..31805222d0c 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h
index d3ddbea0cb2..e9d3d189fdd 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl
index b8580977f44..8b0459297cf 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERINOUT_T_SENDER_IDL
#define INTERINOUT_T_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc
index f74b8d3d27e..cfd661e2a72 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterInOutT_Base InterInOutT_Sender"
project(AMI_InterInOutT_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp
index 72541190ff6..9c366ea45fa 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h
index 40ca3ad586b..a1cabb94032 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl
index 9f1fb3271f4..863814f03f3 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERMULTI_IDL
#define INTERMULTI_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc
index 00b725bc9a3..bb55e1d8bbd 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_InterMulti_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=INTERMULTI_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl
index c640261479c..3fe5a72655e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERMULTI_RECEIVER_IDL
#define INTERMULTI_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc
index 7d28075ee97..965ebad6de6 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterMulti_Base InterMulti_Receiver"
project(AMI_InterMulti_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp
index d282f1cf013..4f4f8c8e443 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h
index 4712333591e..6a6859fea7e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl
index 53381453321..ea17f183764 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERMULTI_SENDER_IDL
#define INTERMULTI_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc
index 736fd1fdc88..7c2b6d0eb15 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterMulti_Base InterMulti_Sender"
project(AMI_InterMulti_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp
index fb9bcac5c43..9cf19bf4e3e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h
index ccb22666c3d..d6a453f7544 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl
index a116fd1b60d..0a997192cd7 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTEROUTARGS_T_IDL
#define INTEROUTARGS_T_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc
index f2f5a2acde1..106d7e3253c 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_InterOutArgsT_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=INTEROUTARGS_T_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl
index c791b74c7a7..77665baf7ab 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTEROUTARGS_T_RECEIVER_IDL
#define INTEROUTARGS_T_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc
index 638b223132e..9188019f8c9 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterOutArgsT_Base InterOutArgsT_Receiver"
project(AMI_OutArgsT_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp
index a2185883ade..13e45fd6855 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h
index 42864f5a52a..5372acfeb14 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl
index 7814eca2003..840ecf1d9da 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTEROUTARGS_T_SENDER_IDL
#define INTEROUTARGS_T_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc
index f7b4be3bec2..e7ef8aa6ca6 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterOutArgsT_Base InterOutArgsT_Sender"
project(AMI_InterOutArgsT_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
index 1db00d4a5c3..f99ffc98895 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h
index d0cae7ca809..7677dbb1cb8 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl
index 449b42cc722..830fb08938f 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERRETURN_T_IDL
#define INTERRETURN_T_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc
index 9a3e12764c8..52d4af7f272 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_InterReturnT_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=INTERRETURN_T_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl
index 9f0740cb97f..a02a5425348 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERRETURN_T_RECEIVER_IDL
#define INTERRETURN_T_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc
index dcb934556f1..d3281beefdb 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterReturnT_Base InterReturnT_Receiver"
project(AMI_ReturnT_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp
index 394ec844235..d63a7fcc2d3 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h
index bdfe86db8ad..96d81b682c2 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl
index a47f82627b8..3e44baa364f 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INTERRETURN_T_SENDER_IDL
#define INTERRETURN_T_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc
index c30da578161..07a6bcb7f80 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p InterReturnT_Base InterReturnT_Sender"
project(AMI_InterReturnT_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
index b1ab0f7cfe6..b5954b11577 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h
index b3b5674b834..131c246af4a 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl
index c58b0556635..e2020190291 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_T_IDL
#define HELLO_T_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc
index edacfb7def5..ed67272061f 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_HelloT_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=HELLO_T_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl
index 74f6e90f055..e4d97c8b3fc 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_T_RECEIVER_IDL
#define HELLO_T_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc
index d146c23f2d4..5999953de14 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p HelloT_Base HelloT_Receiver"
project(AMI_HelloT_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp
index 6f37c2504f3..3972ae62806 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h
index 6ac3acd2227..9e843cc2e30 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl
index 5c8c6c37b11..0073d580692 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_T_SENDER_IDL
#define HELLO_T_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc
index fff938bde86..0e7b0c8eef3 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p HelloT_Base HelloT_Sender"
project(AMI_HelloT_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp
index 43bcf70e62d..82bf197ff09 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h
index f8504b8ecc1..bc2f12dc123 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl
index eadfc36f4e6..92f94d76872 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NOREPLYH_IDL
#define NOREPLYH_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc
index e7f79d6346f..2beb75478e4 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_NoReplyH_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=NOREPLYH_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl
index b6390f44e49..69973ed826a 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NOREPLYH_RECEIVER_IDL
#define NOREPLYH_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc
index 3c62cf93713..0455c415edd 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p NoReplyH_Base NoReplyH_Receiver"
project(AMI_NoReplyH_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp
index 5100318313d..afdbef89d97 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h
index 122166b703c..bbfc6add7a5 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl
index 3be17b68f0c..6558b429398 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NOREPLYH_SENDER_IDL
#define NOREPLYH_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc
index f2decc6fb0c..9ea5f80ec14 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p NoReplyH_Base NoReplyH_Sender"
project(AMI_NoReplyH_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp
index 7f51c4f3857..7bdb81d812a 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h
index 78f321051f0..b1ca991cab8 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl
index 58f5217f3bf..63dac05ef1f 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ONEPROCESS_IDL
#define ONEPROCESS_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc
index a78f366cf1f..d95c388d446 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_OneProcess_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=ONEPROCESS_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl
index ca77a65f758..3c6e8370312 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ONEPROCESS_RECEIVER_IDL
#define ONEPROCESS_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc
index e818a82b143..69474e0a621 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p OneProcess_Base OneProcess_Receiver"
project(AMI_OneProcess_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp
index 02e126426d5..d5a810ed47f 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h
index 13eeb145996..7dc5d7be4b7 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl
index e227ec7b6fd..40a01d136ee 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ONEPROCESS_SENDER_IDL
#define ONEPROCESS_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc
index ccf61f94ed7..34648144487 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p OneProcess_Base OneProcess_Sender"
project(AMI_OneProcess_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp
index 2ee199a409a..34c27908d87 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h
index c20b5556d3f..f2dabd4136e 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl
index 7faba3ce2e3..ae50eec2191 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ONEREPLYH_T_IDL
#define ONEREPLYH_T_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc
index 4a1ebbfc3d8..290f7ff1edb 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_OneReplyH_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=ONEREPLYH_T_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl
index 7a969b40dc1..1ce93c3ed9c 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ONEREPLYH_T_RECEIVER_IDL
#define ONEREPLYH_T_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc
index ac52652ba3e..ac45051ab56 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p OneReplyH_Base OneReplyH_Receiver"
project(AMI_OneRep_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp
index 93b28334107..134d15024b2 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h
index 2d4eb2685dc..0deb6e181b8 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl
index 4f676accbd3..c79e67aa9a8 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ONEREPLYH_T_SENDER_IDL
#define ONEREPLYH_T_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc
index 7afdccd8acc..ac195d708e4 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p OneReplyH_Base OneReplyH_Sender"
project(AMI_OneReplyH_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp
index 1a03bcb2bcb..7d3cc436b3d 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h
index 8df9542b58f..b30c3036300 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl
index e5fe28e7b47..456dcd1f829 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PRAGMAT_IDL
#define PRAGMAT_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc
index 1feb57147ef..ee11910389e 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_PragmaT_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=PRAGMAT_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl
index 792408478db..c98d382f11e 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PRAGMAT_RECEIVER_IDL
#define PRAGMAT_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc
index 66504085342..563ad55bba1 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p PragmaT_Base PragmaT_Receiver"
project(AMI_PTB_PragmaT_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp
index e15a17020ae..1d618f57f74 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "PragmaT_Receiver_exec.h"
#include "ace/OS_NS_unistd.h"
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h
index 3288bf5f75b..16c4019986e 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_PRAGMAT_RECEIVER_EXEC_H_
#define CIAO_PRAGMAT_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl
index 79ca9f86b33..9cf40bb9230 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PRAGMAT_SENDER_IDL
#define PRAGMAT_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc
index 049130ed6aa..2d26735edd4 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p PragmaT_Base PragmaT_Sender"
project(AMI_PTB_PragmaT_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp
index 8814a4fd59c..0bb16e1fabf 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h
index e232033b858..3356b1e4a6b 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl
index 8604dd12be7..c54d0b5a533 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef USESSM_IDL
#define USESSM_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc
index 8630aa1c99b..ec8b63e6789 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_UsesSM_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=USESSM_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl
index 69553bc40c8..b2133fdcb08 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef USESSM_RECEIVER_IDL
#define USESSM_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc
index e98ec843155..5612bf116be 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p UsesSM_Base UsesSM_Receiver"
project(AMI_UsesSM_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp
index b2b2e4ebb57..23cc4900c5f 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h
index abedaa267a9..0ebd23dd9a3 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl
index 3a13a993d90..f084fdb7443 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef USESSM_SENDER_IDL
#define USESSM_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
index 5f102d474a3..7e47112496d 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p UsesSM_Base UsesSM_Sender"
project(AMI_UsesSM_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp
index 05808fd1baa..ace2ce02c67 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h
index e9f185cfb31..7593aba1d1a 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl
index d6a7c4a2ec1..9cc1ee019da 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_IDL
#define HELLO_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc
index 12d5452537d..07c05fb9270 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(SyncPortCon_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl
index 242594e5681..f7f1ff0006b 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_RECEIVER_IDL
#define HELLO_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc
index e15e1463658..f8e8d96b975 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Receiver"
project(SPC_Base_Hello_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp
index 46cc01778cd..b764c189b0d 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Hello_Receiver_exec.h"
#include "ace/OS_NS_unistd.h"
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h
index 74034637e62..3193b13a9b8 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_HELLO_RECEIVER_EXEC_H_
#define CIAO_HELLO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl
index 993f1c80171..d30c50afca0 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_SENDER_IDL
#define HELLO_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc
index 46913c132bb..62e1a3f0fb1 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Sender"
project(SyncPortCon_Base_Hello_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp
index 7088f29d52a..6ac11387a25 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h
index 5926dbd48a9..96bc8ed84b5 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl
index 3d4d8717f3b..2c7ec8b2940 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef THREECOMP_IDL
#define THREECOMP_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
index 1188513c366..bec7c29c3a4 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(AMI_ThreeComp_no_ami_dl_gen) : componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=THREECOMP_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl
index 4a9b94e8ee8..702224cc6b2 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef THREECOMP_NO_AMI_IDL
#define THREECOMP_NO_AMI_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl
index 2bdc67d368f..d8db5d6e2d4 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef THREECOMP_MASTER_IDL
#define THREECOMP_MASTER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc
index 6b293e4ac14..ab86da6e178 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p ThreeComp_Base ThreeComp_Master"
project(AMI_ThreeComp_Base_Master_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp
index fd7ec183456..1f8a20e7b47 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h
index 1d98bb8c6ed..20f8136f722 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl
index ee931b5b800..efd4c52c819 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef THREECOMP_RECEIVER_IDL
#define THREECOMP_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc
index 26fd307b0fd..010c2e09ad1 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p ThreeComp_Base ThreeComp_Receiver"
project(AMI_ThreeComp_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp
index ea926503318..654a57ecd3e 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h
index ffc02c6d60c..28d09505f7b 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl
index 87ce3a91444..60ee17a49a9 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef THREECOMP_SENDER_IDL
#define THREECOMP_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc
index 98b5ce181fd..5c5ff3307f9 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p ThreeComp_Base ThreeComp_Sender"
project(AMI_ThreeComp_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp
index 8d608e98fd8..ebfd12e68e2 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h
index 9f266244c7b..83c6fbe716c 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl
index 2dd2e977108..9c7e64b75ff 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef USESMULTI_IDL
#define USESMULTI_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc
index e08f01bcef2..718be35730f 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_UsesMulti_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=USESMULTI_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl
index de2454ef384..a1bd29e47ea 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef USESMULTI_RECEIVER_IDL
#define USESMULTI_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc
index ffaad2e534c..21b0ea12933 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p UsesMulti_Base UsesMulti_Receiver"
project(AMI_UsesMulti_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp
index f2551f788fd..c24bdc09c4b 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h
index 903690f40c9..b6bdeb3c260 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl
index 37b78de521c..7b91e3e39a9 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef USESMULTI_SENDER_IDL
#define USESMULTI_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
index 1c24b38c1ea..8d28ac61253 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p UsesMulti_Base UsesMulti_Sender"
project(AMI_UsesMulti_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp
index b92ae629dd2..7b2c4555ad6 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h
index 46cfa5d1372..cbe2be184f7 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
* TAO and the TAO IDL Compiler have been developed by: