Removed single line Id tag

102 files changed, 0 insertions, 190 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl
index edfe78462e6..de514308408 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file Base.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
index 7f7f0e89155..351304a0a57 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_Base_stub) : ndds_ts_defaults, nddslib {
   sharedname = QC_Base_stub
   dynamicflags += NDDS_USER_DLL_EXPORT
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
index f9ef365f6be..7a9b9e20b27 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
   exename = DDS_receiver
   after += QC_Base_stub
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
index e2e79ab6be6..72620a0ce0f 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include <stdio.h>
 #include <iostream>
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
index 0b7106f40f7..a58d846f7cd 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
   exename = DDS_Sender
   after += QC_Base_stub
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
index a1b90de2756..3c018dc45f2 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include <stdio.h>
 #include <iostream>
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl
index a79c3bac4d6..57e69fd440c 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file Base_ObO.idl
  * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
index 624f91e0fc7..89919baf0de 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(Base_obo_stub) : ndds_ts_defaults, nddslib {
   sharedname = Base_obo_stub
   dynamicflags += NDDS_USER_DLL_EXPORT
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
index 856c3d75054..e42dd1dad99 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
   exename = DDS_ObO_receiver
   after += Base_obo_stub
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
index a3ddb129183..e2e21d90d6b 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include <stdio.h>
 #include <iostream>
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
index da502e4a8be..1f88cb930a2 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
   exename = DDS_ObO_Sender
   after += Base_obo_stub
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
index 1654dbc9aa6..b4fd5eae5e3 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include <stdio.h>
 #include <iostream>
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
index 4d34a3a9642..fd242249ca4 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file Different_Test_Base.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc
index cbf25b65e1f..e547afe5044 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_Different_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
   sharedname = QC_Different_Test_Base_stub
   dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
index 4ad15e84dc3..ac2292fbeff 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file Different_Test_Connector.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
index d07b8fc70f6..9ec837bc806 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p Different_Test_Base -l .. -o ../lib -u DDS Different_Test_Connector"
 
 project(QC_Different_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl
index b542838177a..3c2cac4f3dd 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
index 85dd243f6e1..263e0419596 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_Different_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += QC_Different_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp
index 085a954daca..78b7c696c59 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_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/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h
index dabbd66b86c..2f38be10194 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_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/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl
index 67469419acf..9fcd7823e7b 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @author Marcel Smit (msmit@remedy.nl)
  */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
index 3e74d8a83c8..618c9190c21 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p Different_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
 project(QC_Different_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp
index 3b7476f8fd8..f9b4abe9103 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_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/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h
index 12eed3be4a8..547e17478ab 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_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/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
index 4d913b84600..f0bfd6bcc95 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCLE_Test_Base.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
index ca08e0faa86..e9918ebd97a 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project (DDS_QCLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
   sharedname = DDS_QCLE_Test_Base_stub
   dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
index 2eb67f256b6..8224dd82403 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCLE_Test_Connector.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
index 1ad731daf88..da83149c589 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_QCLE_Test_Base -l .. -o ../lib -u DDS QCLE_Test_Connector"
 
 project(DDS_QCLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl
index a1935dcb066..613ef825f4c 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
index d92762f9355..df60dc7545c 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(DDS_QCLE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_QCLE_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
index d35e45297e2..189a1b08bf8 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_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/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h
index a07f78821f0..00745c85c30 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_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/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl
index d79d083c370..174c6d68a69 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @author Marcel Smit (msmit@remedy.nl)
  */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
index 7f18230f3b7..6db4c023bf0 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_QCLE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
 project(DDS_QCLE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp
index b389941d6c9..4da701e33f9 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_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/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h
index 883927595a1..63db4bc3888 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_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/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl
index 96ffdf45aa3..b61d30c7687 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file ReadGet_Starter.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
index 45aed08f861..4c41bda9f0c 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_ReadGet_Starter_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
index 28777250a83..7fadf380e9f 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file ReadGet_Test_Base.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
index eeb0924eafa..ee8127d2cb3 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
   sharedname = QC_ReadGet_Test_Base_stub
   dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
index 236350ae43e..7a280e41771 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file ReadGet_Test_Connector.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
index 9e15bab2cc4..bf66a086bcf 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l .. -o ../lib -u DDS ReadGet_Test_Connector"
 
 project(QC_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl
index 40e9de1358f..d77408ba757 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
index 7921cbe4a6b..ff25d209f83 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += QC_ReadGet_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
index cd60ba372aa..cc2da4b2fb7 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_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/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
index 2fe19148bf7..9411f74f4b6 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_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/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl
index b26e38606f5..fa2aa12902b 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @author Marcel Smit (msmit@remedy.nl)
  */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
index 646e41736db..324b3be379a 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
 project(QC_ReadGet_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
index 7c94538c738..65ef479b4dc 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_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/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h
index 4112b908875..f0e764a708b 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_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/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
index c72cf2b58c8..2f470af6d24 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCLS_Test_Base.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
index 3fc6115838c..99a8da1826c 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project (DDS_QCLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
   sharedname = DDS_QCLS_Test_Base_stub
   dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
index 224095e188b..02f87bf8135 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCLS_Test_Connector.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
index 9fbd812bac4..345969c2e1d 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_QCLS_Test_Base -l .. -o ../lib -u DDS QCLS_Test_Connector"
 
 project(DDS_QCLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl
index 18d4713a28a..6aaeda5aab0 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
index 2065079617c..d5fb10e8472 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(DDS_QCLS_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_QCLS_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
index aa5e30712b8..86b3ac813d2 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_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/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h
index dc16e67aeab..d6667fb3fda 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_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/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl
index 02fa2305038..c82196ec2cd 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @author Marcel Smit (msmit@remedy.nl)
  */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
index 24faaafecbc..78a9a56c2a8 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_QCLS_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
 project(DDS_QCLS_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp
index f11b1e57f1d..7189daaa26b 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_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/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h
index fc4af09deaa..a30ac6593d5 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_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/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
index 1187a550ff6..9d99e5b6378 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCTL_Test_Base.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc
index 16fa59d6046..d15827ffb44 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project (DDS_QCTL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
   sharedname = DDS_QCTL_Test_Base_stub
   dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
index 7cc6e4531d5..b58d65550e9 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCTL_Test_Connector.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
index 4e9865eaa5e..0a40f94e8c0 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_QCTL_Test_Base -l .. -o ../lib -u DDS QCTL_Test_Connector"
 
 project(DDS_QCTL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl
index d168e0d1cfd..38fc0004b02 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
index cd83936e9ad..916535d17c6 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(DDS_QCTL_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_QCTL_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
index e9557c069e0..2dd12cfab1e 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_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/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h
index 9be3fc31d93..58165f75751 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_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/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl
index d842e42258c..c91392633f0 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @author Marcel Smit (msmit@remedy.nl)
  */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
index b7ebbab66fb..ffe3bb76dcc 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_QCTL_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
 project(DDS_QCTL_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp
index 614a36aeb76..ed9a7139adc 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_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/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h
index c6286103291..8782e933fc1 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_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/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl
index dba4e9029bb..55aafc4a95c 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCTQ_Starter.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
index 2d00901a16b..6928a4e4c83 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_QCTQ_Starter_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
index 9b5350a907d..ef66771bb8f 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCTQ_Test_Base.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc
index 0db482de683..f959ec8a225 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_QCTQ_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
   sharedname = QC_QCTQ_Test_Base_stub
   dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
index 9d508eb22d5..069d2eda9b8 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCTQ_Test_Connector.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
index 96c96578e2c..091cfc4ba36 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p QCTQ_Test_Base -l .. -o ../lib -u DDS QCTQ_Test_Connector"
 
 project(QC_QCTQ_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl
index 3380f64f114..80d9f1fb76e 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
index d785375eda8..f38fa33da42 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_QCTQ_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += QC_QCTQ_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp
index e5b7a048cc7..5982d0f880f 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_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/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h
index c8594d026d9..de5c32eda55 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_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/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl
index e18fed998da..0b691cb570e 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @author Marcel Smit (msmit@remedy.nl)
  */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
index 021a1f623b5..22fb33b6792 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p QCTQ_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
 project(QC_QCTQ_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp
index 3559a7abbfb..6f3213ead99 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_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/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h
index 94bcb835bcb..37b8f265fb3 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_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/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl
index 1df785fdeed..d9b7dc87807 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCTQM_Starter.idl
  * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
index f18a0f3624b..d5696898dd6 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_QCTQM_Starter_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
index 4b954e793f2..71a086999ce 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCTQM_Test_Base.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc
index aa5b613b3d6..148f7d99637 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_QCTQM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
   sharedname = QC_QCTQM_Test_Base_stub
   dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
index 3bb9f1b35a2..a390ca52507 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file QCTQM_Test_Connector.idl
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
index 367081673e0..cbbeffe6a03 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p QCTQM_Test_Base -l .. -o ../lib -u DDS QCTQM_Test_Connector"
 
 project(QC_QCTQM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl
index a3909c94041..5b6a79bf452 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @file
  * @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
index 165c2188ece..d81eac6889b 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(QC_QCTQM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += QC_QCTQM_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp
index ba8c0a6d03e..58bd8cc763f 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_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/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h
index 63f15dae3c1..43cec44cf93 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_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/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
index 9664f266b30..90894c16c64 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /**
  * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
  */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
index d100e1c039b..07f150ee5b1 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
 // This file is generated with "generate_component_mpc.pl -p QCTQM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
 project(QC_QCTQM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp
index 5be294199a3..214e6d60e30 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_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/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h
index 90038927f66..2a991d94156 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_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: