summaryrefslogtreecommitdiff
path: root/CIAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
commitc88815f2039e7152d735c18650c102df84d9aa36 (patch)
treea703b59c98e6739970c4f3b51396c2284c9ce12b /CIAO
parent0fbdabcd0a8970712cbbdef06465d061a4ec13c4 (diff)
downloadATCD-c88815f2039e7152d735c18650c102df84d9aa36.tar.gz
Removed single line Id tag
Diffstat (limited to 'CIAO')
-rw-r--r--CIAO/ccm/CCM_Base.idl1
-rw-r--r--CIAO/ccm/CCM_CCMException.idl1
-rw-r--r--CIAO/ccm/CCM_Configurator.idl1
-rw-r--r--CIAO/ccm/CCM_Context.idl1
-rw-r--r--CIAO/ccm/CCM_Cookie.idl3
-rw-r--r--CIAO/ccm/CCM_EnterpriseComponent.idl1
-rw-r--r--CIAO/ccm/CCM_Enumeration.idl1
-rw-r--r--CIAO/ccm/CCM_EventBase.idl1
-rw-r--r--CIAO/ccm/CCM_EventConsumerBase.idl1
-rw-r--r--CIAO/ccm/CCM_Events.idl1
-rw-r--r--CIAO/ccm/CCM_Exceptions.idl1
-rw-r--r--CIAO/ccm/CCM_ExecutorLocator.idl1
-rw-r--r--CIAO/ccm/CCM_Home.idl1
-rw-r--r--CIAO/ccm/CCM_HomeConfiguration.idl1
-rw-r--r--CIAO/ccm/CCM_HomeExecutorBase.idl2
-rw-r--r--CIAO/ccm/CCM_HomeFinder.idl1
-rw-r--r--CIAO/ccm/CCM_Homes.idl1
-rw-r--r--CIAO/ccm/CCM_KeylessCCMHome.idl1
-rw-r--r--CIAO/ccm/CCM_Navigation.idl3
-rw-r--r--CIAO/ccm/CCM_Object.idl1
-rw-r--r--CIAO/ccm/CCM_PrimaryKeyBase.idl1
-rw-r--r--CIAO/ccm/CCM_Receptacle.idl3
-rw-r--r--CIAO/ccm/CCM_StandardConfigurator.idl1
-rw-r--r--CIAO/ccm/CCM_Transaction.idl1
-rw-r--r--CIAO/ccm/CCM_lem_stub.mpc2
-rw-r--r--CIAO/ccm/CCM_stub.mpc2
-rw-r--r--CIAO/ccm/CCM_svnt.mpc2
-rw-r--r--CIAO/ccm/Components.idl2
-rw-r--r--CIAO/ccm/CosPersistentState.idl2
-rw-r--r--CIAO/ccm/Entity/CCM_ComponentId.idl1
-rw-r--r--CIAO/ccm/Entity/CCM_Entity2Context.idl1
-rw-r--r--CIAO/ccm/Entity/CCM_EntityComponent.idl1
-rw-r--r--CIAO/ccm/Entity/CCM_EntityContext.idl1
-rw-r--r--CIAO/ccm/Entity/CCM_StateIdFactory.idl1
-rw-r--r--CIAO/ccm/Entity/CCM_entity_svnt.mpc2
-rw-r--r--CIAO/ccm/Extended/CCM_BadComponentReference.idl1
-rw-r--r--CIAO/ccm/Extended/CCM_CCM2Context.idl1
-rw-r--r--CIAO/ccm/Extended/CCM_HomeRegistration.idl2
-rw-r--r--CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl1
-rw-r--r--CIAO/ccm/Session/CCM_Session2Context.idl1
-rw-r--r--CIAO/ccm/Session/CCM_SessionComponent.idl2
-rw-r--r--CIAO/ccm/Session/CCM_SessionContext.idl2
-rw-r--r--CIAO/ccm/Session/CCM_SessionSynchronization.idl1
-rw-r--r--CIAO/ccm/Session/CCM_session.mpc2
-rw-r--r--CIAO/ciao/Base/CIAO_Base.mpc2
-rw-r--r--CIAO/ciao/Base/CIAO_Exceptions.idl2
-rw-r--r--CIAO/ciao/Base/Client_init.cpp2
-rw-r--r--CIAO/ciao/Base/Client_init.h2
-rw-r--r--CIAO/ciao/Base/Server_init.cpp2
-rw-r--r--CIAO/ciao/Base/Server_init.h2
-rw-r--r--CIAO/ciao/Containers/Container_Base_T.cpp2
-rw-r--r--CIAO/ciao/Containers/Containers.mpc2
-rw-r--r--CIAO/ciao/Containers/Session/Session_Container.cpp2
-rw-r--r--CIAO/ciao/Containers/Session/Session_Container.mpc2
-rw-r--r--CIAO/ciao/Contexts/Context_Impl_Base_T.cpp2
-rw-r--r--CIAO/ciao/Contexts/Session/Session_Context_T.cpp2
-rw-r--r--CIAO/ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc1
-rw-r--r--CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp1
-rw-r--r--CIAO/ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h1
-rw-r--r--CIAO/ciao/Deployment/Handlers/CIAO_State.cpp2
-rw-r--r--CIAO/ciao/Deployment/Handlers/Component_Handler.cpp2
-rw-r--r--CIAO/ciao/Deployment/Handlers/Component_Handler.h2
-rw-r--r--CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp1
-rw-r--r--CIAO/ciao/Deployment/Handlers/Container_Handler.cpp2
-rw-r--r--CIAO/ciao/Deployment/Handlers/Container_Handler.h2
-rw-r--r--CIAO/ciao/Deployment/Handlers/Home_Handler.cpp2
-rw-r--r--CIAO/ciao/Deployment/Handlers/Home_Handler.h2
-rw-r--r--CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp2
-rw-r--r--CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h2
-rw-r--r--CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc1
-rw-r--r--CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h1
-rw-r--r--CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp2
-rw-r--r--CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h2
-rw-r--r--CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp2
-rw-r--r--CIAO/ciao/Logger/CIAO_Logger_Export.h1
-rw-r--r--CIAO/ciao/Logger/Log_Macros.cpp2
-rw-r--r--CIAO/ciao/Logger/Log_Macros.h1
-rw-r--r--CIAO/ciao/Logger/Logger.mpc2
-rw-r--r--CIAO/ciao/Logger/Logger_Service.cpp1
-rw-r--r--CIAO/ciao/Logger/Logger_Service.h2
-rw-r--r--CIAO/ciao/Servants/CIAO_Servant_Impl_export.h1
-rw-r--r--CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp2
-rw-r--r--CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp2
-rw-r--r--CIAO/ciao/Servants/Facet_Servant_Base_T.cpp2
-rw-r--r--CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp2
-rw-r--r--CIAO/ciao/Servants/Home_Servant_Impl_T.cpp2
-rw-r--r--CIAO/ciao/Servants/Servant_Impl_Base.cpp2
-rw-r--r--CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp2
-rw-r--r--CIAO/ciao/Servants/Servants.mpc2
-rw-r--r--CIAO/ciao/Servants/Session/Servant_Impl_T.cpp2
-rw-r--r--CIAO/ciao/Servants/StandardConfigurator_Impl.cpp2
-rw-r--r--CIAO/ciao/Valuetype_Factories/ConfigValue.cpp2
-rw-r--r--CIAO/ciao/Valuetype_Factories/ConfigValue.h2
-rw-r--r--CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h1
-rw-r--r--CIAO/ciao/Valuetype_Factories/Cookie_Export.h1
-rw-r--r--CIAO/ciao/Valuetype_Factories/Cookies.cpp2
-rw-r--r--CIAO/ciao/Valuetype_Factories/Cookies.h2
-rw-r--r--CIAO/ciao/Valuetype_Factories/Cookies.inl2
-rw-r--r--CIAO/ciao/Version.h1
-rw-r--r--CIAO/ciao/install_ciao_headers.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl2
-rw-r--r--CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.idl2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc1
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h2
-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
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp2
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h1
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ccm_dds.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl1
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl1
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl1
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ConditionManager.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ConditionManager.h2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h1
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h1
-rw-r--r--CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/Getter_T.cpp3
-rw-r--r--CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/LocalObject.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/LocalObject.h2
-rw-r--r--CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/LocalObject_T.h2
-rw-r--r--CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/PublisherListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/Reader_T.cpp4
-rw-r--r--CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h2
-rw-r--r--CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/TimeUtilities.h2
-rw-r--r--CIAO/connectors/dds4ccm/impl/TopicListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/Updater_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/Utils.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/Writer_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h1
-rw-r--r--CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h1
-rw-r--r--CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h1
-rw-r--r--CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h2
-rw-r--r--CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h1
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Derived/Derived.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/main.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/policies.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/states_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl2
-rwxr-xr-xCIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl2
-rwxr-xr-xCIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc1
-rw-r--r--CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h2
-rw-r--r--CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc2
-rw-r--r--CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp2
-rw-r--r--CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h2
-rw-r--r--CIAO/examples/BasicSP/BMDevice/BMDevice.mpc2
-rw-r--r--CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp2
-rw-r--r--CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h2
-rw-r--r--CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc2
-rw-r--r--CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp2
-rw-r--r--CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h2
-rw-r--r--CIAO/examples/BasicSP/BasicSP.idl1
-rw-r--r--CIAO/examples/BasicSP/BasicSP.mpc1
-rw-r--r--CIAO/examples/BasicSP/EC/EC.idl1
-rw-r--r--CIAO/examples/BasicSP/EC/EC.mpc2
-rw-r--r--CIAO/examples/BasicSP/EC/EC_exec.cpp2
-rw-r--r--CIAO/examples/BasicSP/EC/EC_exec.h2
-rw-r--r--CIAO/examples/BasicSP/EC/client.cpp2
-rw-r--r--CIAO/examples/BasicSP/EC/controller.cpp2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator.idl2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.cpp2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.cpp2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/History.idl2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Message.idl2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Messenger.idl2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Publication.idl2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Receiver.idl2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Runnable.idl2
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp1
-rw-r--r--CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h1
-rw-r--r--CIAO/examples/Display/Display_Base/Display_Base.idl2
-rw-r--r--CIAO/examples/Display/Display_Base/Display_Base.mpc1
-rw-r--r--CIAO/examples/Display/GPS/GPS.idl2
-rw-r--r--CIAO/examples/Display/GPS/GPS.mpc1
-rw-r--r--CIAO/examples/Display/GPS/GPSEI.idl2
-rw-r--r--CIAO/examples/Display/GPS/GPS_exec.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplay/NavDisplay.idl2
-rw-r--r--CIAO/examples/Display/NavDisplay/NavDisplay.mpc1
-rw-r--r--CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplay/NavDisplay_exec.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/Command.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/DetailView.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/DetailView.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/MapView.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/MapView.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.h2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/Worker.cpp2
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/Worker.h2
-rw-r--r--CIAO/examples/Display/RateGen/RateGen.idl2
-rw-r--r--CIAO/examples/Display/RateGen/RateGen.mpc1
-rw-r--r--CIAO/examples/Display/RateGen/RateGen_exec.cpp2
-rw-r--r--CIAO/examples/Display/RateGen/RateGen_exec.h2
-rw-r--r--CIAO/examples/Display/RateGen/controller.cpp2
-rw-r--r--CIAO/examples/Hello/Base/Hello.idl2
-rw-r--r--CIAO/examples/Hello/Base/Hello.mpc2
-rw-r--r--CIAO/examples/Hello/Receiver/Hello_Receiver.idl2
-rw-r--r--CIAO/examples/Hello/Receiver/Hello_Receiver.mpc1
-rw-r--r--CIAO/examples/Hello/Receiver/Hello_Receiver_exec.cpp2
-rw-r--r--CIAO/examples/Hello/Receiver/Hello_Receiver_exec.h2
-rw-r--r--CIAO/examples/Hello/Sender/Hello_Sender.idl2
-rw-r--r--CIAO/examples/Hello/Sender/Hello_Sender.mpc1
-rw-r--r--CIAO/examples/Hello/Sender/Hello_Sender_exec.cpp2
-rw-r--r--CIAO/examples/Hello/Sender/Hello_Sender_exec.h2
-rw-r--r--CIAO/examples/Hello_Event/Hello_Base/Hello_Base.mpc1
-rw-r--r--CIAO/examples/Hello_Event/Receiver/Receiver.mpc1
-rw-r--r--CIAO/examples/Hello_Event/Receiver/Receiver_exec.cpp2
-rw-r--r--CIAO/examples/Hello_Event/Receiver/Receiver_exec.h2
-rw-r--r--CIAO/examples/Hello_Event/Sender/Sender.mpc1
-rw-r--r--CIAO/examples/Hello_Event/Sender/Sender_exec.cpp2
-rw-r--r--CIAO/examples/Hello_Event/Sender/Sender_exec.h2
-rw-r--r--CIAO/examples/Null_Component/Null_Component.mpc1
-rw-r--r--CIAO/examples/Null_Component/Null_Interface.mpc1
-rw-r--r--CIAO/performance-tests/Benchmark/Benchmark.idl1
-rw-r--r--CIAO/performance-tests/Benchmark/Benchmark.mpc1
-rw-r--r--CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp2
-rw-r--r--CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc2
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl1
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc1
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl2
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp2
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTrip/client.cpp2
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl1
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc1
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl2
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp2
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h2
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp2
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp2
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc1
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp2
-rw-r--r--CIAO/performance-tests/Benchmark/server.cpp2
-rw-r--r--CIAO/performance-tests/Protocols/Controller/Controller.cpp2
-rw-r--r--CIAO/performance-tests/Protocols/Controller/Controller.mpc2
-rw-r--r--CIAO/performance-tests/Protocols/Receiver/Receiver.idl2
-rw-r--r--CIAO/performance-tests/Protocols/Receiver/Receiver.mpc1
-rw-r--r--CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp2
-rw-r--r--CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h2
-rw-r--r--CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp2
-rw-r--r--CIAO/performance-tests/Protocols/Sender/Sender.idl2
-rw-r--r--CIAO/performance-tests/Protocols/Sender/Sender.mpc1
-rw-r--r--CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp2
-rw-r--r--CIAO/performance-tests/Protocols/Sender/Sender_exec.h2
-rw-r--r--CIAO/performance-tests/Protocols/common/Protocols.idl1
-rw-r--r--CIAO/performance-tests/Protocols/common/Protocols.mpc1
-rw-r--r--CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl2
-rw-r--r--CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc1
-rw-r--r--CIAO/tests/Bug_3769_Regression/Foo.idl2
-rw-r--r--CIAO/tests/Bug_3769_Regression/Foo_exec.cpp2
-rw-r--r--CIAO/tests/Bug_3769_Regression/Foo_exec.h2
-rw-r--r--CIAO/tests/Bug_3817_Regression/Bar.idl2
-rw-r--r--CIAO/tests/Bug_3817_Regression/Bar.mpc1
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompA.idl2
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompA.mpc1
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompA_exec.cpp2
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompA_exec.h2
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompB.idl2
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompB.mpc1
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompB_exec.cpp2
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompB_exec.h2
-rw-r--r--CIAO/tests/Bug_3834_Regression/Moo.idl2
-rw-r--r--CIAO/tests/Bug_3834_Regression/Moo.mpc1
-rw-r--r--CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc1
-rw-r--r--CIAO/tests/Bug_3890_Regression/Foo.idl2
-rw-r--r--CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl2
-rw-r--r--CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl2
-rw-r--r--CIAO/tests/Bug_3944_Regression/base_connector_conn.idl2
-rw-r--r--CIAO/tests/Bug_3944_Regression/connector_conn.idl2
-rw-r--r--CIAO/tests/Bug_3944_Regression/connector_inst_conn.idl2
-rw-r--r--CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl2
-rw-r--r--CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc1
-rw-r--r--CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl1
-rw-r--r--CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc1
-rw-r--r--CIAO/tests/Bug_4086_Regression/Bug_4086_Regression.mpc1
-rw-r--r--CIAO/tests/Bug_4086_Regression/Foo.idl2
-rw-r--r--CIAO/tests/Bug_4086_Regression/Foo_exec.cpp2
-rw-r--r--CIAO/tests/Bug_4086_Regression/Foo_exec.h2
-rw-r--r--CIAO/tests/Bug_4087_Regression/test.idl2
-rw-r--r--CIAO/tests/CIDL/CodeGen/Basic.idl1
-rw-r--r--CIAO/tests/CIDL/CodeGen/Basic.mpc1
-rw-r--r--CIAO/tests/CIDL/CodeGen/CodeGen.mpc1
-rw-r--r--CIAO/tests/CIF/Common/CIF_Common.cpp2
-rw-r--r--CIAO/tests/CIF/Common/CIF_Common.h1
-rw-r--r--CIAO/tests/CIF/Common/CIF_Common.mpc2
-rw-r--r--CIAO/tests/CIF/Common/CIF_Common_export.h2
-rw-r--r--CIAO/tests/CIF/Component/CIF_Component.idl2
-rw-r--r--CIAO/tests/CIF/Component/CIF_Component.mpc1
-rw-r--r--CIAO/tests/CIF/Component/CIF_Component_exec.cpp2
-rw-r--r--CIAO/tests/CIF/Component/CIF_Component_exec.h2
-rw-r--r--CIAO/tests/CIF/Events/Events.mpc2
-rw-r--r--CIAO/tests/CIF/Events/client.cpp2
-rw-r--r--CIAO/tests/CIF/Navigation/Navigation.mpc2
-rw-r--r--CIAO/tests/CIF/Navigation/client.cpp2
-rw-r--r--CIAO/tests/CIF/Receptacle/Receptacle.mpc2
-rw-r--r--CIAO/tests/CIF/Receptacle/client.cpp2
-rw-r--r--CIAO/tests/Collocation/Coll_Base/Base.idl1
-rw-r--r--CIAO/tests/Collocation/Coll_Base/Base.mpc1
-rw-r--r--CIAO/tests/Collocation/Receiver/Receiver.idl2
-rw-r--r--CIAO/tests/Collocation/Receiver/Receiver.mpc1
-rw-r--r--CIAO/tests/Collocation/Receiver/Receiver_exec.cpp2
-rw-r--r--CIAO/tests/Collocation/Receiver/Receiver_exec.h2
-rw-r--r--CIAO/tests/Collocation/Sender/Sender.idl1
-rw-r--r--CIAO/tests/Collocation/Sender/Sender.mpc1
-rw-r--r--CIAO/tests/Collocation/Sender/Sender_exec.cpp2
-rw-r--r--CIAO/tests/Collocation/Sender/Sender_exec.h2
-rw-r--r--CIAO/tests/Cookies/Cookie.cpp2
-rw-r--r--CIAO/tests/Cookies/Cookies.mpc2
-rw-r--r--CIAO/tests/Cookies/client.cpp2
-rw-r--r--CIAO/tests/Cookies/server.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/ProcessColocation.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/ProcessColocation.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/ProcessColocation_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/Progressive.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/Progressive.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/Progressive_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/Progressive_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleAttribute.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleAttribute.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleAttribute_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleAttribute_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleCommon.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleCommon.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleConsumer.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleConsumer.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleConsumer_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleEmitter.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleEmitter.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleEmitter_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleEmitter_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleFailure.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleFailure.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleFailure_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleFailure_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleLocalProvider.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleLocalUser.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNilFacetUser.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNull.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNull.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNull_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleNull_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleProvider.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleProvider.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleProvider_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimplePublisher.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimplePublisher.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimplePublisher_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimplePublisher_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleUser.idl2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleUser.mpc1
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Components/SimpleUser_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp1
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h2
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h1
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_export.h1
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl2
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc1
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp2
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h2
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.idl2
-rw-r--r--CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc1
-rw-r--r--CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Launch-Failures/Interceptors/Interceptors.mpc1
-rw-r--r--CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.cpp2
-rw-r--r--CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.h1
-rw-r--r--CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error_Export.h1
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.idl2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.idl2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.idl2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h2
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl2
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc1
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl2
-rwxr-xr-xCIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc1
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h2
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl2
-rwxr-xr-xCIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc1
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h2
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl2
-rwxr-xr-xCIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc1
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h2
-rw-r--r--CIAO/tests/DAnCE/StoreReferences/StoreReferences.mpc2
-rw-r--r--CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.h2
-rw-r--r--CIAO/tests/DAnCE/StoreReferences/client.cpp2
-rw-r--r--CIAO/tests/DAnCE/Threading/Base/Threading.idl2
-rw-r--r--CIAO/tests/DAnCE/Threading/Base/Threading.mpc1
-rw-r--r--CIAO/tests/DAnCE/Threading/Component1/Component1.idl2
-rwxr-xr-xCIAO/tests/DAnCE/Threading/Component1/Component1.mpc1
-rw-r--r--CIAO/tests/DAnCE/Threading/Component1/Component1_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Threading/Component1/Component1_exec.h2
-rw-r--r--CIAO/tests/DAnCE/Threading/Component2/Component2.idl2
-rwxr-xr-xCIAO/tests/DAnCE/Threading/Component2/Component2.mpc1
-rw-r--r--CIAO/tests/DAnCE/Threading/Component2/Component2_exec.cpp2
-rw-r--r--CIAO/tests/DAnCE/Threading/Component2/Component2_exec.h2
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl1
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc1
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl1
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc1
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl1
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc1
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl1
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc1
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl1
-rw-r--r--CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc1
-rw-r--r--CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl1
-rw-r--r--CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc1
-rw-r--r--CIAO/tests/IDL3/Connectors/incorrect_consumes.idl2
-rw-r--r--CIAO/tests/IDL3/Connectors/incorrect_emits.idl2
-rw-r--r--CIAO/tests/IDL3/Connectors/incorrect_publishes.idl2
-rw-r--r--CIAO/tests/IDL3/Events/Abstract/Abstract.idl1
-rw-r--r--CIAO/tests/IDL3/Events/Abstract/Abstract.mpc1
-rw-r--r--CIAO/tests/IDL3/Events/Any/Any.mpc2
-rw-r--r--CIAO/tests/IDL3/Events/Any/EventAny.idl1
-rw-r--r--CIAO/tests/IDL3/Events/Any/main.cpp2
-rw-r--r--CIAO/tests/IDL3/Events/Regular/Regular.idl1
-rw-r--r--CIAO/tests/IDL3/Events/Regular/Regular.mpc1
-rw-r--r--CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl1
-rw-r--r--CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc1
-rw-r--r--CIAO/tests/IDL3/Homes/Basic/Basic.idl1
-rw-r--r--CIAO/tests/IDL3/Homes/Basic/Basic.mpc1
-rw-r--r--CIAO/tests/IDL3/Homes/Factory/Factory.idl1
-rw-r--r--CIAO/tests/IDL3/Homes/Factory/Factory.mpc1
-rw-r--r--CIAO/tests/IDL3/Homes/Finder/Finder.idl1
-rw-r--r--CIAO/tests/IDL3/Homes/Finder/Finder.mpc1
-rw-r--r--CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl1
-rw-r--r--CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/All/all.mpc2
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/All/convert.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/All/include.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl1
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc1
-rw-r--r--CIAO/tests/IDL3/Lookup/lookup_test.idl1
-rw-r--r--CIAO/tests/IDL3/Lookup/lookup_test.mpc2
-rw-r--r--CIAO/tests/IDL3_to_XMI/Bug_3607_Regression/test.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/Forward_Declared/Forward_Declared.mpc2
-rw-r--r--CIAO/tests/IDL3_to_XMI/Forward_Declared/a.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/Forward_Declared/b.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/Forward_Declared/c_nok.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/Forward_Declared/c_ok.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc2
-rw-r--r--CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp2
-rw-r--r--CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h1
-rw-r--r--CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp2
-rw-r--r--CIAO/tests/IDL3_to_XMI/XMI_For_Array/test.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File1.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File2.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/test.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/XMI_For_Native/test.idl2
-rw-r--r--CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/test.idl2
-rw-r--r--CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl1
-rw-r--r--CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc2
-rw-r--r--CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp2
-rw-r--r--CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h2
-rw-r--r--CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl2
-rw-r--r--CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc2
-rw-r--r--CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl1
-rw-r--r--CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc2
-rw-r--r--CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl2
-rw-r--r--CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Included_Component/IC_Foo.idl1
-rw-r--r--CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl2
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl2
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl2
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.idl2
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Servants/Base.idl2
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl2
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl1
-rw-r--r--CIAO/tests/IDL_Test/Keywords/Keywords.mpc2
-rw-r--r--CIAO/tests/IDL_Test/Lem_Pragma/A.idl2
-rw-r--r--CIAO/tests/IDL_Test/Lem_Pragma/B.idl2
-rw-r--r--CIAO/tests/IDL_Test/Lem_Pragma/C.idl2
-rw-r--r--CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc2
-rw-r--r--CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.idl2
-rw-r--r--CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc1
-rw-r--r--CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Base.idl2
-rw-r--r--CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.idl2
-rw-r--r--CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc1
-rw-r--r--CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp2
-rw-r--r--CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h2
-rw-r--r--CIAO/tests/IDL_Test/NonTopic_Connector/nontopic_test.idl2
-rw-r--r--CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.idl2
-rw-r--r--CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl1
-rw-r--r--CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc1
-rw-r--r--CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl2
-rw-r--r--CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc2
-rw-r--r--CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc1
-rw-r--r--CIAO/tests/Minimum/Receiver/Receiver.mpc1
-rw-r--r--CIAO/tests/Minimum/Receiver/Receiver_exec.cpp2
-rw-r--r--CIAO/tests/Minimum/Receiver/Receiver_exec.h2
-rw-r--r--CIAO/tests/Minimum/Sender/Sender.mpc1
-rw-r--r--CIAO/tests/Minimum/Sender/Sender_exec.cpp2
-rw-r--r--CIAO/tests/Minimum/Sender/Sender_exec.h2
-rw-r--r--CIAO/tests/TTSCTest/Sender/Sender.mpc2
-rw-r--r--CIAO/tests/TTSCTest/Sender/Sender_exec.cpp2
-rw-r--r--CIAO/tests/TTSCTest/Sender/Sender_exec.h2
-rw-r--r--CIAO/tests/TTSCTest/TTSConnector/TTSConnector.mpc2
-rw-r--r--CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp2
-rw-r--r--CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.h2
-rw-r--r--CIAO/tests/TTSConnContext/Sender/Sender.mpc2
-rw-r--r--CIAO/tests/TTSConnContext/Sender/Sender_exec.cpp2
-rw-r--r--CIAO/tests/TTSConnContext/Sender/Sender_exec.h2
-rw-r--r--CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector.mpc2
-rw-r--r--CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp2
-rw-r--r--CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.h2
-rw-r--r--CIAO/tests/Thread/Receiver/Receiver.mpc1
-rw-r--r--CIAO/tests/Thread/Receiver/Receiver_exec.cpp2
-rw-r--r--CIAO/tests/Thread/Receiver/Receiver_exec.h2
-rw-r--r--CIAO/tests/Thread/Sender/Sender.mpc1
-rw-r--r--CIAO/tests/Thread/Sender/Sender_exec.cpp2
-rw-r--r--CIAO/tests/Thread/Sender/Sender_exec.h2
-rw-r--r--CIAO/tests/Thread/Thread_Base/Thread_Base.mpc1
-rw-r--r--CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc2
-rw-r--r--CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h1
-rw-r--r--CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp2
-rw-r--r--CIAO/tools/IDL3_to_IDL2/be_extern.h1
-rw-r--r--CIAO/tools/IDL3_to_IDL2/be_init.cpp2
-rw-r--r--CIAO/tools/IDL3_to_IDL2/be_produce.cpp2
-rw-r--r--CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp2
-rw-r--r--CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp2
-rw-r--r--CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp2
-rw-r--r--CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp2
-rw-r--r--CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp2
-rw-r--r--CIAO/tools/IDL3_to_XMI/CIAO_IDL3_TO_XMI_Export.h1
-rw-r--r--CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc2
-rw-r--r--CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp2
-rw-r--r--CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp2
-rw-r--r--CIAO/tools/IDL3_to_XMI/Literals.cpp2
-rw-r--r--CIAO/tools/IDL3_to_XMI/be_extern.h1
-rw-r--r--CIAO/tools/IDL3_to_XMI/be_helper.h2
-rw-r--r--CIAO/tools/IDL3_to_XMI/be_init.cpp2
-rw-r--r--CIAO/tools/IDL3_to_XMI/be_produce.cpp2
-rw-r--r--CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp2
-rw-r--r--CIAO/tools/IDL3_to_XMI/be_sunsoft.h2
-rw-r--r--CIAO/tools/IDL3_to_XMI/identifier_helper.cpp2
-rw-r--r--CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc1
-rw-r--r--CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp2
-rw-r--r--CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.h2
-rw-r--r--CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc1
-rw-r--r--CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp2
-rw-r--r--CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h2
-rw-r--r--CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc1
1989 files changed, 5 insertions, 3558 deletions
diff --git a/CIAO/ccm/CCM_Base.idl b/CIAO/ccm/CCM_Base.idl
index f7b529c969b..aae57b62235 100644
--- a/CIAO/ccm/CCM_Base.idl
+++ b/CIAO/ccm/CCM_Base.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant to OMG 06-04-01, section 6.6.8
#if !defined (CCM_BASE_IDL)
diff --git a/CIAO/ccm/CCM_CCMException.idl b/CIAO/ccm/CCM_CCMException.idl
index 729a08974b1..5068f55cb90 100644
--- a/CIAO/ccm/CCM_CCMException.idl
+++ b/CIAO/ccm/CCM_CCMException.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant to OMG 06-04-01, section 9.3.3.2
#if !defined (CCM_CCMEXCEPTION_IDL)
diff --git a/CIAO/ccm/CCM_Configurator.idl b/CIAO/ccm/CCM_Configurator.idl
index 599e94cc80a..0871a7c1a01 100644
--- a/CIAO/ccm/CCM_Configurator.idl
+++ b/CIAO/ccm/CCM_Configurator.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.10.1.1
#if !defined (CCM_CONFIGURATOR_IDL)
diff --git a/CIAO/ccm/CCM_Context.idl b/CIAO/ccm/CCM_Context.idl
index b1eeae77ad1..af2281299e6 100644
--- a/CIAO/ccm/CCM_Context.idl
+++ b/CIAO/ccm/CCM_Context.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant to OMG 06-04-01, section 9.3.2.1
#if !defined (CCM_CONTEXT_IDL)
diff --git a/CIAO/ccm/CCM_Cookie.idl b/CIAO/ccm/CCM_Cookie.idl
index 3e7997b482e..d462f8af9df 100644
--- a/CIAO/ccm/CCM_Cookie.idl
+++ b/CIAO/ccm/CCM_Cookie.idl
@@ -1,5 +1,4 @@
-/// $Id$
-/// Compliant with OMG 06-04-01 Section 6.5.2.4
+//// Compliant with OMG 06-04-01 Section 6.5.2.4
#if !defined (CCM_COOKIE_IDL)
#define CCM_COOKIE_IDL
diff --git a/CIAO/ccm/CCM_EnterpriseComponent.idl b/CIAO/ccm/CCM_EnterpriseComponent.idl
index b7a087ac349..a30c33384ed 100644
--- a/CIAO/ccm/CCM_EnterpriseComponent.idl
+++ b/CIAO/ccm/CCM_EnterpriseComponent.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant with OMG 06-04-01 Section 8.3.2
#if !defined (CCM_ENTERPRISECOMPONENT_IDL)
diff --git a/CIAO/ccm/CCM_Enumeration.idl b/CIAO/ccm/CCM_Enumeration.idl
index f86e8a086d5..00b7416e3a5 100644
--- a/CIAO/ccm/CCM_Enumeration.idl
+++ b/CIAO/ccm/CCM_Enumeration.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 10.3.1.2
#if !defined (CCM_ENUMERATION_IDL)
diff --git a/CIAO/ccm/CCM_EventBase.idl b/CIAO/ccm/CCM_EventBase.idl
index 573b8ddcc49..5fa3d1eb026 100644
--- a/CIAO/ccm/CCM_EventBase.idl
+++ b/CIAO/ccm/CCM_EventBase.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.6.1.2
#if !defined (CCM_EVENTBASE_IDL)
diff --git a/CIAO/ccm/CCM_EventConsumerBase.idl b/CIAO/ccm/CCM_EventConsumerBase.idl
index 662af48d1fa..cd59f4e0be9 100644
--- a/CIAO/ccm/CCM_EventConsumerBase.idl
+++ b/CIAO/ccm/CCM_EventConsumerBase.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.6.2
#if !defined (CCM_EVENTCONSUMERBASE_IDL)
diff --git a/CIAO/ccm/CCM_Events.idl b/CIAO/ccm/CCM_Events.idl
index 9215e8a47c1..4673ef9607c 100644
--- a/CIAO/ccm/CCM_Events.idl
+++ b/CIAO/ccm/CCM_Events.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.6.8
#if !defined (CCM_EVENTS_IDL)
diff --git a/CIAO/ccm/CCM_Exceptions.idl b/CIAO/ccm/CCM_Exceptions.idl
index 7e1f7067f2b..d7feed0ddb5 100644
--- a/CIAO/ccm/CCM_Exceptions.idl
+++ b/CIAO/ccm/CCM_Exceptions.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.7.6
#if !defined (CCM_EXCEPTIONS_IDL)
diff --git a/CIAO/ccm/CCM_ExecutorLocator.idl b/CIAO/ccm/CCM_ExecutorLocator.idl
index e6c2bfb6fe2..09ddeb620a7 100644
--- a/CIAO/ccm/CCM_ExecutorLocator.idl
+++ b/CIAO/ccm/CCM_ExecutorLocator.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 8.3.2
#if !defined (CCM_EXECUTORLOCATOR_IDL)
diff --git a/CIAO/ccm/CCM_Home.idl b/CIAO/ccm/CCM_Home.idl
index eea3bfb3f14..e1a4c7357a7 100644
--- a/CIAO/ccm/CCM_Home.idl
+++ b/CIAO/ccm/CCM_Home.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.7.6
#if !defined (CCM_HOME_IDL)
diff --git a/CIAO/ccm/CCM_HomeConfiguration.idl b/CIAO/ccm/CCM_HomeConfiguration.idl
index af4ee7dbcad..231f46483ff 100644
--- a/CIAO/ccm/CCM_HomeConfiguration.idl
+++ b/CIAO/ccm/CCM_HomeConfiguration.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.10.2.1
#if !defined (CCM_HOMECONFIGURATION_IDL)
diff --git a/CIAO/ccm/CCM_HomeExecutorBase.idl b/CIAO/ccm/CCM_HomeExecutorBase.idl
index 34a92fbe539..0890c2d8af0 100644
--- a/CIAO/ccm/CCM_HomeExecutorBase.idl
+++ b/CIAO/ccm/CCM_HomeExecutorBase.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (CCM_HOMEEXECUTORBASE_IDL)
#define CCM_HOMEEXECUTORBASE_IDL
diff --git a/CIAO/ccm/CCM_HomeFinder.idl b/CIAO/ccm/CCM_HomeFinder.idl
index b2762616849..ee7cd73c202 100644
--- a/CIAO/ccm/CCM_HomeFinder.idl
+++ b/CIAO/ccm/CCM_HomeFinder.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.8
#if !defined (CCM_HOMEFINDER_IDL)
diff --git a/CIAO/ccm/CCM_Homes.idl b/CIAO/ccm/CCM_Homes.idl
index edeb6ddb11f..a47dd2ab2a1 100644
--- a/CIAO/ccm/CCM_Homes.idl
+++ b/CIAO/ccm/CCM_Homes.idl
@@ -1,4 +1,3 @@
-// $Id$
/// NOT Compliant with OMG 06-04-01 Section 6.7.6
#if !defined (CCM_HOMES_IDL)
diff --git a/CIAO/ccm/CCM_KeylessCCMHome.idl b/CIAO/ccm/CCM_KeylessCCMHome.idl
index 8a720cf64f4..f45e5f91fef 100644
--- a/CIAO/ccm/CCM_KeylessCCMHome.idl
+++ b/CIAO/ccm/CCM_KeylessCCMHome.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.7.7
#if !defined (CCM_KEYLESSCCMHOME_IDL)
diff --git a/CIAO/ccm/CCM_Navigation.idl b/CIAO/ccm/CCM_Navigation.idl
index 6ab638772a7..4be578c8154 100644
--- a/CIAO/ccm/CCM_Navigation.idl
+++ b/CIAO/ccm/CCM_Navigation.idl
@@ -1,5 +1,4 @@
-/// $Id$
-/// Compliant with OMG 06-04-01 Section 6.4.3.3
+//// Compliant with OMG 06-04-01 Section 6.4.3.3
#if !defined (CCM_NAVIGATION_IDL)
#define CCM_NAVIGATION_IDL
diff --git a/CIAO/ccm/CCM_Object.idl b/CIAO/ccm/CCM_Object.idl
index 907b7bb2c1f..bc7277aba5b 100644
--- a/CIAO/ccm/CCM_Object.idl
+++ b/CIAO/ccm/CCM_Object.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant with OMG 06-04-01 Section 6.11.1
#if !defined (CCM_OBJECT_IDL)
diff --git a/CIAO/ccm/CCM_PrimaryKeyBase.idl b/CIAO/ccm/CCM_PrimaryKeyBase.idl
index e2bc5da5955..fc942b81375 100644
--- a/CIAO/ccm/CCM_PrimaryKeyBase.idl
+++ b/CIAO/ccm/CCM_PrimaryKeyBase.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.7.2.2
#if !defined (CCM_PRIMARYKEYBASE_IDL)
diff --git a/CIAO/ccm/CCM_Receptacle.idl b/CIAO/ccm/CCM_Receptacle.idl
index 8aa38f41cb9..fce41d55af4 100644
--- a/CIAO/ccm/CCM_Receptacle.idl
+++ b/CIAO/ccm/CCM_Receptacle.idl
@@ -1,5 +1,4 @@
-/// $Id$
-/// Compliant with OMG 06-04-01 Section 6.5.3
+//// Compliant with OMG 06-04-01 Section 6.5.3
#if !defined (CCM_RECEPTACLE_IDL)
#define CCM_RECEPTACLE_IDL
diff --git a/CIAO/ccm/CCM_StandardConfigurator.idl b/CIAO/ccm/CCM_StandardConfigurator.idl
index f24daac84fb..b25e3156677 100644
--- a/CIAO/ccm/CCM_StandardConfigurator.idl
+++ b/CIAO/ccm/CCM_StandardConfigurator.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 6.10.1.2
#if !defined (CCM_STANDARDCONFIGURATOR_IDL)
diff --git a/CIAO/ccm/CCM_Transaction.idl b/CIAO/ccm/CCM_Transaction.idl
index 00170ff16a9..961793feb29 100644
--- a/CIAO/ccm/CCM_Transaction.idl
+++ b/CIAO/ccm/CCM_Transaction.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 9.3.2.3
#if !defined (CCM_TRANSACTION_IDL)
diff --git a/CIAO/ccm/CCM_lem_stub.mpc b/CIAO/ccm/CCM_lem_stub.mpc
index 71e8d0e6cce..dbab62f5124 100644
--- a/CIAO/ccm/CCM_lem_stub.mpc
+++ b/CIAO/ccm/CCM_lem_stub.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CCM_lem_stub_idl) : install, ciaolib_with_idl, valuetype {
idlflags += -Wb,stub_export_include=CCM_LEM_Stub_Export.h
idlflags += -Wb,stub_export_macro=CCM_LEM_STUB_Export
diff --git a/CIAO/ccm/CCM_stub.mpc b/CIAO/ccm/CCM_stub.mpc
index b7d4ea44843..3622c7136bc 100644
--- a/CIAO/ccm/CCM_stub.mpc
+++ b/CIAO/ccm/CCM_stub.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CCM_stub_idl) : install, ciaolib_with_idl, valuetype {
idlflags += -Wb,stub_export_include=CCM_Stub_Export.h \
-Wb,stub_export_macro=CCM_STUB_Export \
diff --git a/CIAO/ccm/CCM_svnt.mpc b/CIAO/ccm/CCM_svnt.mpc
index 15f1fd03b38..b68d851777d 100644
--- a/CIAO/ccm/CCM_svnt.mpc
+++ b/CIAO/ccm/CCM_svnt.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CCM_svnt_idl) : install, ciaolib_with_idl, valuetype {
idlflags += -Wb,export_include=CCM_Svnt_Export.h
idlflags += -Wb,export_macro=CCM_SVNT_Export
diff --git a/CIAO/ccm/Components.idl b/CIAO/ccm/Components.idl
index 5ac799a476e..8f20c692d21 100644
--- a/CIAO/ccm/Components.idl
+++ b/CIAO/ccm/Components.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (CCM_COMPONENTS_IDL)
#define CCM_COMPONENTS_IDL
diff --git a/CIAO/ccm/CosPersistentState.idl b/CIAO/ccm/CosPersistentState.idl
index c8d388f17c3..df4545dbcfe 100644
--- a/CIAO/ccm/CosPersistentState.idl
+++ b/CIAO/ccm/CosPersistentState.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @@ This is just a temporary file. Since TAO does not have
* CosPersistentState at all, we use this file to define
diff --git a/CIAO/ccm/Entity/CCM_ComponentId.idl b/CIAO/ccm/Entity/CCM_ComponentId.idl
index fee6d30ca13..9346c6a7c46 100644
--- a/CIAO/ccm/Entity/CCM_ComponentId.idl
+++ b/CIAO/ccm/Entity/CCM_ComponentId.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant to OMG 06-04-01, section 9.4.3.1
#if !defined (CCM_COMPONENTID_IDL)
diff --git a/CIAO/ccm/Entity/CCM_Entity2Context.idl b/CIAO/ccm/Entity/CCM_Entity2Context.idl
index 095770a5b14..84cba271202 100644
--- a/CIAO/ccm/Entity/CCM_Entity2Context.idl
+++ b/CIAO/ccm/Entity/CCM_Entity2Context.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant with OMG 06-04-01 Section 9.4.3.7
#if !defined (CCM_ENTITY2CONTEXT_IDL)
diff --git a/CIAO/ccm/Entity/CCM_EntityComponent.idl b/CIAO/ccm/Entity/CCM_EntityComponent.idl
index 4fede1f798d..8943cff4169 100644
--- a/CIAO/ccm/Entity/CCM_EntityComponent.idl
+++ b/CIAO/ccm/Entity/CCM_EntityComponent.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant with OMG 06-04-01 Section 9.3.4.2
#if !defined (CCM_ENTITYCOMPONENT_IDL)
diff --git a/CIAO/ccm/Entity/CCM_EntityContext.idl b/CIAO/ccm/Entity/CCM_EntityContext.idl
index 893861b562d..ba0993d2df0 100644
--- a/CIAO/ccm/Entity/CCM_EntityContext.idl
+++ b/CIAO/ccm/Entity/CCM_EntityContext.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant with OMG 06-04-01 Section 9.3.4.1
#if !defined (CCM_ENTITYCONTEXT_IDL)
diff --git a/CIAO/ccm/Entity/CCM_StateIdFactory.idl b/CIAO/ccm/Entity/CCM_StateIdFactory.idl
index 73872f3d126..8fd6f81c235 100644
--- a/CIAO/ccm/Entity/CCM_StateIdFactory.idl
+++ b/CIAO/ccm/Entity/CCM_StateIdFactory.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 9.4.3.1
#if !defined (CCM_STATEIDFACTORY)
diff --git a/CIAO/ccm/Entity/CCM_entity_svnt.mpc b/CIAO/ccm/Entity/CCM_entity_svnt.mpc
index 66c5901a8dd..4e0134aa3d6 100644
--- a/CIAO/ccm/Entity/CCM_entity_svnt.mpc
+++ b/CIAO/ccm/Entity/CCM_entity_svnt.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CCM_entity_svnt_idl) : install, ciaolib_with_idl, valuetype {
requires += dummy_label
idlflags += -Wb,export_include=CCM_Entity_Svnt_Export.h \
diff --git a/CIAO/ccm/Extended/CCM_BadComponentReference.idl b/CIAO/ccm/Extended/CCM_BadComponentReference.idl
index 64d7c1cc020..4e40bd5319b 100644
--- a/CIAO/ccm/Extended/CCM_BadComponentReference.idl
+++ b/CIAO/ccm/Extended/CCM_BadComponentReference.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 9.4.2.1
#if !defined (CCM_BADCOMPONENTREFERENCE_IDL)
diff --git a/CIAO/ccm/Extended/CCM_CCM2Context.idl b/CIAO/ccm/Extended/CCM_CCM2Context.idl
index 2735148bc18..15b741d1c23 100644
--- a/CIAO/ccm/Extended/CCM_CCM2Context.idl
+++ b/CIAO/ccm/Extended/CCM_CCM2Context.idl
@@ -1,4 +1,3 @@
-// $Id$
// Compliant to OMG 06-04-01, section 9.4.1.1
#if !defined (CCM_2CONTEXT_IDL)
diff --git a/CIAO/ccm/Extended/CCM_HomeRegistration.idl b/CIAO/ccm/Extended/CCM_HomeRegistration.idl
index 987e1975327..50f239046b4 100644
--- a/CIAO/ccm/Extended/CCM_HomeRegistration.idl
+++ b/CIAO/ccm/Extended/CCM_HomeRegistration.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (CCM_HOMEREGISTRATION_IDL)
#define CCM_HOMEREGISTRATION_IDL
diff --git a/CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl b/CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl
index 26e2b5a50d4..b0b58796a86 100644
--- a/CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl
+++ b/CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 9.4.1.3
#if !defined (CCM_PROXYHOMEREGISTRATION_IDL)
diff --git a/CIAO/ccm/Session/CCM_Session2Context.idl b/CIAO/ccm/Session/CCM_Session2Context.idl
index a6d3880b794..fc20f73e831 100644
--- a/CIAO/ccm/Session/CCM_Session2Context.idl
+++ b/CIAO/ccm/Session/CCM_Session2Context.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 9.4.2.1
#if !defined (CCM_SESSION2CONTEXT_IDL)
diff --git a/CIAO/ccm/Session/CCM_SessionComponent.idl b/CIAO/ccm/Session/CCM_SessionComponent.idl
index b7ff8ef2834..2dcc0b8d454 100644
--- a/CIAO/ccm/Session/CCM_SessionComponent.idl
+++ b/CIAO/ccm/Session/CCM_SessionComponent.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (CCM_SESSIONCOMPONENT_IDL)
#define CCM_SESSIONCOMPONENT_IDL
diff --git a/CIAO/ccm/Session/CCM_SessionContext.idl b/CIAO/ccm/Session/CCM_SessionContext.idl
index 88685acd965..b499eae209a 100644
--- a/CIAO/ccm/Session/CCM_SessionContext.idl
+++ b/CIAO/ccm/Session/CCM_SessionContext.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (CCM_SESSIONCONTEXT_IDL)
#define CCM_SESSIONCONTEXT_IDL
diff --git a/CIAO/ccm/Session/CCM_SessionSynchronization.idl b/CIAO/ccm/Session/CCM_SessionSynchronization.idl
index 374b01fcf94..f691ca40bc6 100644
--- a/CIAO/ccm/Session/CCM_SessionSynchronization.idl
+++ b/CIAO/ccm/Session/CCM_SessionSynchronization.idl
@@ -1,4 +1,3 @@
-// $Id$
/// Compliant with OMG 06-04-01 Section 9.3.3.3
#if !defined (CCM_SESSIONSYNCHRONIZATION_IDL)
diff --git a/CIAO/ccm/Session/CCM_session.mpc b/CIAO/ccm/Session/CCM_session.mpc
index 57c60bfc08b..4ec8b37cfa8 100644
--- a/CIAO/ccm/Session/CCM_session.mpc
+++ b/CIAO/ccm/Session/CCM_session.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CCM_session_idl) : install, ciaolib_with_idl, valuetype {
idlflags += -Wb,stub_export_include=CCM_Session_Stub_Export.h \
-Wb,stub_export_macro=CCM_SESSION_STUB_Export \
diff --git a/CIAO/ciao/Base/CIAO_Base.mpc b/CIAO/ciao/Base/CIAO_Base.mpc
index c623313f75a..2eb77d75803 100644
--- a/CIAO/ciao/Base/CIAO_Base.mpc
+++ b/CIAO/ciao/Base/CIAO_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CIAO_Base_IDL) : install, ciaoidldefaults, anytypecode {
idlflags += -Wb,stub_export_macro=CIAO_BASE_STUB_Export \
-Wb,stub_export_include=CIAO_Base_stub_export.h \
diff --git a/CIAO/ciao/Base/CIAO_Exceptions.idl b/CIAO/ciao/Base/CIAO_Exceptions.idl
index 3cb9f6c7c3f..2c1df69378e 100644
--- a/CIAO/ciao/Base/CIAO_Exceptions.idl
+++ b/CIAO/ciao/Base/CIAO_Exceptions.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CIAO_Exceptions.idl
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/Base/Client_init.cpp b/CIAO/ciao/Base/Client_init.cpp
index fa6ccbf8fbd..244a2f094eb 100644
--- a/CIAO/ciao/Base/Client_init.cpp
+++ b/CIAO/ciao/Base/Client_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_init.h"
#include <ccm/CCM_CookieC.h>
diff --git a/CIAO/ciao/Base/Client_init.h b/CIAO/ciao/Base/Client_init.h
index a82d2ddd748..4f22a717b2f 100644
--- a/CIAO/ciao/Base/Client_init.h
+++ b/CIAO/ciao/Base/Client_init.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Client_init.h
*
diff --git a/CIAO/ciao/Base/Server_init.cpp b/CIAO/ciao/Base/Server_init.cpp
index 36ad40fd169..3f4802dd1de 100644
--- a/CIAO/ciao/Base/Server_init.cpp
+++ b/CIAO/ciao/Base/Server_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_init.h"
#include "ciao/Base/Client_init.h"
diff --git a/CIAO/ciao/Base/Server_init.h b/CIAO/ciao/Base/Server_init.h
index 3f1901907de..da8b847b800 100644
--- a/CIAO/ciao/Base/Server_init.h
+++ b/CIAO/ciao/Base/Server_init.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Server_init.h
*
diff --git a/CIAO/ciao/Containers/Container_Base_T.cpp b/CIAO/ciao/Containers/Container_Base_T.cpp
index 394b3a5936a..76aa9b152d9 100644
--- a/CIAO/ciao/Containers/Container_Base_T.cpp
+++ b/CIAO/ciao/Containers/Container_Base_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_CONTAINERBASE_IMPL_T_C
#define CIAO_CONTAINERBASE_IMPL_T_C
diff --git a/CIAO/ciao/Containers/Containers.mpc b/CIAO/ciao/Containers/Containers.mpc
index 727f1aeb249..1f877e5fac6 100644
--- a/CIAO/ciao/Containers/Containers.mpc
+++ b/CIAO/ciao/Containers/Containers.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CIAO_Container_Base_idl) : install, taoidldefaults {
custom_only = 1
diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp
index 110415278bb..bf259140b77 100644
--- a/CIAO/ciao/Containers/Session/Session_Container.cpp
+++ b/CIAO/ciao/Containers/Session/Session_Container.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Session_Container.h"
#include "ciao/Servants/Servant_Impl_Base.h"
diff --git a/CIAO/ciao/Containers/Session/Session_Container.mpc b/CIAO/ciao/Containers/Session/Session_Container.mpc
index 9180d8d26bb..58cef015a14 100644
--- a/CIAO/ciao/Containers/Session/Session_Container.mpc
+++ b/CIAO/ciao/Containers/Session/Session_Container.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CIAO_Session_Container_idl) : install, ciaoidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_include=Session_Container_stub_export.h \
diff --git a/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp b/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp
index a2a2dcaa838..2ff9e7e29dd 100644
--- a/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp
+++ b/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_CONTEXT_IMPL_BASE_T_C
#define CIAO_CONTEXT_IMPL_BASE_T_C
diff --git a/CIAO/ciao/Contexts/Session/Session_Context_T.cpp b/CIAO/ciao/Contexts/Session/Session_Context_T.cpp
index cd4e2b6c728..37fff51c554 100644
--- a/CIAO/ciao/Contexts/Session/Session_Context_T.cpp
+++ b/CIAO/ciao/Contexts/Session/Session_Context_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SESSION_CONTEXT_IMPL_T_C
#define CIAO_SESSION_CONTEXT_IMPL_T_C
diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc b/CIAO/ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc
index 15b9f8f582b..f6e0449093f 100644
--- a/CIAO/ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc
+++ b/CIAO/ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (CIAO_Deployment_Handlers) : install, dance_stub, ciao_base, ciao_lib, \
ciao_output, ciao_session_container, \
ciao_logger, dance_logger, dance_deployment_scheduler {
diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp
index 3da4f481773..878e8e0ec56 100644
--- a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp
+++ b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "CIAO_Handler_Common.h"
#include "dance/Deployment/Deployment_PlanErrorC.h"
diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h b/CIAO/ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h
index e62e00464f2..cf3cbfcc1cc 100644
--- a/CIAO/ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h
+++ b/CIAO/ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl CIAO_Locality_Handler
// ------------------------------
diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp b/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp
index 63661bd3285..245a5ca3eae 100644
--- a/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp
+++ b/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "CIAO_State.h"
#include "ciao/Logger/Log_Macros.h"
diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp
index 9107116da4b..9be8807c567 100644
--- a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Component_Handler.h"
#include "ciao/Logger/Log_Macros.h"
#include "ciao/Base/CIAO_PropertiesC.h"
diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.h b/CIAO/ciao/Deployment/Handlers/Component_Handler.h
index 6782d47115b..af6b6e88991 100644
--- a/CIAO/ciao/Deployment/Handlers/Component_Handler.h
+++ b/CIAO/ciao/Deployment/Handlers/Component_Handler.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Component_Handler.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp
index 1b8ff0330d9..c08860fd370 100644
--- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Connection_Handler.h"
#include "ciao/Logger/Log_Macros.h"
#include "dance/Deployment/Deployment_InvalidConnectionC.h"
diff --git a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp
index 82617308daa..d6f50dd8147 100644
--- a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Container_Handler.h"
#include "ciao/Logger/Log_Macros.h"
#include "ciao/Logger/Logger_Service.h"
diff --git a/CIAO/ciao/Deployment/Handlers/Container_Handler.h b/CIAO/ciao/Deployment/Handlers/Container_Handler.h
index f3a30ddf115..d6a09df71ca 100644
--- a/CIAO/ciao/Deployment/Handlers/Container_Handler.h
+++ b/CIAO/ciao/Deployment/Handlers/Container_Handler.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Container_Handler.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp
index 320346a96e7..e49df82e92b 100644
--- a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Home_Handler.h"
#include "ciao/Logger/Log_Macros.h"
#include "ciao/Base/CIAO_PropertiesC.h"
diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.h b/CIAO/ciao/Deployment/Handlers/Home_Handler.h
index 3b04f88d749..2a6aa8f113a 100644
--- a/CIAO/ciao/Deployment/Handlers/Home_Handler.h
+++ b/CIAO/ciao/Deployment/Handlers/Home_Handler.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Home_Handler.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
index 8527a7a4575..dc9168c8204 100644
--- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Homed_Component_Handler.h"
#include "ccm/CCM_KeylessCCMHomeC.h"
#include "ciao/Logger/Log_Macros.h"
diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h
index 9220a45b86c..b34f7b74e7a 100644
--- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h
+++ b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Homed_Component_Handler.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc b/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc
index 6e1dd990a85..f1fe5e0dabb 100644
--- a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc
+++ b/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (CIAO_Deployment_Interceptors) : install, ciao_base, ciao_lib, ciao_output, \
naming, ciao_logger, dance_stub, dance_deployment_scheduler {
dynamicflags += CIAO_DEPLOYMENT_INTERCEPTORS_BUILD_DLL
diff --git a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h b/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h
index 259528a5621..c3e56f8c848 100644
--- a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h
+++ b/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
index 68e6ee14079..4538d1a32a6 100644
--- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
+++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Deployment_Interceptors.h"
#include "tao/ORB_Core.h"
#include "Name_Utilities.h"
diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h
index ca63cf8acf2..6dac3083fc9 100644
--- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h
+++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Deployment_Interceptors.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp b/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp
index dfb064af3fe..b7ad8cd82f8 100644
--- a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp
+++ b/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Name_Utilities.h"
#include "ace/Auto_Ptr.h"
diff --git a/CIAO/ciao/Logger/CIAO_Logger_Export.h b/CIAO/ciao/Logger/CIAO_Logger_Export.h
index b1760b426f9..7e32ea6a676 100644
--- a/CIAO/ciao/Logger/CIAO_Logger_Export.h
+++ b/CIAO/ciao/Logger/CIAO_Logger_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl CIAO_Logger
// ------------------------------
diff --git a/CIAO/ciao/Logger/Log_Macros.cpp b/CIAO/ciao/Logger/Log_Macros.cpp
index b5151595b15..1d63ac6018e 100644
--- a/CIAO/ciao/Logger/Log_Macros.cpp
+++ b/CIAO/ciao/Logger/Log_Macros.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Log_Macros.h"
CIAO_Logger_Export unsigned int CIAO_debug_level = 0;
diff --git a/CIAO/ciao/Logger/Log_Macros.h b/CIAO/ciao/Logger/Log_Macros.h
index 5092e14cd6d..f94950acb98 100644
--- a/CIAO/ciao/Logger/Log_Macros.h
+++ b/CIAO/ciao/Logger/Log_Macros.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Log_Macros.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/Logger/Logger.mpc b/CIAO/ciao/Logger/Logger.mpc
index 4635a9f2aad..2170cde5ac4 100644
--- a/CIAO/ciao/Logger/Logger.mpc
+++ b/CIAO/ciao/Logger/Logger.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CIAO_Logger): install, ciao_lib, taolib, acelib {
sharedname = CIAO_Logger
dynamicflags += CIAO_LOGGER_BUILD_DLL
diff --git a/CIAO/ciao/Logger/Logger_Service.cpp b/CIAO/ciao/Logger/Logger_Service.cpp
index aba397e2efb..2a59f543320 100644
--- a/CIAO/ciao/Logger/Logger_Service.cpp
+++ b/CIAO/ciao/Logger/Logger_Service.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Logger_Service.h"
#include "Log_Macros.h"
#include "ace/Get_Opt.h"
diff --git a/CIAO/ciao/Logger/Logger_Service.h b/CIAO/ciao/Logger/Logger_Service.h
index 897163004fd..10d64c32795 100644
--- a/CIAO/ciao/Logger/Logger_Service.h
+++ b/CIAO/ciao/Logger/Logger_Service.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_LOGGER_SERVICE_H_
#define CIAO_LOGGER_SERVICE_H_
diff --git a/CIAO/ciao/Servants/CIAO_Servant_Impl_export.h b/CIAO/ciao/Servants/CIAO_Servant_Impl_export.h
index 7319fe83380..3ab7f281b5b 100644
--- a/CIAO/ciao/Servants/CIAO_Servant_Impl_export.h
+++ b/CIAO/ciao/Servants/CIAO_Servant_Impl_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef CIAO_SERVANT_IMPL_EXPORT_H
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
index bbb297ee48a..03242ea1f26 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Connector_Servant_Impl_Base.h"
#include "StandardConfigurator_Impl.h"
#include "ciao/Logger/Log_Macros.h"
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp
index 013ab16bbe6..18aabb56221 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_CONNECTOR_SERVANT_IMPL_UTILS_T_C
#define CIAO_CONNECTOR_SERVANT_IMPL_UTILS_T_C
diff --git a/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp b/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp
index 54b82708d4e..d197ab7e285 100644
--- a/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp
+++ b/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_FACET_INTERFACE_BASE_T_C
#define CIAO_FACET_INTERFACE_BASE_T_C
diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp
index 0f3a6b660ed..8710e2c392c 100644
--- a/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Home_Servant_Impl_Base.h"
namespace CIAO
diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
index f691e45fb23..07cfe4e9e04 100644
--- a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_HOME_SERVANT_IMPL_T_C
#define CIAO_HOME_SERVANT_IMPL_T_C
diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
index a44783626e7..e7d6f4ade67 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Servant_Impl_Base.h"
#include "ciao/Logger/Log_Macros.h"
diff --git a/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp b/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp
index 0772cce1e20..9db3dad4026 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp
+++ b/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SERVANT_IMPL_UTILS_T_C
#define CIAO_SERVANT_IMPL_UTILS_T_C
diff --git a/CIAO/ciao/Servants/Servants.mpc b/CIAO/ciao/Servants/Servants.mpc
index eb3f7b93f64..321c77a7f4d 100644
--- a/CIAO/ciao/Servants/Servants.mpc
+++ b/CIAO/ciao/Servants/Servants.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CIAO_Servant_Impl) : install, ciao_container_base_stub, ccm_svnt, ccm_session_stub, ciao_output, ciao_logger, ccm_direct_collocation {
dynamicflags += CIAO_SERVANT_IMPL_BUILD_DLL
IDL_Files {
diff --git a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
index 594c13223a4..2d24e03aecf 100644
--- a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SERVANT_IMPL_T_C
#define CIAO_SERVANT_IMPL_T_C
diff --git a/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp b/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp
index 5dd98dcacfb..359959d3634 100644
--- a/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp
+++ b/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StandardConfigurator_Impl.h"
#include "Servant_Impl_Base.h"
diff --git a/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp b/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp
index 17eaa33db93..c00a9aaf693 100644
--- a/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp
+++ b/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ConfigValue.h"
namespace CIAO
diff --git a/CIAO/ciao/Valuetype_Factories/ConfigValue.h b/CIAO/ciao/Valuetype_Factories/ConfigValue.h
index a1d722eb562..5336a24a9f8 100644
--- a/CIAO/ciao/Valuetype_Factories/ConfigValue.h
+++ b/CIAO/ciao/Valuetype_Factories/ConfigValue.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_CONFIG_VALUE_H
#define CIAO_CONFIG_VALUE_H
#include /**/ "ace/pre.h"
diff --git a/CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h b/CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h
index 71ec6ce9491..96c26a2eb39 100644
--- a/CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h
+++ b/CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl ConfigValue_Factory
// ------------------------------
diff --git a/CIAO/ciao/Valuetype_Factories/Cookie_Export.h b/CIAO/ciao/Valuetype_Factories/Cookie_Export.h
index 277717f4d5c..603e623aef8 100644
--- a/CIAO/ciao/Valuetype_Factories/Cookie_Export.h
+++ b/CIAO/ciao/Valuetype_Factories/Cookie_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl Cookie_Factory
// ------------------------------
diff --git a/CIAO/ciao/Valuetype_Factories/Cookies.cpp b/CIAO/ciao/Valuetype_Factories/Cookies.cpp
index 7332cb6a4a1..5266128cada 100644
--- a/CIAO/ciao/Valuetype_Factories/Cookies.cpp
+++ b/CIAO/ciao/Valuetype_Factories/Cookies.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Cookies.h"
#if !defined (__ACE_INLINE__)
diff --git a/CIAO/ciao/Valuetype_Factories/Cookies.h b/CIAO/ciao/Valuetype_Factories/Cookies.h
index feff80e7134..9fe6f163ee5 100644
--- a/CIAO/ciao/Valuetype_Factories/Cookies.h
+++ b/CIAO/ciao/Valuetype_Factories/Cookies.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Cookies.h
*
diff --git a/CIAO/ciao/Valuetype_Factories/Cookies.inl b/CIAO/ciao/Valuetype_Factories/Cookies.inl
index 406485110c4..36ed932a85f 100644
--- a/CIAO/ciao/Valuetype_Factories/Cookies.inl
+++ b/CIAO/ciao/Valuetype_Factories/Cookies.inl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
namespace CIAO
{
ACE_INLINE
diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h
index c3ab1e35f46..dabc987e70b 100644
--- a/CIAO/ciao/Version.h
+++ b/CIAO/ciao/Version.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
#define CIAO_MAJOR_VERSION 1
diff --git a/CIAO/ciao/install_ciao_headers.mpc b/CIAO/ciao/install_ciao_headers.mpc
index f55c5ec15c2..c126324a5bb 100644
--- a/CIAO/ciao/install_ciao_headers.mpc
+++ b/CIAO/ciao/install_ciao_headers.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : install {
custom_only = 1
Define_Custom(InstallHeader) {
diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp
index 24c2880915c..64802e0d1ab 100644
--- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp
+++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ami4ccm/ami4ccm.h"
#include "tao/debug.h"
diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl
index ef636ced4c6..b54063ed4f3 100644
--- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl
+++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (AMI4CCM_IDL_H)
#define AMI4CCM_IDL_H
diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc
index 20eadf9a49e..d589179d658 100644
--- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc
+++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI4CCM_idl_gen) : install, componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=AMI4CCM_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl
index 350d7579537..d8c3a1c77d0 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_IDL
#define HELLO_IDL
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc
index 4c8c5db8265..59303e97302 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_Hello_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl
index 242594e5681..f7f1ff0006b 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_RECEIVER_IDL
#define HELLO_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
index f7d776a93a7..b8260ee63c8 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Receiver"
project(AMI_Hello_Base_Hello_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
index 8b431b6d6c5..801d62cacdd 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/connectors/ami4ccm/examples/Hello/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/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
index 602e820ac59..92bdbbb08bf 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/examples/Hello/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/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
index 993f1c80171..d30c50afca0 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_SENDER_IDL
#define HELLO_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc
index 0d6b9397524..6bbf45f423f 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Sender"
project(AMI_Hello_Base_Hello_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
index 6ece0d7daaf..57edb2f8b3a 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/examples/Hello/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/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h
index 47e2f8e8828..84dc17cbc5e 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/examples/Hello/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/examples/Quoter/Base/Quoter.idl b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.idl
index a6f5ca403b7..1d0d6ab19d4 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.idl
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef QUOTER_IDL
#define QUOTER_IDL
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc
index 79cc34184bd..b94bbc8fd2b 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_Quoter_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=QUOTER_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl
index f9e571166d6..35b632bd3fa 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef QUOTER_CLIENT_IDL
#define QUOTER_CLIENT_IDL
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc
index 6a5e121f03e..cb421632929 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Quoter_Base Quoter_Client"
project(AMI_Quoter_Client_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp
index e1218cbbc2a..3c2af384de0 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h
index bef0ff3dc11..afa519f79ad 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl
index 16c4ec98aad..1b5090c2d5a 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef QUOTER_PRODUCER_IDL
#define QUOTER_PRODUCER_IDL
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc
index caf00e31b7b..df56da22cf6 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Quoter_Base Quoter_Producer"
project(AMI_Quoter_Producer_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp
index 4c8975cc9ed..bbb49754fe0 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h
index 6c5cf5a5f74..529db4db704 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
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:
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl
index 3ff1715afc4..798151db843 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_RECEIVER_IDL
#define HELLO_RECEIVER_IDL
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc
index 521ca628af1..54f7a9b0857 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_Hello_Tuto_Hello_Receiver_idl_gen) : componentidldefaults {
custom_only = 1
after += AMI_Hello_Tuto_idl_gen
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp
index 7b87b8c7d17..303697cae44 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h
index 856e7c9b485..49292bc1852 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl
index 6d688f0d4a6..70cb4738010 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_SENDER_IDL
#define HELLO_SENDER_IDL
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc
index 048d214c30e..d4cbe1f0994 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_Hello_Tuto_Hello_Sender_idl_gen) : componentidldefaults {
after += AMI_Hello_Tuto_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp
index ca97c4b6cb2..f725ef893ad 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_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/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h
index 0d1136c5ed0..c297a5ed9ff 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_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/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl
index d7f28f531fc..21272c84699 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//==============================================================================
/// @file Hello_Common_defn.idl
//==============================================================================
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc
index 2431f016cc0..91c28603c02 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_Hello_Tuto_defn_idl_gen) : taoidldefaults, typecode {
custom_only = 1
idlflags += -Wb,stub_export_macro=HELLO_COMMON_DEFN_STUB_Export \
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl
index e43273a447d..d1475e43d08 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//==============================================================================
/// @file Hello_MyFoo_obj.idl
//==============================================================================
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc
index 4064fe6c101..f0b73c260d5 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_Hello_Tuto_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
after += AMI_Hello_Tuto_defn_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp
index e295362bc64..b3aabfcf428 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h
index 6b31f661af7..08ffb5bca86 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp
index 2f8f7c05596..05066a540ba 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_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/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h
index 215433b8aa4..28fce65d55c 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_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/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp
index 7b87b8c7d17..303697cae44 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h
index 856e7c9b485..49292bc1852 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp
index 474f34f9f1f..b1dee373d11 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_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/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h
index 0d1136c5ed0..c297a5ed9ff 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_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/examples/Hello/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
index bf095b4e441..3a0996040f4 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Hello_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
index 7b98b536556..dcd326b1c14 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Hello_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Hello_Base_stub
dynamicflags += HELLO_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
index c8e5aa80523..c71a797fa36 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Hello_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
index d537d32a7e0..ab3fa393504 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_Hello_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc
index 8b755775e48..bb2ed9a7a7d 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*hello_receiver) : nddslib, acelib {
exename = DDS_receiver
avoids += ace_for_tao
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp
index 28546c0a973..f3cd10094a5 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_main.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc
index 1e25c1d8d7e..665a26daacc 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*hello_sender) : nddslib, acelib {
exename = DDS_Sender
avoids += ace_for_tao
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp
index 5d9b551db6b..c050afbab37 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_main.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
index 25b18f08464..82f637ba6bd 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
index c97a14f7275..e58fc7bac02 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Hello_Receiver_idl_gen) : componentidldefaults, dds4ccm {
avoids += ace_for_tao
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
index 39218e0752d..f3a64fc4cba 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1344
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
index f1d79e4a66d..0ff9e79448a 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// TAO_IDL - Generated from
// be/be_codegen.cpp:1283
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
index 0b3dbb59efd..4674cf34f6d 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
index 9727a093cb3..b653dc864b7 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm {
avoids += ace_for_tao
after += DDS_Hello_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
index 97ea0c0885e..7c4e6634ee7 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Hello_Sender_exec.h"
#include "ace/Guard_T.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
index 0b346ff8dce..5b6c508df0c 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
#define CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl
index 998079340e8..7ac916b5ae1 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file I2C_ShapeType.idl
* @author
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
index bb683b6071f..e1db7db6f9a 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(I2C_ShapeType_idl_gen) : connectoridldefaults, ndds_idltocpp_stub {
after += DDS4CCM_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl
index dc8664aee34..1e7cd3a5555 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file I2C_Shapes_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
index 9f1bf0333ba..4396c262684 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(I2C_Shapes_Base_stub) : taoidldefaults, ndds_idltocpp_ts_defaults {
sharedname = I2C_Shapes_Base_stub
dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h
index 626c77e6cf2..14afeadd3c1 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef I2C_SHAPES_TRAITS_H_
#define I2C_SHAPES_TRAITS_H_
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp
index 70103c4723e..14bc5aadd30 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "I2C_Shapes_Common.h"
#include "ace/Env_Value_T.h"
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h
index 2dba4037ea9..9e42f379a6a 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef I2C_SHAPES_COMMON_H_
#define I2C_SHAPES_COMMON_H_
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
index ea7df37ab7f..e7af95e6cf7 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(I2C_Shapes_Common) : dds4ccm_logger, ndds_idltocpp_impl {
sharedname = I2C_Shapes_Common
dynamicflags += I2C_SHAPES_COMMON_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h
index 09ef5391f22..259357cb5d0 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef I2C_SHAPES_COMMON_EXPORT_H
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
index e70bed60a76..3b15db7c2bc 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Common/I2C_Shapes_Common.h"
#include "connectors/dds4ccm/impl/ndds/DataReader_T.h"
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
index e7fe6687276..141295aa128 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*i2c_shapes_rec) : dds4ccm_logger, ndds_idltocpp_impl {
exename = I2C_Shapes_Receiver
after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp
index 5f561bd96e8..9db989a3b61 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Common/I2C_Shapes_Common.h"
#include "connectors/dds4ccm/impl/ndds/DataWriter_T.h"
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
index b0725c2fe14..4de969ba030 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*i2c_shapes_sender) : dds4ccm_logger, ndds_idltocpp_impl, ndds_cck_ts_defaults {
exename = I2C_Shapes_Sender
after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl
index 97c8b5541ac..f1228b5852b 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef LARGE_COMMON_IDL
#define LARGE_COMMON_IDL
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc
index e32291b6512..5cf821a62c1 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Large_Deployment_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = Large_Deployment_stub
dynamicflags += LARGE_DEPLOYMENT_COMMON_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl
index 9006ce330de..4d09d57664c 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SINGLE_SERVICE_COMMON_IDL_
#define SINGLE_SERVICE_COMMON_IDL_
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
index f9c67fc69e7..199292d2aae 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Single_Service_Common_idl_gen) : taoidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_COMMON_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
index e3e8c394f95..5ebdec65340 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef LARGE_CONNECTOR_IDL
#define LARGE_CONNECTOR_IDL
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
index 4531b732125..9579a4fe6dc 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large Large_Connector"
project(Large_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl
index e118793b6d4..2d9312de929 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DDS_PUB_IDL
#define DDS_PUB_IDL
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
index 733e9055068..df88edcce88 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large DDS_Pub"
project(Large_DDS_Pub_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp
index e174f399ce8..4371b10e038 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "DDS_Pub_exec.h"
namespace CIAO_DDS_Pub_Impl
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h
index c4451c3d259..a73f16144fe 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_DDS_PUB_EXEC_MKL1YH_H_
#define CIAO_DDS_PUB_EXEC_MKL1YH_H_
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
index 035241561ca..7a5cb320bb1 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large DDS_Sub"
project(Large_DDS_Sub_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp
index 2a997af61d7..ae7b567ead4 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h
index f6dae9b5300..61cea1dcd92 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl
index 1651897e3cf..9fde2b41c5d 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SINGLE_SERVICE_IDL
#define SINGLE_SERVICE_IDL
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
index f1d6485bc17..8292e9267b5 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -o ../lib -l ../lib Single_Service"
project(Single_Service_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
index 9a34761db87..d1090b3c338 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Quoter_Base.idl
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
index 7685f3e6f08..34749fe2c06 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Quoter_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Quoter_Base_stub
dynamicflags += QUOTER_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl
index 3ad320915d3..5f2082f60fb 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Broker.idl
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
index 872d9481c51..da2e9084a36 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Broker"
project(DDS_Broker_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
index 8d36e188811..32bbd9aa010 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_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/examples/Quoter/Broker/Broker_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
index dece012b7e4..ea11e9a2173 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_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/examples/Quoter/Connector/Quoter_Connector.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
index 2d244a20c52..a09fe6a0bee 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Quoter_Connector.idl
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
index 4c69d8ea320..12ca1d082aa 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l .. -o ../lib -u DDS Quoter_Connector"
project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
index 4ee1618a181..5b693131598 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Distributor.idl
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
index 8cbb3d0fb7b..1d7809a7bd1 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l ../lib -o ../lib -c controller -u DDS Distributor"
project(DDS_Distributor_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp
index 26fff0a970f..9554eaaa413 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_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/examples/Quoter/Distributor/Distributor_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h
index 201bed59154..9e4e2fb5bce 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_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/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
index 199112c9b89..49f178f6d4e 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Shapes_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
index 3d715321623..c370655b160 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Shapes_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Shapes_Base_stub
dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
index 556d3c7c274..9669a787727 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Shapes_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
index fbdc0f64686..c0f218bea41 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l .. -o ../lib -u DDS Shapes_Connector"
project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
index d41d629871a..b152d0228d4 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
index d7b67c71229..87c757c3463 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver"
project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
index 3c7f3e8d2fb..f64d740e019 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
index 69bdf1b523f..5b4ee0068f5 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
index 1875605b465..d0ea6a9c8a1 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
index acb77b7ed92..fadc1c3c0e9 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
index 89fb23da610..22da2de39d9 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
index 760353b2bdf..fdbc6bef248 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl
index 78cd877bea7..c7e8bc65bc8 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Shapes_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc
index f2d47b2daef..8fb79f0b5c5 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (ShapesContr_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = ShapesContr_Base_stub
dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl
index 125f06a936c..dc8acc64199 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Shapes_Contr_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl
index 556d3c7c274..9669a787727 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Shapes_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc
index 416054b0c2c..f340f65ffcb 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p ShapesContr_Base -l .. -o ../lib -u DDS Shapes_Connector"
project(ShapesContr_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl
index 602d7473a37..46d54bab0f3 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc
index 6acca7d4c13..f4cd67ea274 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(ShapesContr_Controller_idl_gen) : componentidldefaults{
custom_only = 1
after += Shapes_Contr_Base_stub
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp
index 0d11b1a3ecb..b083f93f6ea 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h
index d7979a151d1..28c77145b44 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SHAPES_CONTROLLER_EXEC_ETSDUL_H_
#define CIAO_SHAPES_CONTROLLER_EXEC_ETSDUL_H_
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl
index 6d0b04f1560..e6fdf878053 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc
index f436a9f06f2..bd947e04fc2 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(ShapesContr_ContrR_idl_gen) : componentidldefaults{
custom_only = 1
after += Shapes_Contr_Base_stub
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp
index b30d05bc10e..1ab2ccb3972 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h
index f4f4c075201..e7d3b9c425b 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SHAPES_CONTROLLERR_EXEC_ETSDUL_H_
#define CIAO_SHAPES_CONTROLLERR_EXEC_ETSDUL_H_
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl
index cf30442d051..aafbd686bd3 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc
index c9c8678c8bc..cce6c036767 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver"
project(ShapesContr_Receiver_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp
index 5cd393e8c85..4bbe7874404 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h
index 76d698c6f47..3f5887454ab 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl
index 5e167e76c4e..e504a7c9166 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc
index abb7ab832ff..942763b7b94 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p ShapesContr_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(ShapesContr_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp
index b834d2934d4..6c3ae2be1df 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h
index 2ae51791659..35c4f961e16 100644
--- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
index dd710db1f60..829697f1dd5 100644
--- a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
+++ b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CCM_DDS_BASE_IDL
#define CCM_DDS_BASE_IDL
diff --git a/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc
index fe1e8e9fb73..362f1e12134 100644
--- a/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CIAO_OpenDDS_Dcps_idl_gen): gen_ostream, ccm_lem_stub, ciaoidldefaults, \
taobaseidldefaults, ccm_lw, ccm_noevent, ccm_direct_collocation {
requires += dds4ccm_opendds
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl
index a246c468b80..7b4d90e710c 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file dds4ccm_Base.idl
*
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
index 45e4a2cef68..ad91514b2c9 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DDS4CCM_CONNECTOR_IDL
#define DDS4CCM_CONNECTOR_IDL
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl
index fd0e13244c9..42dbdaf6ba9 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file dds4ccm_ConnectorStatusListener.idl
*
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl
index 14e1cbe9702..0fade5491f4 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file dds4ccm_DataListenerControl.idl
*
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl
index 478425c0e76..0535eecae1c 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DDS4CCM_ENTITY
#define DDS4CCM_ENTITY
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl
index 713a7fb1f2c..eadc949c6f9 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file dds4ccm_PortStatusListener.idl
*/
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl
index 52b70b94653..885eab03aec 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file dds4ccm_QueryFilter.idl
*/
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl
index fe22878cb47..521fbf8c70a 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file dds4ccm_StateListenerControl.idl
*/
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc
index a86c3f0bfec..25451e58bf9 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (DDS4CCM_lem_gen) : install, dds4ccm, ciaoidldefaults {
custom_only = 1
after += DDS4CCM_idl_gen
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc
index f7b8d55a26e..929fb16e33c 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, \
ciao_output, taolib, portableserver, ciao_servant {
includes += $(CIAO_ROOT)/connectors
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc
index 150fd644a77..051d64d5762 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=DDS4CCM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
index a8f4638b45f..fe8ab421af0 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DDS_RFT2_DCPS_IDL
#define DDS_RFT2_DCPS_IDL
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl
index 931d2f742e4..64e62203ec8 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NDDS_DCPS_IDL
#define NDDS_DCPS_IDL
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl
index f1fe41405e9..e165e42216e 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NDDS_DCPS_IDL_I
#define NDDS_DCPS_IDL_I
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl
index 84e66db8c48..2ca3586e6fe 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NDDS_DCPS_INSTANCE_HANDLE_IDL
#define NDDS_DCPS_INSTANCE_HANDLE_IDL
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp
index 8a4ba2706e9..51322d79dbf 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ndds_dcps_instance_handleC.h"
static ::DDS::InstanceHandle_t S_HANDLE = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 16, 0};
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h
index c2a244d3827..17440296b19 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef _TAO_IDL_DDS_RTF2_DCPSC_H_XX
#define _TAO_IDL_DDS_RTF2_DCPSC_H_XX
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h
index f65622b7082..b491e8235c4 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h
index 0b3fe4b9559..c5945babcba 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
index 32ace3e6d0f..3be068a5a94 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (CIAO_NDDS_lem_gen) : install, ndds_idltocpp, ciaoidldefaults {
custom_only = 1
after += CIAO_NDDS_idl_gen
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
index 69323aa07b8..0bc50fa1d15 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant {
includes += $(CIAO_ROOT)/connectors
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
index 93bef38510d..a136a721cce 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (CIAO_NDDS_idl_gen) : install, ndds_idltocpp, componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=NDDS_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp
index 772ce6feed9..5199451e5be 100644
--- a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp
+++ b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "CCM_DataReader.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp
index 933abe95245..62d71e9f988 100644
--- a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp
+++ b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "CCM_DataWriter.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp
index b31ecd8329b..ad574ed8726 100644
--- a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/Coherent_Changes_Guard.h"
CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (
diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
index 65703a7d415..4fa50f0eb49 100644
--- a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "dds4ccm/impl/ConditionManager.h"
#include "dds4ccm/impl/Utils.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.h b/CIAO/connectors/dds4ccm/impl/ConditionManager.h
index 469b6b96407..d773e939af1 100644
--- a/CIAO/connectors/dds4ccm/impl/ConditionManager.h
+++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CONDITIONMANAGER_H_
#define CONDITIONMANAGER_H_
diff --git a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
index 4ff36edbf8b..3ff0b3c939a 100644
--- a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ContentFilterSetting.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "dds4ccm/impl/Utils.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
index 85c38df214e..06e7db19130 100644
--- a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h
index 0a8f5a1a3ee..ef50ac24205 100644
--- a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h
+++ b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @author Johnny Willemsen <jwillemsen@remedy.nl>
*
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
index 9937b89c4bf..7e325e5e60d 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Env_Value_T.h"
#include "tao/ORB_Core.h"
#include "dds4ccm/impl/Utils.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
index 56123b347cc..34a86e07f1d 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/DataReaderListener_T.h"
#include "dds4ccm/impl/Writer_T.h"
#include "dds4ccm/impl/Getter_T.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
index 8e4793eb2f1..05d68c4e6ec 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/logger/Log_Macros.h"
template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, bool FIXED>
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
index 14892b2ae33..42623aec1db 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/DataListenerControl_T.h"
#include "dds4ccm/impl/DataReaderListener_T.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp
index ef4bb5414b8..81688f74ce3 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/logger/Log_Macros.h"
template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
index 13f99f0d508..e1f25b90760 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/DataReaderStateListener_T.h"
#include "dds4ccm/impl/StateListenerControl_T.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
index 29069d10fe8..0b099761033 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/DataReaderStateListener_T.h"
#include "dds4ccm/impl/Updater_T.h"
#include "dds4ccm/impl/Reader_T.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
index b13387eb114..ae258d83fa4 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/logger/Log_Macros.h"
#if (CIAO_DDS4CCM_OPENDDS==1)
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
index 1be0e509db3..c075b2b23e9 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
index 17a241d3f86..392835b0384 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/DataReaderStateListener_T.h"
#include "dds4ccm/impl/Updater_T.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
index 885fc17b221..05c65a15183 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "dds4ccm/impl/DataReaderListener_T.h"
#include "dds4ccm/impl/DataListenerControl_T.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp
index 627cec340b4..50d99b5489a 100644
--- a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
template <typename BASE_TYPE>
CCM_DDS_DataListenerControl_T<BASE_TYPE>::CCM_DDS_DataListenerControl_T (void) :
mode_ (::CCM_DDS::NOT_ENABLED),
diff --git a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
index d805fd15592..ba936757ef4 100644
--- a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef DATALISTENERCONTROL_T_H_
#define DATALISTENERCONTROL_T_H_
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
index b876ee257a0..68ca4cf1a76 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/logger/Log_Macros.h"
template <typename LISTENER>
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h
index 82e3df31231..dd15e414f5f 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @author Marcel Smit (msmit@remedy.nl)
*
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
index 29453804c04..458491a6bf1 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
index a63df652ab5..80afa61f5e7 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp
index 0fbf6d646da..c8ab1a84571 100644
--- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/DomainParticipantManager.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "dds4ccm/impl/Utils.h"
diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
index d060d5d9bea..85ee254e6ca 100644
--- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
@@ -1,5 +1,4 @@
-// // $Id$
-#include "dds4ccm/impl/Utils.h"
+// #include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp
index 1dfd68326bc..4dbe6e8780b 100644
--- a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "CCM_DataReader.h"
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject.cpp b/CIAO/connectors/dds4ccm/impl/LocalObject.cpp
index 7d303b95c09..5e670f775b2 100644
--- a/CIAO/connectors/dds4ccm/impl/LocalObject.cpp
+++ b/CIAO/connectors/dds4ccm/impl/LocalObject.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/LocalObject.h"
namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject.h b/CIAO/connectors/dds4ccm/impl/LocalObject.h
index bbaace729fc..0818037c712 100644
--- a/CIAO/connectors/dds4ccm/impl/LocalObject.h
+++ b/CIAO/connectors/dds4ccm/impl/LocalObject.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef DDS4CCM_LOCALOBJECT_H_
#define DDS4CCM_LOCALOBJECT_H_
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp b/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
index 4fdc5fbb06b..02ff07683ce 100644
--- a/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
namespace CIAO
{
namespace DDS4CCM
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
index 43824e2c02e..fb367ee4917 100644
--- a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
+++ b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef DDS4CCM_LOCALOBJECT_T_H_
#define DDS4CCM_LOCALOBJECT_T_H_
diff --git a/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp b/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp
index 7b1a4bb5cc0..66c8808f062 100644
--- a/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/PortStatusListener.h"
#include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp
index 94482455fdc..b95d1a141ac 100644
--- a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/PublisherListener.h"
#include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
index 11e006c4d71..70ce29db2d4 100644
--- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
@@ -1,6 +1,4 @@
-// // $Id$
-
-#include "dds4ccm/impl/Utils.h"
+// #include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "dds4ccm/impl/SampleInfo.h"
diff --git a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp
index a3f25c75871..877fb84c9af 100644
--- a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
template <typename BASE_TYPE>
CCM_DDS_StateListenerControl_T<BASE_TYPE>::CCM_DDS_StateListenerControl_T (void)
: is_filter_interpreted_ (false)
diff --git a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h
index d9e2151acfb..7eb0afa4038 100644
--- a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h
+++ b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef STATELISTENERCONTROL_T_H_
#define STATELISTENERCONTROL_T_H_
diff --git a/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp
index 71c53fd8f01..803f638b2d5 100644
--- a/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/SubscriberListener.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
diff --git a/CIAO/connectors/dds4ccm/impl/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/TimeUtilities.h
index faec4f02617..455e3261a0b 100644
--- a/CIAO/connectors/dds4ccm/impl/TimeUtilities.h
+++ b/CIAO/connectors/dds4ccm/impl/TimeUtilities.h
@@ -1,5 +1,3 @@
-// $Id$
-
//=============================================================================
/**
* @file TimeUtilities.h
diff --git a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/TopicListener.cpp
index 5b7deb09c1e..c4819269863 100644
--- a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/TopicListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/TopicListener.h"
#include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
index e4e4345ac26..c1ee9b3f6a2 100644
--- a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/Coherent_Changes_Guard.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/Utils.cpp b/CIAO/connectors/dds4ccm/impl/Utils.cpp
index 5f42f44cec6..b8011148d18 100644
--- a/CIAO/connectors/dds4ccm/impl/Utils.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Utils.h"
namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
index d63e59a5534..c478c39982e 100644
--- a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/Utils.h"
#include "dds4ccm/impl/Coherent_Changes_Guard.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h
index d4ab5998a57..fd09437021c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h
+++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DDS4CCM_DDS_IMPL_EXPORT_H
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
index 08e131fdcfc..aae76fa4d17 100644
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
+++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, \
ciao_output, ccm_stub, dds4ccm_logger, dds4ccm_base {
diff --git a/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h b/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h
index e3941363f9e..af004632352 100644
--- a/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h
+++ b/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl DDS4CCM_Logger
// ------------------------------
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp
index 9a053f4ca5c..6721de9956c 100644
--- a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp
+++ b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Log_Macros.h"
DDS4CCM_Logger_Export unsigned int DDS4CCM_debug_level = 0;
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h
index 0f3ef95d096..65c54686c59 100644
--- a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h
+++ b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Log_Macros.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp b/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp
index 5b6e45aa8f8..2d88ca354ea 100644
--- a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp
+++ b/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Logger_Service.h"
#include "Log_Macros.h"
#include "ace/Get_Opt.h"
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h b/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h
index f76b4399ee6..9c166a65587 100644
--- a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h
+++ b/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DDS4CCM_LOGGER_SERVICE_H_
#define DDS4CCM_LOGGER_SERVICE_H_
diff --git a/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc b/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc
index 58d78a63dba..b40efede048 100644
--- a/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc
+++ b/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DDS4CCM_Logger): install, ciao_lib, taolib, acelib {
sharedname = DDS4CCM_Logger
dynamicflags += DDS4CCM_LOGGER_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp
index d2737fc95de..35441752b2c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Condition.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "ndds/ndds_cpp.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
index 739ec4576dd..a353736a936 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/ContentFilteredTopic.h"
#include "dds4ccm/impl/ndds/Topic.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
index 92ea849acdc..8683b6ce1cc 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/DataReader.h"
namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
index 5b52d5e2b55..88d30b88595 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/DataReaderListener.h"
#include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h"
#include "dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp
index eb2017a5572..7a56d7b2b58 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/DataReaderListener.h"
#include "dds4ccm/impl/ndds/StatusCondition.h"
#include "dds4ccm/impl/ndds/ReadCondition.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
index 39fcc25ad07..fda2bba2aba 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/DataWriter.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "ndds/ndds_cpp.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
index ed3962b16d2..f27f595e6e2 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/DataWriterListener.h"
#include "dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h"
#include "dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp
index b817acc7476..d1f20d80317 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/DataWriter.h"
#include "dds4ccm/impl/ndds/StatusCondition.h"
#include "dds4ccm/impl/ndds/Publisher.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
index 0e05cae8d0a..76da9e0ff8c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/DomainParticipant.h"
#include "dds4ccm/impl/ndds/Subscriber.h"
#include "dds4ccm/impl/ndds/Publisher.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
index 583df715559..9ebe40e3fd6 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/DomainParticipantFactory.h"
#include "dds4ccm/impl/ndds/DomainParticipant.h"
#include "dds4ccm/impl/ndds/DomainParticipantListener.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
index 1330f3e1391..15afb558dd5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/DomainParticipantListener.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "dds4ccm/impl/ndds/TypeSupport.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
index db98f6cf3b1..a0a3951145b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/Publisher.h"
#include "dds4ccm/impl/ndds/PublisherListener.h"
#include "dds4ccm/impl/ndds/DomainParticipant.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
index 843c1bab998..94b867fbb07 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/PublisherListener.h"
#include "dds4ccm/impl/ndds/Publisher.h"
#include "dds4ccm/impl/ndds/DataWriter_T.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
index 5b2edacb524..8fcb74d4d95 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/QueryCondition.h"
#include "dds4ccm/impl/ndds/convertors/StringSeq.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp
index 73b5aa0d161..8f949b17d6e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/ReadCondition.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "ndds/ndds_cpp.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp
index be9012b05d8..80c0865e472 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/StatusCondition.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "ndds/ndds_cpp.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
index 3785d2c9785..8f9f859f162 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/Subscriber.h"
#include "dds4ccm/impl/ndds/Topic.h"
#include "dds4ccm/impl/ndds/ContentFilteredTopic.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
index aa758be1c0e..e34424b37ec 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/SubscriberListener.h"
#include "dds4ccm/impl/ndds/Subscriber.h"
#include "dds4ccm/impl/ndds/DomainParticipant.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
index d36388ce4fb..c1a625ceb25 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/Topic.h"
#include "dds4ccm/impl/ndds/StatusCondition.h"
#include "dds4ccm/impl/ndds/TopicListener.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp
index 8378fcf10a9..c76c5cb99c5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/TopicDescription.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "ndds/ndds_cpp.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
index 0afb1a5bd93..ca8fe2b5078 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/TopicListener.h"
#include "dds4ccm/impl/ndds/Topic.h"
#include "dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp
index 6c7501ebf7d..f743968462a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/TypeSupport.h"
namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp
index 802c87363b6..bcd67e3ab7e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/ndds/Utils.h"
#include "dds4ccm/impl/logger/Log_Macros.h"
#include "ace/Tokenizer_T.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
index b8b3ff5a885..7d3ad599c0c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "WaitSet.h"
#include "dds4ccm/impl/ndds/Condition.h"
#include "dds4ccm/impl/ndds/QueryCondition.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h
index e8f95a00361..19c64d6198c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef DDS4CCM_DDS_NDDS_EXPORT_H
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc
index 1c54f59c015..0bf92524d97 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CIAO_DDS4CCM_DDS_NDDS) : install, ndds_idltocpp_stub, taolib, \
ciao_output, dds4ccm_logger, nddslib {
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl
index 534b4d2858e..3a0de67b9ba 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef LATENCY_BASE_IDL
#define LATENCY_BASE_IDL
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
index 2a211a8f7e5..e50ada72fb8 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Latency_Base_plain_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Latency_Base_plain_stub
dynamicflags += LATENCY_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
index 11ed41b1d61..544d885a738 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*latency_receiver_plain) : ndds_idltocpp, acelib, taolib, typecode {
after += DDS_Latency_Base_plain_stub
exename = DDS_receiver
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp
index 58531a5b7f5..13ccdbaddb4 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
#include "ace/High_Res_Timer.h"
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
index f9fd7b2e227..503fbceb27b 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*latency_sender_plain) : nddslib, acelib, taolib, typecode {
after += DDS_Latency_Base_plain_stub
exename = DDS_Sender
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp
index 41fdcbe0762..23ea9a9e5f6 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
#include "tao/ORB_Core.h"
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp
index 833342c43f8..752f1971d50 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
#include "ace/Env_Value_T.h"
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl
index 5f7a40dac05..b28bd3a61bd 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Throughput_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
index 5f636810cca..95f1b33ca8c 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Throughput_Base_stub_plain) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Throughput_Base_stub
dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
index 54b5f880053..9197cbfc596 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*receiver_plain) : nddslib, acelib, taolib, typecode {
after += DDS_Throughput_Base_stub_plain
exename = DDS_receiver
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp
index 43e702809a8..c9cd6162f2a 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
#include "ace/Env_Value_T.h"
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
index 478971923b6..068cbc775d5 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*sender_plain) : nddslib, acelib, taolib, typecode {
after += DDS_Throughput_Base_stub_plain
exename = DDS_Sender
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp
index 1c378f0d976..499241ce5d1 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
#include "ace/Env_Value_T.h"
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
index e49e32c985f..d36869f3ed4 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Perf_Keyed_Test_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
index d1860fec7af..e23011f227a 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Perf_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Perf_Keyed_Test_Base_stub
dynamicflags += PERF_KEYED_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl
index 9c60fa72fc3..9fe2a19a315 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Perf_Keyed_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
index 0dd5297ede6..73257fa5473 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l .. -o ../lib -u DDS Perf_Keyed_Test_Connector"
project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl
index e08d2ec1e37..0033ddaad8a 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
index c11a25fbbee..18df7980bdd 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Perf_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_Perf_Keyed_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp
index ec8fd9dd07b..3b8fa86c7e6 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_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/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h
index 5f3f4f75580..1f4403622d9 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_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/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
index 3870999832f..5752f96bbaf 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
index 4f9483ecd52..262bce294f5 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_Perf_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp
index 18f3a91d0b4..7c15ba28542 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_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/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h
index 14a39c5054c..864ad161bdc 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_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/performance-tests/Latency/Base/LatencyTT_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl
index a75dbf424c4..7de56b3076e 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file LatencyTT_Test_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc
index 0dab0d18f04..e797df7dbac 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_LatencyTT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_LatencyTT_Test_Base_stub
dynamicflags += LATENCYTT_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl
index e42da062933..bacb82fa723 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file LatencyTT_Test_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
index cb6b9ef764e..60307471e60 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_LatencyTT_Test_Base -l .. -o ../lib -u DDS LatencyTT_Test_Connector"
project(DDS_LatencyTT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl
index 46f4048c391..d75c6a1a3fe 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc
index c997b41ea15..8782e264bfe 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_LatencyTT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_LatencyTT_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp
index e1124a08032..168bb9fc4ad 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_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/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h
index b0d411d3874..7ccbf144b4e 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_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/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl
index 3ddbebec7eb..91e2ef8f7fe 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc
index 275f0bae134..afb0b7a38af 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_LatencyTT_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_LatencyTT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp
index 39e56455c0f..41c9267aef7 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_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/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h
index cb97f2e591c..66333f35cd8 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_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/performance-tests/Throughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
index 213c6fc38fa..45a19c666d6 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Throughput_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc
index 0814281894a..8d7b06dafcd 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Throughput_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Throughput_Base_stub
dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
index 0093601526e..1d540e04466 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Throughput_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
index 1645ed889a7..46ac62d42c6 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l .. -o ../lib -u DDS Throughput_Connector"
project(DDS_Throughput_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl
index 03675988118..f09b8938611 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc
index 32dac39366c..70b7c003a1b 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Throughput_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_Throughput_Connector_idl_gen DDS_Throughput_Sec_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp
index c1679aa40f8..48d041abcef 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_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/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h
index b9a4edea3fd..8ce0b44cc33 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_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/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl
index eb385b73b94..2ee2cc683d0 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Throughput_Sec_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
index 431bd3846d5..1b893eb477e 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l .. -o ../lib -u DDS Throughput_Sec_Connector"
project(DDS_TP_Sec_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl
index ccf716336bf..9cb773135d9 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc
index 50d1d49a58b..9b6d0c52b09 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_Throughput_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp
index 957fc287d65..3071bf55951 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_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/performance-tests/Throughput/Sender/Throughput_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h
index c09ff84501f..dd5d2ece208 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_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/CSLDeadline/Base/CSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
index 4566e7cd7e5..5bd3aa34352 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CSL_DeadlineTest_Base.idl
* @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
index a56341adf6a..c3219fd1a33 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CSL_DeadlineTest_Base_stub
dynamicflags += CSL_DEADLINETEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
index bad80fe363d..72770442ace 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CSL_DeadlineTest_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
index a740d5eb48e..6b5cd55c228 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l .. -o ../lib -u DDS CSL_DeadlineTest_Connector"
project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
index 7543cf400be..afff6a7ef12 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
index fcf33fc9a09..96ca8bf00cc 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_CSL_DT_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
index 2fc95a1dff7..f8e2f553741 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CSL_DeadlineTest_Receiver_exec.h"
#include "ace/Log_Msg.h"
#include "tao/ORB_Core.h"
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
index 8fc17607daa..09383f289ca 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
index 5b204fb8f1b..95ddfb14c9f 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
*/
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
index c1a1e87e9c8..45f26e72e69 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
index bf2d4bf034d..a005474788c 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Test for OFFERED_DEADLINE_MISSED status : Writer failed to write data within
// the deadline time period set in the profile.
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
index a89d1ec1c52..678cc3c7e5e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
index 4fc418b21d2..d2b1a6260fd 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CSL_QoSTest_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
index 64370bb98f5..3782d26a74d 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CSL_QoSTest_Base_stub
dynamicflags += CSL_QOSTEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
index aa31e281e3f..20c524cc3a3 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CSL_QoSTest_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
index 02279c6ded0..06be4dfd932 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l .. -o ../lib -u DDS CSL_QoSTest_Connector"
project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
index a2e21babb1d..4a0d73b4e00 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
index ad025772732..1aa1e5f0e88 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_CSL_QoSTest_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
index 0f872426cb5..7f38ec76fb3 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
index 55aa5b7431a..4e43a8ad491 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
index 7a9efb17709..77b4674e421 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
index ea1afba478c..bf832d1bcdf 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Test for ConnectorStatusListener: on_offered_incompatible_qos
#include "CSL_QoSTest_Sender_exec.h"
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
index 51052221e1a..75c7bcfe932 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
index 98c33885bcd..2435b1d1108 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CSL_SRTest_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
index a947325e8fe..d1471149105 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CSL_SRTest_Base_stub
dynamicflags += CSL_SRTEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
index 526e8ab0763..3e064833a91 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CSL_SRTest_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
index 2f0ca5e560c..2eaedc3edab 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l .. -o ../lib -u DDS CSL_SRTest_Connector"
project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
index 1732764cd9d..796d032255b 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
index 832bd209c80..fbf27cbf327 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_CSL_SRTest_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
index 6a57802fd86..95cf1a9f244 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_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/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
index b15757597ae..6bec32bc73a 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_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/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
index 2edc7ef8dda..7675b067f8e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
index 72aefc6ed35..5bef33fd457 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
index 0bd2b673570..4a3e7028231 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_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/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
index 8936a49c448..a62c8408d18 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_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/CSLUnexpStat/Base/CSL_USTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
index b0b90a36d9e..29c0dd70442 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CSL_USTest_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
index f8ceac4c176..9f5f5e9e8c5 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_CSL_USTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CSL_USTest_Base_stub
dynamicflags += CSL_USTEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
index 4208c5b0ff8..32ad7cf13ce 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CSL_USTest_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
index da92a6b340c..2372945f778 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l .. -o ../lib -u DDS CSL_USTest_Connector"
project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
index bd780f59dc4..aedb58ebd5f 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
index f0a8733b7ed..79dda1f9d80 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_CSL_USTest_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
index 28d1be3445f..5d0e0ba817e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_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/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
index f7df02689b8..88ebdc7a273 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_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/CSLUnexpStat/Sender/CSL_USTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
index 13580db3c2b..4cdc3107c58 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
index e623769dc89..ec9ebf7f815 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
index 65056666e4e..ba268353c2e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_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/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
index 2c529465851..74ae7db32ff 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_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/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
index 448e1af0078..8855d45864d 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CoherentUpdate_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
index 0a62f5f8ad7..37658d27e27 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (CoherentUpdate_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CoherentUpdate_Test_Base_stub
dynamicflags += COHERENT_UPDATE_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl
index ebb412e2d73..7bd2be52b1b 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Reader_Starter.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
index 5a00581be0b..be474990c28 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Coh_Update_ReaderStarter_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
index b7a1e72117a..22e01fc79fb 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CoherentUpdate_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
index fbd9038545d..3b33c29bfcc 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p CoherentUpdate_TestBase -l .. -o ../lib -u DDS CoherentUpdate_Test_Connector"
project(CoherentUpdate_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl
index 675e5183b2f..ab41ad8e412 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
index 073d5b1bc0d..5c0974fb005 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CoherentUpdate_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += CoherentUpdate_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp
index 9b0a441c1d9..a6d4750a855 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CoherentUpdate_Test_Receiver_exec.h"
#include "tao/ORB_Core.h"
#include "ace/OS_NS_unistd.h"
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h
index a5842ff4581..92349ce6df1 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COHERENTUPDATE_TEST_RECEIVER_EXEC_94WCEL_H_
#define CIAO_COHERENTUPDATE_TEST_RECEIVER_EXEC_94WCEL_H_
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl
index da87e5a68a3..b9c3e548001 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
index b22c09b72e1..56c819695ef 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p CoherentUpdate_TestBase -l ../lib -o ../lib -c controller -u DDS Sender"
project(CoherentUpdate_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp
index c68b6741b4b..b60ed95945a 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CoherentUpdate_Test_Sender_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h
index 170edd54ad8..bb6be68fcd7 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COHERENTUPDATE_TEST_SENDER_EXEC_VI4L1L_H_
#define CIAO_COHERENTUPDATE_TEST_SENDER_EXEC_VI4L1L_H_
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
index 1b699873935..58d4b9d347e 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CoherentWrite_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
index e5c6877d383..1fc2c2b7903 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (CoherentWrite_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CoherentWrite_Test_Base_stub
dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl
index 7a50eed87f3..fc0847932dc 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Reader_Starter.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
index af5597803a3..2b15e9e7c45 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Coherent_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
index 16496f23257..270b1189a74 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CoherentWrite_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
index 8e4c9e09c88..cc2fac6fbf8 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l .. -o ../lib -u DDS CoherentWrite_Test_Connector"
project(CoherentWrite_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl
index e849e0fd8fd..8591550a8ea 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
index 9f008a9ac71..e66cc09b7ae 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CoherentWrite_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += CoherentWrite_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp
index 775f07a0066..061c5f5cd15 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_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/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h
index 48692712984..ae74291ae77 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_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/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl
index 66ed42c99bf..0e9cfb46df9 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
index 7975fc52e38..bc87dee5517 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(CoherentWrite_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp
index 0d32a5d5996..0c7f99cf703 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_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/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h
index 64b9485fea2..cca68b9c6f8 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_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/CollocatedPubSub/Base/Collocated_Base.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
index e36f627121d..9fe01e52f7f 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef COLLACATED_BASE_
#define COLLACATED_BASE_
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc
index 958f6ebbd66..d939fdc6348 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Collocated_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = Collocated_Base_stub
dynamicflags += COLLACATED_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
index fa515cbb86a..8555202b1e6 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Collocated_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen Collocated_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl
index 0615dec14df..4471ce44144 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PUBSUB_COMPONENT_
#define PUBSUB_COMPONENT_
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
index 487483045c8..1aa98495166 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(PubSubComponent_idl_gen) : componentidldefaults, dds4ccm {
after += Collocated_Connector_idl_gen DDS_Starter_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
index 9fa7bf2cc8d..462f0ebbdf4 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "PubSub_Component_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h
index 6a1cb4a8d71..7391ebf1357 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_
#define CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl
index a10072c233f..791e62294f0 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SUB_COMPONENT_
#define SUB_COMPONENT_
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
index a436c5f3836..371880ecee3 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(SubComponent_idl_gen) : componentidldefaults, dds4ccm {
after += Collocated_Connector_idl_gen DDS_Starter_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp
index faaa7e51fe8..a644b08d8cd 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Sub_Component_exec.h"
namespace CIAO_CoPubSub_Sub_comp_Impl
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h
index d43763f78f4..4b6c45083f7 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_
#define CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
index 846f64df98e..c860f65027c 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DIFFDIR_IDL
#define DIFFDIR_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
index e848cec34d2..615ff24a7d2 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DiffDir_stub) : taoidldefaults, \
dds4ccm_ts_default, DiffDir {
sharedname = DiffDir_stub
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
index 4131e8eb8cd..f4a400ab732 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DIFFDIR_CONNECTOR_IDL
#define DIFFDIR_CONNECTOR_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
index 104354e6b6e..e3cefe05fad 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -b dds4ccm_base DiffDir_Connector"
project(DiffDir_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
index 1d351a138f3..db1caed274a 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CFT_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
index 32f3ed4c4f6..072bebbed80 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (CFT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CFT_Test_Base_stub
dynamicflags += CONTENTFILTEREDTOPIC_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl
index 0d45e1732f5..332b0c5eb7c 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
index 5c951663474..c932730b398 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CFT_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += CFT_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h
index f3f7859b669..b6349f7f40a 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
index af9957489c8..df556d08cab 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CFT_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
index 54946c6b406..0d248c5b0be 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p CFT_Test_Base -l .. -o ../lib -u DDS CFT_Test_Connector"
project(CFT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
index 480308dfe07..f7d819efe29 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CFTLE_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
index 5b9359894e3..59e839f1dc5 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_CFTLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CFTLE_Test_Base_stub
dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
index 87ccb73c2ec..04395d584eb 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CFTLE_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
index 031d42d2b25..3a5a0b192f7 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CFTLE_Test_Base -l .. -o ../lib -u DDS CFTLE_Test_Connector"
project(DDS_CFTLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl
index fa883262ac3..ef595aa217d 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
index 4a608ac1783..5c52a76f4f3 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_CFTLE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_CFTLE_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
index d9b86bac6d7..44b10bf7e3d 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_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/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h
index 5dd56b31a22..a5d193bd04e 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_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/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl
index af49d887b84..a7f807f0e64 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
index e742d9e7656..6715e986b2d 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CFTLE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_CFTLE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp
index 23e9afd5a5f..0352ef020de 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_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/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h
index dd37a423a09..23ebae100fa 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_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/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
index 2dbbee4ab90..40911e517e4 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Exception_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
index af07641daea..11b3f8805fa 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (CFT_Exception_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CFT_Exception_Test_Base_stub
dynamicflags += CFT_EXCEPTION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl
index 2bb932550dc..232907f01c6 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
index 22a8369448d..2abef71a064 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CFT_Exception_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += CFT_Exception_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h
index 425a0c276b5..f8367688ab0 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
index 1e7e2c601f8..dc039960236 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Exception_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
index 270ff9ad3b3..3f1aa68a9dd 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p CFT_Exception_Test_Base -l .. -o ../lib -u DDS CFT_Exception_Test_Connector"
project(CFT_Exception_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl
index 96ffdf45aa3..b61d30c7687 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
index 51cd2cd48e3..806cd6640ad 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CFT_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/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl
index 28777250a83..7fadf380e9f 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
index 991be65e286..9feeba0ab26 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CFT_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CFT_ReadGet_Test_Base_stub
dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl
index 236350ae43e..7a280e41771 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
index 383938b156f..1b1e27f6218 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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(CFT_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl
index 7b4650a6df9..b9e00adc9fa 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
index bd70d89bc33..6f8f07619f3 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CFT_ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += CFT_ReadGet_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
index b747fe57fdb..600cece9081 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
index 0e7f4cecb14..424abbe32c5 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl
index 59cc567618c..7c4c9a22ae9 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc
index 4c167e1993c..f0cd858c212 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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(CFT_ReadGet_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
index ea6bd539dd2..15937591fce 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h
index 83922519e9a..48723c18067 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/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/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
index 5cf9b67f1f2..da7e51836c0 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CFTLS_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
index af88f24a777..5b30e442ccf 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_CFTLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CFTLS_Test_Base_stub
dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
index 782543c9857..84dbf35b5a0 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CFTLS_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
index 867c2feec9c..8ac8d9af7a9 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CFTLS_Test_Base -l .. -o ../lib -u DDS CFTLS_Test_Connector"
project(DDS_CFTLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl
index ff8dc50f799..c0a22c26b01 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
index a39bedc2403..f881b671225 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_CFTLS_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_CFTLS_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
index ac0cf040b5f..656dbaa4846 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl
index 5c797b81f8f..1d30d34f57a 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
index 2832f458839..1fdabb4b0cc 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_CFTLS_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_CFTLS_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp
index c5d1a479bef..ba27bdbbc04 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CFTLS_Test_Sender_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h
index 8c65fcf2b01..df81462c9e2 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_CFTLS_TEST_SENDER_EXEC_NYP61D_H_
#define CIAO_CFTLS_TEST_SENDER_EXEC_NYP61D_H_
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
index 9210139e755..525042673a8 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Writer_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc
index 22a4d431a35..ee28c32ab45 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_DDSWriterEntityBase_stub
dynamicflags += WRITER_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
index 8edcd5d012e..421f8585ccd 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Writer_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
index 82f95008537..9412a344dc9 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l .. -o ../lib -u DDS Writer_Connector"
project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl
index e23fae3ea28..344e3826c91 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
index 1749483f932..399ff061ff2 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_DDSWriterEntityConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp
index 23de81b51e3..616c6e25646 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_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/DDSEntity/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h
index 16f5ffffadd..82201909a1b 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_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/DDSEntity/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
index 4cdcbdd1824..13bdad07c59 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
index fecb1232d00..82039febd68 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
index 8218e229d5e..c9301a67feb 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_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/DDSEntity/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h
index d5ce2857973..8164d4b4f58 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_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/Derived/DDS_Derived_Connector_T.h b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
index 8db6b7565e6..392479178a2 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined DERIVED_CONNECTOR_T
#define DERIVED_CONNECTOR_T
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
index 0fee7b58604..c6b05f3fdfe 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
+++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DERIVED_IDL
#define DERIVED_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc
index 43d595c83d2..8d33e93b753 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Derived_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = Derived_stub
dynamicflags += NOMODULE_COMMON_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
index 287d61e070e..ed4059534f7 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DERIVED_CONNECTOR_IDL
#define DERIVED_CONNECTOR_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
index ca72d74e1b6..ad959acfab8 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Derived_Connector_idl_gen) : connectoridldefaults, dds4ccm {
custom_only = 1
after += Derived_stub
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
index 1299b582b48..69588857156 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file DNM_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
index 4cb85ab2f3f..8e0e78a1536 100755
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_DNM_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_DNM_Base_stub
dynamicflags += DOUBLE_NESTED_MODULE_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
index 0f0c3670c5d..68ad2eec4e9 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file DNM_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
index 144fde53eff..c9c973ddf85 100755
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_DNM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_DNM_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
index 93175a1925b..afa5b6ce2f2 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file DNM_Sender.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
index 045577065f4..1bd753bbdb3 100755
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_DNM_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DNM_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
index a3b8d331a63..7e5830ccb3e 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "DNM_Sender_exec.h"
#include "Base/DNM_BaseC.h"
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
index 087202207ce..9d9361ff4b5 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
index ba0b37c5577..5f4a523d5d7 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Event_Connection_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
index 7da18f7d1e6..e953e70512c 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_ECT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_ECT_Base_stub
dynamicflags += EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
index e456dfd3710..771620f19c7 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Event_Connection_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
index 65ce1a135f6..3a53d8ad1b7 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l .. -o ../lib -u DDS Event_Connection_Test_Connector"
project(DDS_ECT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl
index af13df3b057..627c3e4909b 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
index 41f883a9c4d..dc9166a24d9 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_ECT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_ECT_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
index 5f8e321001d..1818e387d4f 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef EVENT_CONNECTION_RECEIVER_EXEC_H_
#define EVENT_CONNECTION_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl
index 1b25fe6a85a..cd21c5158cb 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
index ea27d85d363..70da2a16c63 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_ECT_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
index 9c65437d17b..ab7d1aee693 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Event_Connection_Test_Sender_exec.h"
namespace CIAO_Event_Connection_Test_Sender_Impl
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
index 704d4d9c35b..4509c06bf87 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef EVENT_CONNECTION_SENDER_EXEC_H_
#define EVENT_CONNECTION_SENDER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
index e94aa7d5c46..5f863dfc852 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file FSS_Event_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
index 1cb4a8bf5c8..d3e00ad4ba2 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_FSS_Event_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_FSS_Event_Base_stub
dynamicflags += FIXED_SIZE_STRUCT_EVENT_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
index d072bb7b54e..3f15d247191 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file FSS_Event_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
index 2ad1c8ee68f..5a30d625af0 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_FSS_Event_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_FSS_Event_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
index 12151014fa4..d09fc6a6884 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file FSS_State_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
index c84a5728ff6..e5e929febc7 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_FSS_State_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_FSS_State_Base_stub
dynamicflags += FIXED_SIZE_STRUCT_STATE_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
index d502cffe810..0ee2f8d5638 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file FSS_State_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
index f7ba974f5cd..b92636ed14c 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_FSS_State_Base -l .. -o ../lib -u DDS FSS_State_Connector"
project(DDS_FSS_State_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
index c41a28d7066..9e56e98005b 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file GCE_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
index 0090ff44ab1..7ac420f122b 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (GCE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = GCE_Test_Base_stub
dynamicflags += GET_COMPONENT_EVENT_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl
index a0daa8b28f6..cbf76c3a7d6 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
index 193d728f28f..ab3f20f1130 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(GCE_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += GCE_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h
index 252d35b47bd..79db6fd36e7 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
index a6062326d04..ae80f12bf6a 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file GCE_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
index 4acf6b46127..802e33ce66d 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p GCE_Test_Base -l .. -o ../lib -u DDS GCE_Test_Connector"
project(GCE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
index cc2ee49d8c0..28624e01777 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file GCS_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
index 286be6ed200..7756e763040 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (GCS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = GCS_Test_Base_stub
dynamicflags += GET_COMPONENT_STATE_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl
index daa66fb4439..ec5ce2468b9 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
index 475efbc2ba2..929c3edd9f3 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(GCS_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += GCS_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h
index 12f49d8c2ea..0d749d19194 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
index 31c514609ed..c4c89e62b17 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file GCS_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
index 7f57d44fba7..033a3b36eda 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p GCS_Test_Base -l .. -o ../lib -u DDS GCS_Test_Connector"
project(GCS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
index 243bd7fe124..cc639fc2100 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Get_Invoker.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
index f9857608592..6db55753faf 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Get_Invoker_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after +=
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
index 6980c9e4bb5..e36c901337a 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Getter_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
index e86dc197785..e48e419a2a2 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Getter_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Getter_Test_Base_stub
dynamicflags += GETTER_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
index a3770782934..ad8902eb561 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Getter_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
index 5486e99bf8c..45c6a8b80ac 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l .. -o ../lib -u DDS Getter_Test_Connector"
project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
index 20ee77c4264..431bc426ae0 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
index cb5f5400cca..fadaa44b2a5 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_Getter_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
index 4d782f71e0a..bd20a56aec6 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_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/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
index 391309a499f..4f9b4fd9ab5 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_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/Getter/Sender/Getter_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
index 95334347f9e..acc67383c3f 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
index 03e2204374b..e08b4d402a0 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
index 49bb6d825ac..86cce2badfc 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_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/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
index 0e4c04263f9..cb017322f97 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_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/HomeDerived/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl
index 52e2616135b..262effa164f 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Hello_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc
index 450d2e2d5c9..ac400cd71d3 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Home_Hello_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = Home_Hello_Base_stub
dynamicflags += HELLO_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl
index 11c3fc64caa..4b20fa3c416 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Hello_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc
index b00bfd42628..0071d626167 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Home_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen Home_Hello_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl
index d51f3912c25..db9a415bf82 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Hello_Connector2.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc
index d07ff4e51f2..34106691416 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Home_Hello_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen Home_Hello_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl
index 64be57d8ad9..d1692eb1582 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc
index 0a052b9bce5..accf17584fb 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Home_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm {
avoids += ace_for_tao
after += Home_Hello_Connector_idl_gen Home_Hello_Connector2_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp
index 7fdafcc78c4..7024dbf18ef 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Hello_Sender_exec.h"
#include "ace/Guard_T.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h
index 50e8140ed79..de5a3d6d89b 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
#define CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
index 79aba55e289..ce6bd87d89a 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file HomeT_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc
index 72270f87080..5c0feebd8a5 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (HomeT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname =HomeT_Base_stub
dynamicflags += HOMET_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
index 0b2ffea0c98..a79e1fbba8c 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file HomeT_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
index 7e06925c3d4..55fe9a1a65d 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(HomeT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen HomeT_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
index 9c74f06749c..2d7c73d6b01 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(HomeT_HomeC_idl_gen): componentidldefaults, dds4ccm {
custom_only = 1
after = HomeT_Base_stub HomeT_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
index b8846e2fe31..d67b61385cd 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file HomeT_HomeC.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
index d60b83bd879..b9026cd86b6 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
index 7cbdf1dbdbc..1a2c2fb5ec7 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
index b1b99d20f3e..3ca362ae9b3 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//==============================================================
/**
* @file controller.cpp
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
index 103ac1984c1..4fbc838ea63 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file IDL_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc
index 357f9f68406..fcc12c2898c 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (IDL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = IDL_Test_Base_stub
dynamicflags += IDL_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl
index 516f88a3fce..c8806788e3e 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef IDL_TEST_INTERFACES_IDL
#define IDL_TEST_INTERFACES_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
index 84ac47b781c..30886127db2 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl IDL_Test_Interfaces"
project(IDL_Test_Interfaces_idl_gen) : componentidldefaults {
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl
index f1273c133d0..fe8ba84ad89 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
index 41b9aaa692a..60f17b07315 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(IDL_Test_Base_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += IDL_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl
index 963115fb83f..b3d92882fb9 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
index 7e9a389342c..8ed2357e068 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(IDL_Test_Derived_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += IDL_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
index 7cf81919025..68b04ad6255 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file IDL_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
index 81c86b2f614..fe9c859e55f 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p IDL_Test_Base -l .. -o ../lib -u DDS IDL_Test_Connector"
project(IDL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
index 7f28e3c41ca..40b51ede68e 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Writer_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
index 4bf6cd7416a..352e236cdbc 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_DDSInstanceHandleBase_stub
dynamicflags += WRITER_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
index 8edcd5d012e..421f8585ccd 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Writer_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
index a054f38f52e..5358384a9ed 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l .. -o ../lib -u DDS Writer_Connector"
project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
index 61542295661..7f022778f2e 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
index 17482a3eb01..a3867be6e49 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
index 561b30fdf8d..1016da9ffcf 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_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/InstanceHandle/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h
index d5a24a9198e..e58efe30434 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_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/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
index 13f88672182..8e4b306067e 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Keyed_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
index 0512a1052a7..078218a4403 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Keyed_Test_Base_stub
dynamicflags += KEYED_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
index 7f44c70b2d6..ec6bf377372 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Keyed_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
index 33ba628f7f7..d2561449876 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l .. -o ../lib -u DDS Keyed_Test_Connector"
project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
index 48ff7e26a5f..3625c4df97a 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
index aeca5a7a824..2e5f6338f89 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_Keyed_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
index 7529a26b43d..3efe7830874 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_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/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
index 470c9371204..5007c45e48e 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_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/KeyedSamples/Sender/Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl
index 000cf32a1da..53d1d773a02 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
index f4fa69e1689..08b009018c2 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
index 26f86d157f9..27a0fadf166 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Keyed_Test_Sender_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
index 9390b0ae894..d4fe9f73c97 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_
#define CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
index 9210139e755..525042673a8 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Writer_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
index 04b2a40e092..3bd9e122988 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_KeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_KeyedWriterBase_stub
dynamicflags += WRITER_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
index 8edcd5d012e..421f8585ccd 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Writer_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
index 01dc4bd21dc..740baf34850 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
index 2ee3fd7ed1c..2d720fba655 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
index abc49c53cee..97e9a371bc2 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_KeyedWriterConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
index 2e77d85d2c6..61de3516863 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_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/KeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
index 45851ccf840..5cb2cf2a135 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_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/KeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
index 2d2072fc07e..64984e084f9 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
index 11d516cee83..ae3e8824de0 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
index 399c32db8a6..e379640308a 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Writer_Sender_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Guard_T.h"
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
index fd19c32f2c1..38e2567c28c 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_WRITER_SENDER_EXEC_AJ8QK5_H_
#define CIAO_WRITER_SENDER_EXEC_AJ8QK5_H_
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
index 8ec6d4473d7..b5c6b38d89a 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file RG_LateBinding_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc
index 8141cf1fe3b..d5836d47455 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (RG_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = RG_LateBindingBase_stub
dynamicflags += RG_LATEBINDING_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl
index 4465847487b..9fc6196148d 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Reader_Starter.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
index 8465336ee28..5d746aae933 100755
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after +=
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
index bea6d8be306..bed24d9fcac 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file RG_LateBinding_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
index 20bb1d2460f..36c96d27d93 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p RG_LateBindingBase -l .. -o ../lib -u DDS RG_LateBinding_Connector"
project (RG_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl
index fdebbda9a79..1200b3f78b6 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
index 5f2a8cd4aaf..7332a7f6d2a 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (RG_LateBindingReceiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += RG_LateBindingConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
index 426fdcb84d7..b3aecb9d732 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h
index e59bf6bf8d2..60016c8a865 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
index 29f327ab8e4..d41f01ef4f2 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "RG_LateBinding_Receiver_impl.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
index 43d1198c287..4a721f26dc5 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef RG_LATEBINDING_RECEIVER_IMPL_H_
#define RG_LATEBINDING_RECEIVER_IMPL_H_
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl
index d05239bc5a2..729bd69b7ff 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
index 3227fac6b9e..78eed5dedfb 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p RG_LateBindingBase -l ../lib -o ../lib -c controller -u DDS Sender"
project (RG_LateBindingSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
index 47cb700d981..c09bc0d4593 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
index bf3c5eb1053..8d50a38a418 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
index 8d0a8feae98..426f463bad1 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file WU_LateBinding_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc
index f690d652080..335ea30e1fd 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (WU_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = WU_LateBindingBase_stub
dynamicflags += WU_LATEBINDING_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
index a63c80f3df6..e8842df52d2 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file WU_LateBinding_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
index 842302c01d8..b79dd250fa6 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p WU_LateBindingBase -l .. -o ../lib -u DDS WU_LateBinding_Connector"
project (WU_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl
index 500123efb96..23006b60fa6 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
index ba0c8f8f6d7..768ee30fdb4 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (WU_LateBindingReceiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += WU_LateBindingConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp
index 6b577854e78..5f78d422ccb 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h
index 9c8f3df4899..af9db76cc06 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp
index b083cdfb51e..849eaf56162 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "WU_LateBinding_Receiver_impl.h"
WU_LateBinding_Receiver_impl::WU_LateBinding_Receiver_impl ()
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h
index 3a6cbd4ec87..bd13e00c19c 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef WU_LATEBINDING_RECEIVER_IMPL_H_
#define WU_LATEBINDING_RECEIVER_IMPL_H_
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl
index 2ae628babff..8a2169dd68b 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
index 6f4c85ae025..e14ce1c88a2 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p WU_LateBindingBase -l ../lib -o ../lib -c controller -u DDS Sender"
project (WU_LateBindingSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp
index 2a67d21b74a..90932adb836 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h
index 6800dc1cb93..769eaa04ea9 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
index 1df8fc2e4cb..6bf85749d83 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file LMBM_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
index a34427b4a9e..d1c40e1a642 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_LMBM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_LMBM_Test_Base_stub
dynamicflags += LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
index 74f8b3c5675..e0a84abc65d 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file LMBM_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
index 9ac206eba11..e7d1335755f 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l .. -o ../lib -u DDS LMBM_Test_Connector"
project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
index 3123710ceea..9e3766eaf6d 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
index 932cc6719a6..2755f25ef87 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_LMBM_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
index 738d45c2020..5d44bb9e6e7 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "LMBM_Test_Receiver_exec.h"
#include "ace/Log_Msg.h"
#include "dds4ccm/impl/dds4ccm_conf.h"
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
index 86261f0de2a..5ed192bd716 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
index a19c61273a4..212523aedbd 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
index 82c6b98f12c..38d973b980a 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
index 2ab21ddaaec..7651884518b 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "LMBM_Test_Sender_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
index fb32ab4de44..83efbc805d0 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_LMBM_TEST_SENDER_EXEC_HRZ3NN_H_
#define CIAO_LMBM_TEST_SENDER_EXEC_HRZ3NN_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
index b0f38be7792..5a602952dfc 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file LNE_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
index a160043900b..b5df76f5087 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_LNE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_LNE_Test_Base_stub
dynamicflags += LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
index 7a4637ce7c8..6a2a85a04eb 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file LNE_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
index 5148be80884..f22272b8265 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l .. -o ../lib -u DDS LNE_Test_Connector"
project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
index 69ffd780bdb..007ec0ba135 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
index 8bc43683040..1e0ddcdb130 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_LNE_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
index c2855c34617..d03b5ce15ce 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_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/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
index 0166c0ff987..18929491328 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_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/ListenNotEnabled/Sender/LNE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
index 2c5ea40d150..0c09fb7fdde 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
index 433a6daec80..0511fba5491 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp
index 0bfc0c8cc9f..1d2bf03e4fd 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_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/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h
index 2085f2d5578..c734f167b6f 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_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/ListenOneByOne/Base/LOBO_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
index b572cc36f9e..565b7e98142 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file LOBO_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
index 9d87ead6d76..8b3b8acbf22 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_LOBO_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_LOBO_Test_Base_stub
dynamicflags += LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
index 0d5d250aaf0..9f1928117a3 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file LOBO_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
index 22a7db10b0c..0bc3d164d54 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l .. -o ../lib -u DDS LOBO_Test_Connector"
project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
index b39d90467e2..2944d3b6c0c 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
index 8ecaeb1dddb..d1d0bb8fc63 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_LOBO_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
index 634729911c9..ac725d4923d 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "LOBO_Test_Receiver_exec.h"
#include "ace/Log_Msg.h"
#include "dds4ccm/impl/dds4ccm_conf.h"
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
index f927d9bbcf8..e171b512da7 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
index 1b53db01674..d399d7cc53b 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
index ac414e6f05f..7fee73abf3b 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
index 81b8379daee..63aee1fa2c2 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "LOBO_Test_Sender_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
index 85ae954a6e0..310030d1ff8 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_
#define CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
index 41f0ee3b10b..ad271593b5c 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Event_MemLeakDetection_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc
index 3e7ed41408c..e3ec1e97771 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_EMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_EMLDT_Base_stub
dynamicflags += EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
index 2dd437f02a5..c9e204f356b 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Event_MemLeakDetection_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
index ee554d1ac21..c3663a91361 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_EMLDT_Base -l .. -o ../lib -u DDS Event_MemLeakDetection_Test_Connector"
project(DDS_EMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl
index 287ee549e01..452db0b4622 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
index 4f1354d6e01..3cc1aa2ad3a 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_EMLDT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_EMLDT_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl
index 9d785b5a3de..1c63ca8799c 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
index a03e6f68d52..b3a68ef7736 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_EMLDT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_EMLDT_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
index 5d9883bbbe5..eee91874471 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file State_MemLeakDetection_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc
index 2fb0c7e095f..860e3832f7d 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_SMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SMLDT_Base_stub
dynamicflags += STATE_MEMLEAKDETECTION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
index a9f21327d3b..81046dbecf5 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file State_MemLeakDetection_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
index 4880fc80375..982b2e13c0a 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SMLDT_Base -l .. -o ../lib -u DDS State_MemLeakDetection_Test_Connector"
project(DDS_SMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl
index 36340ec5cb5..21d432741b9 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
index 970c8f285c0..e1c826c54f7 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_SMLDT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_SMLDT_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl
index a0bfca28f9f..b0da02cc828 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
index 5cdbd2f4956..5dfdcfd1e7b 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SMLDT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_SMLDT_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
index 889a935aab1..de5a9830077 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TypeRegistration_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc
index 6b3f2b438a5..745f93aafcf 100755
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (TypeRegistration_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = TypeRegistration_Base_stub
dynamicflags += MLD_TYPE_REGISTRATION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl
index 7faac7b92bb..7bcc7fc0fb0 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
index 37d7775497b..eb49c7a53e6 100755
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(TypeRegistration_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += TypeRegistration_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp
index d447f337840..0e58496fb5f 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h
index 91733ad2373..e4790cb99e3 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
index ca5c106e1d8..6b6c822a884 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TypeRegistration_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
index 36051e01f55..ba4a82920d7 100755
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p TypeRegistration_Base -l .. -o ../lib -u DDS TypeRegistration_Connector"
project(TypeRegistration_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
index 3d7d202bd87..e88f8982ae7 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file MultiTopic_Base.idl
* @author
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc
index 61da73079b7..8ad8c86b97c 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_MultiTopic_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_MultiTopic_Base_stub
dynamicflags += MULTITOPIC_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
index e342ebb5307..90493e79a63 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file MultiTopic_Connector.idl
* @author
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
index 69e8fe17a38..1453e0e781c 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_CCM_Example_MT_idl_gen) : taoidldefaults, anytypecode, dds4ccm {
custom_only = 1
after += DDS_MultiTopic_Base_stub
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp
index ee4016d52f6..e62a9213235 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h"
template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
index 5b8ba748238..81486213f69 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DDS_MT_CONNECTOR_T_H_
#define DDS_MT_CONNECTOR_T_H_
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
index ee1b9d1d180..321861eff88 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CCM_DDS_MT_IDL
#define CCM_DDS_MT_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl
index 08f99757108..69c0b85ea58 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef RECEIVER_IDL
#define RECEIVER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
index d157d94ae08..4119c175422 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver"
project(DDS_MultiTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
index 847a950ebcb..57932fba639 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h
index 537f686a040..d6da1384e16 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl
index abafca55b5e..a406582c556 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DDS_MULTITOPIC_SENDER_IDL
#define DDS_MULTITOPIC_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
index c04b71cf90d..8b4677dde14 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_MultiTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_MultiTopic_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp
index 362de1835bc..f8239046c6b 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
index 1b185329feb..62cf9fa7d06 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
index 52c37f06c6c..cd0486eba27 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file MultipleTemp_Base.idl
* @author Marijke Hengstmengel
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc
index f803314730e..0b0e2cc5639 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_MultipleTemp_Base_stub) : taoidldefaults, dds4ccm_ts_default {
requires += dummy_label
sharedname = DDS_MultipleTemp_Base_stub
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
index f3fbc8964ac..4ce01c01aaa 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file MultipleTemp_Connector.idl
* @author Marijke Hengstmengel
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
index 02fbf15553c..06b2767a604 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (DDS_MLT_idl_gen) : taoidldefaults, anytypecode, dds4ccm {
requires += dummy_label
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp
index 0fa1c310cac..4b4f467b572 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h
index ec406daf304..140f5aab79d 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DDS_MLT_CONNECTOR_T_H_
#define DDS_MLT_CONNECTOR_T_H_
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl
index fcda834256a..9a3df82c7f0 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CCM_DDS_MLT_IDL
#define CCM_DDS_MLT_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
index 0f9c32e8a2b..6b259d3b560 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
index 5a45580c18e..e7d436114cc 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_MultipleTemp_Receiver_idl_gen) : componentidldefaults, dds4ccm {
requires += dummy_label
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
index f18261454de..0f6ccb4596c 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Test for MULTIPLE_TEMPLATES
#include "MultipleTemp_Receiver_exec.h"
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
index 6f465629752..f49ef8e3df1 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
index a18008a8d95..b60865c0d45 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
index c76042fb341..2fad9a0818e 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_MultipleTemp_Sender_idl_gen) : componentidldefaults, dds4ccm {
requires += dummy_label
after += DDS_MT_TEMP_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
index 6b649b5256a..5df1ea1c79c 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
//Test Multiple templates connector
#include "MultipleTemp_Sender_exec.h"
#include "ace/Guard_T.h"
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
index ad9816a7f27..7158bbe145e 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
index 2a13c61a03a..bbd7f4e74d7 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NOMODULE_IDL
#define NOMODULE_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
index 81d106dffe1..0c26ca42da4 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (NoModule_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = NoModule_stub
dynamicflags += NOMODULE_COMMON_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
index 1f96e9b8a73..1826d617ae5 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NOMODULE_CONNECTOR_IDL
#define NOMODULE_CONNECTOR_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
index 58aa35083bc..445ed545e45 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -b dds4ccm_base NoModule_Connector"
project(NoModule_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
index a921b0808a0..be43e622d8f 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file NonChangeable_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
index 4cbca890fc0..02f3162309f 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_NonChangeableBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_NonChangeableBase_stub
dynamicflags += NONCHANGEABLE_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl
index 9c2bd803cd8..56afbc8213c 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file NonChangeable_Component.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
index 7be1fdfbe55..b9aa5408dfe 100755
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(NonChangeable_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_NonChangeableConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
index 9519d15b3f6..f9f8da29692 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "NonChangeable_Component_exec.h"
#include "dds4ccm/impl/Utils.h"
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h
index 9a4f55f03f8..bce33e2e3b4 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
index ccabdf61b23..a848e17fe87 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file NonChangeable_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
index a4b547196a8..c2e73a35ca1 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_NonChangeableBase -l .. -o ../lib -u DDS NonChangeable_Connector"
project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
index deb6cdc2a1b..c67d2b6caba 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file OIT_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
index ac63c4728f0..0b13c2744f6 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (OIT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = OIT_Test_Base_stub
dynamicflags += ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl
index 5e4726d1069..8c1ab7b70f2 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
index 6602de3110f..2d0d4f3ed85 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(OIT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += OIT_Receiver_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h
index 40bc8de16c8..dcc1b2c12d9 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
index fcc6a005731..e326c3f6bb0 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file OIT_Receiver_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
index 53b10bfed03..092a37dcd4c 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Receiver_Connector"
project(OIT_Receiver_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl
index f4fd0bfb36f..afcd1df6db4 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
index 794c75596d0..fb5578f9df6 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(OIT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
index 26669d446b3..e7c710051a8 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "OIT_Test_Sender_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h
index 5cbd8527ad0..b580b33a4bc 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
index 3f14182fc85..a8e1bd58cbf 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
@@ -1,6 +1,4 @@
-// $Id$
-
/**
* @file OIT_Sender_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
index 95b306fa58c..199cdb2ec8a 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Sender_Connector"
project(OIT_Sender_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
index 28b3df7a970..fe3f5c1236f 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef OFM_BASE_IDL
#define OFM_BASE_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
index cb892cf51de..1554b27a1aa 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef OFM_CONNECTOR_IDL
#define OFM_CONNECTOR_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
index b05f0e9c15b..a61728181f5 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (OFM_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = OFM_Base_stub
dynamicflags += OFM_CONNECTOR_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
index f51728042e6..afbaa15e6ce 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file OneFile_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
index 8a33aa146d4..9ec4b65b603 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file OneFile_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
index 32cf1ae3a20..c459b45c687 100755
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (OneFile_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = OneFile_Base_stub
dynamicflags += ONEFILE_CONNECTOR_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
index d82ac3bf463..0f1bcc115dd 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DDS_PSAT_CONNECTOR_T
#define DDS_PSAT_CONNECTOR_T
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
index 417178bb667..92d41cef253 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PSAT_Connector.idl
*/
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
index 7a7d7a88bfa..df0e7d7ff28 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CCM_DDS_PSAT_IDL
#define CCM_DDS_PSAT_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
index 5c15db9f585..90be1668a36 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_CCM_Example_PSAT_type_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CCM_Example_PSAT_type_stub
dynamicflags += PSAT_TYPE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl b/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
index f708eb1d96a..49ff5697c10 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file psat_type.idl
*/
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
index 28504f6254e..7ea3138441f 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PSL_DeadlineTest_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
index 92d5ca21790..66e0b1762cb 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_PSL_DeadlineTest_Base_stub
dynamicflags += PSL_DEADLINETEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
index c2e2b274761..6f3117be92e 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PSL_DeadlineTest_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
index 3058eaf1d15..60489f913ca 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l .. -o ../lib -u DDS PSL_DeadlineTest_Connector"
project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
index 855e39e678f..28afda4aea3 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
index b3f8ef1ec1d..d69a0858a80 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_PSL_DT_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
index 6c35e0b2109..d0e8cc74f2d 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_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/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
index dfa9118bdb1..28003e60820 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_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/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
index 5b490579ceb..0d5dc07f572 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
index db32060a04c..6a4e5555900 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
index 123f97e290e..fc1f81ade1f 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_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/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h
index 5250d8ceb9f..7ad27c5579e 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_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/PSLSampleLost/Base/PSL_SampleLost_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
index 148963fc2b6..9ba9ea7c56b 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PSL_SampleLost_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
index 260ab4213cf..7fc4f39128e 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_PSL_SampleLost_Base_stub
dynamicflags += PSL_SAMPLELOST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
index 7d01e1fba8f..b79b3fa1266 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PSL_SampleLost_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
index 7509f5ca7e4..1f208fcca53 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l .. -o ../lib -u DDS PSL_SampleLost_Connector"
project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl
index ccc1058d9ab..9d22dcc4c64 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
index 1df673b57ec..1b65cc914fe 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_PSL_SL_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
index fb9fa937c30..73738cea795 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_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/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
index c1489690c62..a70f89dfc7f 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_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/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
index db4871237c0..ca82d0a9095 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
index 8ab5bc0b401..3df0cd46900 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
index 20383ef7be7..f974995a892 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_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/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h
index 09b3962006a..a5a5601e815 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_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/Policies/deadline_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp
index 6ee8d9e1b80..81b50b7a3e6 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "deadline_qos_test.h"
#include "duration.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp
index 6a35c8dd228..cbc982daa7e 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dest_order_qos_test.h"
DestinationOrderPolicyTest::DestinationOrderPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp
index 2152a2a4dfa..4c05f843c35 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dp_factory_qos_test.h"
#include "entity_factory_qos_test.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp
index 9418d83ceb1..649fef081ca 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dp_qos_test.h"
#include "entity_factory_qos_test.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp
index 3a4fc093cdd..3b18c29614b 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dr_qos_test.h"
#include "dur_qos_test.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
index 6f21a318f0f..2c3cd0e8c60 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DATAREADER_QOS_TEST_H_
#define DATAREADER_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp
index 3a85ace802b..c764b6dccbf 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dur_qos_test.h"
DurabilityPolicyTest::DurabilityPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp
index eabe851a291..04e21f02bc3 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dur_service_qos_test.h"
DurabilityServicePolicyTest::DurabilityServicePolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp
index 6e4278e1b04..f3b05feb0b3 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dw_qos_test.h"
#include "dur_qos_test.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
index 554ed4ba7eb..3e85b37d06c 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DATAWRITER_QOS_TEST_H_
#define DATAWRITER_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp
index 4bc00e2434f..c5fecf7a4a8 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "entity_factory_qos_test.h"
EntityFactoryPolicyTest::EntityFactoryPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
index f8ebb0b173f..30b4aaaa7f9 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ENTITY_FACTORY_QOS_TEST_H_
#define ENTITY_FACTORY_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp
index e1100e04cc2..3e2120c601d 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "group_data_qos_test.h"
#include "octet_seq.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
index 75578569247..2aa822bf935 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef GROUP_DATA_QOS_TEST_H_
#define GROUP_DATA_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp
index e65aa5ff338..d769ec1bc7d 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "hist_qos_test.h"
HistoryPolicyTest::HistoryPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp
index 5a530caa2cc..26a7527d447 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "lat_budget_qos_test.h"
#include "duration.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp
index b044bd8f565..fa1be610bd3 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "lifespan_qos_test.h"
#include "duration.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp
index b9f364a703f..0064c309716 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "liveliness_qos_test.h"
#include "duration.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp b/CIAO/connectors/dds4ccm/tests/Policies/main.cpp
index a2d9fdb03d9..e5072f852f8 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_main.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp
index b439bfe1b74..eb36fc8dfca 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ownership_qos_test.h"
OwnershipPolicyTest::OwnershipPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp
index d65bd7f725a..a4e43c33972 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ownership_strength_qos_test.h"
OwnershipStrengthPolicyTest::OwnershipStrengthPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp
index f0f56774186..f092096fc6c 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "partition_qos_test.h"
PartitionPolicyTest::PartitionPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc b/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc
index 95c8b697043..88a5ac62309 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Policies_Test) : taoexe, typecode, dds4ccm_base {
includes += $(CIAO_ROOT)
exename = policies_test
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp
index 540bf6e1315..661fe7a0421 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "presentation_qos_test.h"
PresentationPolicyTest::PresentationPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp
index 7a3c0cb7737..8fe67e4728a 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "pub_qos_test.h"
#include "group_data_qos_test.h"
#include "entity_factory_qos_test.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
index db6f4944b29..069c63f051a 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PUBLISHER_QOS_TEST_H_
#define PUBLISHER_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp
index 11574a4abfe..ae419b62f8e 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "rd_lifecycle_qos_test.h"
#include "duration.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp
index e4e405fdfc0..9d006a10d68 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "reliability_qos_test.h"
#include "duration.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp
index 46a1adc0327..60cbdf49797 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "resource_limits_qos_test.h"
ResourceLimitsPolicyTest::ResourceLimitsPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp
index d7c2a5754af..7232d3cfc1f 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "states_test.h"
StatesTest::StatesTest()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/states_test.h b/CIAO/connectors/dds4ccm/tests/Policies/states_test.h
index e5649856ca3..1e9b3324248 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/states_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/states_test.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef STATES_TEST_H_
#define STATES_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp
index 15950dc88b4..4c2cb845842 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sub_qos_test.h"
#include "group_data_qos_test.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
index 8f1694c0fd2..ab88b9b099c 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SUBSCRIBER_QOS_TEST_H_
#define SUBSCRIBER_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp
index c300174e7f7..95fe1f566ec 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tbf_qos_test.h"
#include "duration.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp
index c9377c996b7..154d4fa44e2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tp_data_qos_test.h"
#include "octet_seq.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp
index 65a338ae499..65520b44e56 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tp_qos_test.h"
#include "tp_data_qos_test.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
index 9b8ca4d9b23..9f5c6fc5357 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TOPIC_QOS_TEST_H_
#define TOPIC_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp
index d4aaa7d74ad..e776b9f132a 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "transport_prio_qos_test.h"
TransportPriorityPolicyTest::TransportPriorityPolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp
index 1b268ba092f..6f7ab19f9b7 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "typeconsistencyenforcement_qos_test.h"
#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp
index 48ee76b0e20..6658311fcf3 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "user_data_qos_test.h"
#include "octet_seq.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp
index 6a8da1b9103..cdc29b90cae 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "wr_lifecycle_qos_test.h"
WriterDataLifecyclePolicyTest::WriterDataLifecyclePolicyTest ()
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
index 25e947ad634..a5a6295900c 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PortUsage_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
index d8125682fb4..b541c285f2a 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (PortUsage_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
sharedname = PortUsage_Test_Base_stub
dynamicflags += PORTUSAGE_EVENT_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl
index bf6c2263c2a..04e0340f5a6 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
index f7258c06228..19ccda457ed 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(PortUsageEvent_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += PortUsageEvent_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
index 0c0170524a5..e1e605e05a8 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
index 6ff33d1b54a..0ef5034d5d1 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PortUsageEvent_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
index 6c6491d07ee..90cad48d622 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageEvent_Connector"
project(PortUsageEvent_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl
index 338fe53f175..67ee29bb7b8 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
index 1e5295d6dd7..81252c6c330 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(PortUsageState_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += PortUsageState_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
index 162301f6dc8..f53643b0832 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "PortUsageState_Component_exec.h"
#include "ace/OS_NS_unistd.h"
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
index a86a461923a..04a8547e334 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
index eae2ab24c5b..742b2087ac3 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PortUsageState_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
index 4805c334cf2..c9dcc39fdb5 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageState_Connector"
project(PortUsageState_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
index b08ac93a360..8f0e65bbb1a 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Proxy_RW_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc
index 9e51a2c5882..d399d3e68b1 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Proxy_RW_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = Proxy_RW_Test_Base_stub
dynamicflags += PROXY_RW_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl
index 3243595bb92..d2af2883d1f 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Reader_Starter.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
index d975b977499..f5d4f9fb784 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(RW_RW_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after +=
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
index 11c86757389..57ce9775dcf 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Proxy_RW_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
index cc683971bc9..e29d85dabe9 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Proxy_RW_Test_Base -l .. -o ../lib -u DDS Proxy_RW_Test_Connector"
project(Proxy_RW_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl
index b3e6d52c49a..0a8fab4e505 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Proxy_RW_Test_Receiver.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
index b785b288715..7fb6136a015 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Proxy_RW_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += Proxy_RW_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp
index 9f3e72b9506..51430bbe7c4 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_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/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h
index 9be53852605..d6d49b11553 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_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/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl
index 51dc43d4aa1..f70bb9808a4 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
index 636dfebff19..1a975f1dfa9 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Proxy_RW_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(Proxy_RW_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp
index 712ba22eb30..e895270cd84 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_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/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h
index 26de51c4872..fc357c79cd0 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_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/QosProfile/Base/QosProfile_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
index f5161b853be..9813ce3d75a 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file QosProfile_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
index 550d0bd01c4..da6d3f3b7d0 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (QosProfile_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = QosProfile_Test_Base_stub
dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
index ee87e53284b..5aec5157741 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
index 6af2a1229a1..20004d702df 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(QosProfile_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += QosProfile_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
index 7ad3408bf47..0c5b8442e0c 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
index 746094c0d34..d0ddb1d9a6c 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file QosProfile_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
index 8c8901d1b38..8f32d311e41 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p QosProfile_Test_Base -l .. -o ../lib -u DDS QosProfile_Test_Connector"
project(QosProfile_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
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:
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
index 752fb106ac9..80dd04aac89 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Reader_Starter.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
index 624b9d48c65..b14b7d49e69 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after +=
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
index f225ebebb6b..38fec9c5a26 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Reader_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
index 6bd1f0f5365..3132fa2a690 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -u DDS -d -o../lib Reader_Test_Base
project(DDS_Reader_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
index ec7daf75faa..3dc092c453c 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Reader_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
index e55b4e35c2a..a3c97e4c97b 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l .. -o ../lib -u DDS Reader_Test_Connector"
project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
index 0e9376a670e..c01b0c91d90 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
index e03548b14f3..3bba5085b7b 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_Reader_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
index e63db5d7a07..3816c2e5a09 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
@@ -1,5 +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/Reader/Receiver/Reader_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
index c176b08d1fc..29eac6dee2b 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_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/Reader/Sender/Reader_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl
index 2721c0ffece..17ffb36be5c 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
index 2104f38f015..a9fc0641804 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
index c56f8cd3d3a..5fa4dbac125 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_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/Reader/Sender/Reader_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h
index 3a6d9fec905..0e900f1a7fb 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_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/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
index d7a9faca25e..e2c585fc01a 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file RG_ResetTopic_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc
index 36560836af9..4a603838df6 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (RG_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = RG_ResetTopicBase_stub
dynamicflags += RG_RESETTOPIC_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl
index 8c4bdd39a48..b237220bed5 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Reader_Starter.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
index 0138dc69436..f557cee43cb 100755
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(reader_starter_rt_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after +=
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
index 7d5367135ff..a7551c9de29 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file RG_ResetTopic_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
index 47324d8c3c0..8aac6031d88 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l .. -o ../lib -u DDS RG_ResetTopic_Connector"
project (RG_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl
index c5cf963f652..4322dffca5d 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
index 85e4b58c572..2d24cf4f6a5 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (RG_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += RG_ResetTopicConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp
index 02b5ea6f723..885a5ef4cb0 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "RG_ResetTopic_Receiver_exec.h"
#include "RG_ResetTopic_Receiver_impl.h"
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h
index 6b772b6a35e..c079a0b39af 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_
#define CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp
index f25757e9552..79686951697 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "RG_ResetTopic_Receiver_impl.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h
index 241ab592731..f60d7b058a0 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef RG_RESETTOPIC_RECEIVER_IMPL_H_
#define RG_RESETTOPIC_RECEIVER_IMPL_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl
index 67766c8686c..f9fdc5723f4 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
index 44953e66e1d..1df6ea4d45d 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
project (RG_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
index f1ba9cfe889..d4a54cded17 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "RG_ResetTopic_Sender_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h
index e1ed1e7db13..1c2bad99935 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
index b0904f576e1..6d757cd12fd 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TE_ResetTopic_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc
index e167c1d0daa..61e2f2252cd 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (TE_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = TE_ResetTopicBase_stub
dynamicflags += TE_RESETTOPIC_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
index 047be82e6c3..c3fd7df6416 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TE_ResetTopic_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
index e4624f4217a..dfbb50208a0 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l .. -o ../lib -u DDS TE_ResetTopic_Connector"
project (TE_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl
index b67343ca5b5..91e45c7c88c 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
index 0a4db8e0b4a..4a4b30c044b 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
project (TE_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp
index 8dbaa799e82..c132f64a7ef 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h
index 0f9540ffaff..f7152f8cdb5 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
index 8471c6690da..03570b30e51 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TL_ResetTopic_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc
index 0ea8e8c66bb..39c3065fb40 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (TL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = TL_ResetTopicBase_stub
dynamicflags += TL_RESETTOPIC_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
index 325547f762d..aa04ebb5c4f 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TL_ResetTopic_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
index 6dfe620ef80..c8da3fd3e86 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l .. -o ../lib -u DDS TL_ResetTopic_Connector"
project (TL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl
index 4137b72b3e9..0e5fe02ca5d 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
index ee310a9e2ff..8e2b8189b89 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
project (TL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp
index 35ddc40dd20..41f3ba0cdd9 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h
index 4bfb0d0fc2e..7d738c58864 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
index e16d0e73281..03998e8d565 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file UL_ResetTopic_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc
index bd879c16e8d..7fb1ef387eb 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (UL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = UL_ResetTopicBase_stub
dynamicflags += UL_RESETTOPIC_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
index 36e2e190042..0ecc3800915 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file UL_ResetTopic_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
index 4f046695be8..b6886bbcf53 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l .. -o ../lib -u DDS UL_ResetTopic_Connector"
project (UL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl
index 9a14d38756b..425e76bcf0c 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
index 152b2dd974e..355adcd4f08 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (UL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += UL_ResetTopicConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp
index c86442d4f70..0bc5cdedc51 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h
index 0d37cc5dd4c..34eae95bef7 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl
index b95354bb93f..75d64b30c42 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
index 3da79ab75cc..075fc8ad784 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
project (UL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp
index b7d1295353f..f3fea603736 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h
index 072daef1af4..ed846ae064d 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
index bce4ce5fab0..45311782947 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file WL_ResetTopic_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc
index 7d4c393fe03..6ab7e88772c 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (WL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = WL_ResetTopicBase_stub
dynamicflags += WL_RESETTOPIC_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
index 16248af1752..83381d74410 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file WL_ResetTopic_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
index d7ac8716da5..dfaa2301b8e 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l .. -o ../lib -u DDS WL_ResetTopic_Connector"
project (WL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl
index bd2c069035d..0fe968e46ea 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
index ce3901b3e9d..e23097f342f 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (WL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += WL_ResetTopicConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp
index b8dd14b4ee0..58eb1380560 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h
index fb559f5e277..c56d34e8355 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl
index 437c3eb6c59..171dbbea554 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
index bea65475164..717058be581 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
project (WL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp
index 14b7e12ac9a..5e189c86fce 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h
index c57851a1bdf..f7669e80f33 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
index 86c0d57eec6..61d37f5f4e4 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file SL_Disabled_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
index ba5d711fbb6..4a1f4bb1c09 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_SL_Disabled_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SL_Disabled_Base_stub
dynamicflags += SL_DISABLED_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
index 49e9ad2593b..5db5f544e3e 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file SL_Disabled_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
index c2062e987ed..a3d3a95c921 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l .. -o ../lib -u DDS SL_Disabled_Connector"
project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl
index 596bc696a62..4863c6e2d01 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
index bb281ccd853..18d20c311a0 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_SL_OC_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
index e02e97ec10f..0143a7785e9 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_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/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
index 96960030f7d..d6020151dea 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_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/SLDisabled/Sender/SL_Disabled_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
index a9f1efb9676..3bf7d29b082 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
index fd163cdca4a..21c0c44ec43 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
index 76401554468..e783f301425 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_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/SLDisabled/Sender/SL_Disabled_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h
index d2301526c27..b131f0fa51c 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_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/SLManyByMany/Base/SL_ManyByMany_Base.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
index 7f529c33651..6723cc83f06 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file SL_ManyByMany_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
index ad7b7a6ddb4..f530b760e3c 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SL_ManyByMany_Base_stub
dynamicflags += SL_MANYBYMANY_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
index d5f6b93fd83..a5204526af8 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file SL_ManyByMany_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
index 266960e4fd0..78de5f326c2 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l .. -o ../lib -u DDS SL_ManyByMany_Connector"
project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl
index f832373acbe..f80d7e5ab1c 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
index af66b714a89..8b0fb7a0ef8 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_SL_MBM_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
index 40219975a82..938b46a013e 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "SL_ManyByMany_Receiver_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
index 1284d89d6c3..03cb9f7ed7e 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_
#define CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl
index 7f553cf4988..b823417508f 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
index 3bf2d77a0de..4b24d1979fe 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp
index ea4c7890ea9..95900c0c10e 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_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/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h
index 1280f9f241e..0c5b23f1ad4 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_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/SLOneByOne/Base/SL_OneByOne_Base.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
index 47cd7f9a6d7..551272ab7ec 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file SL_OneByOne_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
index 1936e7fa060..2e9e3dc6f6c 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SL_OneByOne_Base_stub
dynamicflags += SL_ONEBYONE_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
index 499d1fcd276..b135115a86b 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l .. -o ../lib -u DDS SL_OneByOne_Connector"
project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
index f3e17e3973a..3c00070f29c 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file SL_OneByOne_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl
index 8ab02e45868..60bb6a4d68d 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
index 639fef1cd5c..ca67a723ed7 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_SL_OBO_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
index e3ba1e99626..76c657248b8 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "SL_OneByOne_Receiver_exec.h"
#include "dds4ccm/impl/dds4ccm_conf.h"
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
index 74017d49a28..d86034c23bd 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_
#define CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
index db61a34327d..523b6d61086 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
index 252c6ef7681..e3710cc20e7 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
index 58b7c44e957..408858409d7 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "SL_OneByOne_Sender_exec.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
index 4b0cb743934..3fc8c6f80c7 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_
#define CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
index 0f4b73e1a60..05209b3e2a5 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file SetConnectorAttribute_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
index 166889cf4bc..fff9c36f8b5 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_SCABase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SCABase_stub
dynamicflags += SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl
index 1ba837ec5eb..1a8a3b78706 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file SetConnectorAttribute_Component.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
index a0522cb355a..9decee0420d 100755
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(SetAttribute_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_SCAConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
index 0f4ffbc98fb..1b1cd59e460 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
index e9044e626ed..a478d5e2387 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file SetConnectorAttribute_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
index a85e29956c2..2fe6f6b22dd 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SCABase -l .. -o ../lib -u DDS SetConnectorAttribute_Connector"
project(DDS_SCAConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
index 72b459830b9..e40a2ddecf6 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
index 1a4aed690a3..5b485527e6a 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_SharedDP_DDBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SharedDP_DDBase_stub
dynamicflags += BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl
index 41ece082be4..74362fc7abc 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
index 61da541d571..a46e26c1bab 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
index 4ca530701d0..de9cd29dc28 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Component_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h
index 2a791408180..dfcc1d903e7 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
index 8636e66b274..4afe620e7f1 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Connector1.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
index 3d85c0181dc..d1e19f07670 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
index 5833439240b..f38a634b931 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Connector2.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
index a2698aca377..f3cff4041ac 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
index 8e41689081e..19984701e26 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Connector3.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
index 8bc2b4f99f5..2edb65e3de2 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
index 930e5bb6ea6..0f28a5b3e74 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc
index 5b782c99c59..d67aff8cde6 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (SharedDP_Diff_ID_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = SharedDP_Diff_ID_Base_stub
dynamicflags += BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl
index 41ece082be4..74362fc7abc 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
index 7c6382b6062..e6a9418413f 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
project(SharedDP_Diff_ID_Component_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp
index ab04c21e68f..8f4b7274dee 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Component_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h
index 2a791408180..dfcc1d903e7 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
index 8636e66b274..4afe620e7f1 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Connector1.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
index 3f2e2f11cc6..15b4e4419bc 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(SharedDP_Diff_ID_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
index 5833439240b..f38a634b931 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Connector2.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
index cf32790d93b..b1059bca0ca 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(SharedDP_Diff_ID_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
index 8e41689081e..19984701e26 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Connector3.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
index bdd99302c5f..f5c705f13a6 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(SharedDP_Diff_ID_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
index 5de21ae3b93..b0c773f58de 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
index 4378a77b3a0..17ee2d5f8cc 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_SharedDPBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SharedDPBase_stub
dynamicflags += BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
index 400496af4dc..c50638fcea6 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
index f4a02be3ff4..ad292a53373 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
project(DDS_SharedDPComponent_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
index b8634d3e86f..2f5bcdd7492 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Test whether Connector 1,2 and 3 are sharing the same DomainParticipant.
// Connector 4 should have a different DomainParticipant.
// Also test whether Connector 1 and 2 share the same topic.
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
index aac5e3de040..a7df9676a94 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
index 204667a7e99..8de1b7b7406 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
index 937d3eefe83..796bc84afab 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_SharedDPBase_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
index 6c1cc4a8ec7..2bf9df0aa8a 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file State_Connection_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
index 82d78bb09c9..41b42c4fa91 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_SCT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SCT_Base_stub
dynamicflags += STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
index 3c2fd118974..5193d1a639b 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file State_Connection_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
index fac077875ad..66c6ad49e7a 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l .. -o ../lib -u DDS State_Connection_Test_Connector"
project(DDS_SCT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl
index 6aaf2e53248..794d300cd01 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
index af14efe0d75..b814225cca5 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_SCT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_SCT_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
index ad687cad86e..d4a731ebfce 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef STATE_CONNECTION_RECEIVER_EXEC_H_
#define STATE_CONNECTION_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl
index 294731486ac..c340f79e086 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
index 45b35c1d1d4..bb2842d2a97 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_SCT_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp
index d478695b319..51c54ac5dad 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "State_Connection_Test_Sender_exec.h"
#include "ace/Guard_T.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h
index e4d0a46e6eb..69d50c4c5d7 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef STATE_CONNECTION_SENDER_EXEC_H_
#define STATE_CONNECTION_SENDER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc b/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc
index 19cf287fe67..bdddf653517 100644
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_TimeConversion) : taoexe, dds4ccm_base {
includes += $(CIAO_ROOT)
exename = TimeConversion
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
index 1178e35bddb..be4218bfc2c 100644
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
+++ b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dds4ccm/impl/TimeUtilities.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
index c2b2f9595af..836bd2dc353 100644
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TopicName_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc
index 302d973e6ca..4fc0879f9f7 100755
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (TopicName_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = TopicName_Test_Base_stub
dynamicflags += TOPICNAME_EVENT_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl
index f71ca26e99f..06c92dda676 100644
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
index 061a7d9ab8c..5a9be8f05a4 100755
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(TopicName_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += TopicName_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h
index 1863c267a8e..d89956045a0 100644
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_COMPONENT_EXEC_H_
#define CIAO_COMPONENT_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
index 316fe04d8b8..5eff93b266e 100644
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TopicName_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
index 449fa22a777..7856bf5cb00 100755
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p TopicName_Test_Base -l .. -o ../lib -u DDS TopicName_Test_Connector"
project(TopicName_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
index 15543174780..3e182f08d90 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TwoTopics_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
index d51a26e5b86..06e4dace8ab 100755
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_TwoTopics_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_TwoTopics_Base_stub
dynamicflags += TWOTOPICS_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
index a794387d9e3..493f113abb8 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file TwoTopics_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
index 15ab688ffa7..1f9f23770fc 100755
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_TwoTopics_Base -l .. -o ../lib -u DDS TwoTopics_Connector"
project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
index a06e023caaf..665e3346f76 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
index 75328a809ea..1e547bc965b 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_Hello_Namespace_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
index 84baa6a2223..80e27a75c0a 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file HelloGoodbye.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
index 9d2b4c48423..77f20e7d0c9 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Goodbye_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Goodbye_Namespace_Base_stub
dynamicflags += GOODBYE_NAMESPACE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
index 9b1ef4ed916..d18f059326d 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file HelloGoodbye.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
index c4f92576db2..ac23ad4c2ee 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Hello_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Hello_Namespace_Base_stub
dynamicflags += HELLO_NAMESPACE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc b/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc
index ec8da935177..a193af51005 100644
--- a/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_TypeSupport_Test) : taoexe, typecode, dds4ccm_base {
includes += $(CIAO_ROOT)
exename = typesupport_test
diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp b/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
index 506990133b2..7128ce31414 100644
--- a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
+++ b/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_main.h"
#include "ace/Log_Msg.h"
#include "ace/Env_Value_T.h"
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
index 61f38d92c0f..42a3dad6ae0 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Unkeyed_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
index 384ea4117a4..a82c8c37555 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Unkeyed_Test_Base_stub
dynamicflags += UNKEYED_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
index 085aca05d3c..807df77e543 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Unkeyed_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
index b725e6e6a80..3a7a7dc1310 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l .. -o ../lib -u DDS Unkeyed_Test_Connector"
project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl
index b3d0207cb4e..45c30460219 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
index 56b0d7f34ed..8afc8d0bf79 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_Unkeyed_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
index f3fad22f16f..e5c788e651b 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_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/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
index 5fb5772480d..f238945030d 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_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/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
index 7831d8b7a66..aa31f073a0f 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
index 306a73909c1..413980d9e47 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
index bb5369a851b..fd7ac4b155e 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_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/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h
index 5c9273a0b9d..ef9ae64ec62 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_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/UnkeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
index ea069861982..1b569f4b6d0 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Writer_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
index 58a0f1a3012..7805092c82a 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_UnkeyedWriterBase_stub
dynamicflags += WRITER_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
index 2e6f6c8a3c2..5969c7d1176 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Writer_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
index f4d5d32d8fd..c4fe5d76d38 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
index 2ee3fd7ed1c..2d720fba655 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
index 2bee13ac808..92d6d3c513d 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_UnkeyedWriterConnector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
index 2b07139517c..dd94ab6a7d9 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_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/UnkeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h
index bc0660ef43f..263b91d30cc 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_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/UnkeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
index 2d2072fc07e..64984e084f9 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
index 0e994657330..34c6a6563d3 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
index 53e7e09be85..0b7d48b8c3a 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_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/UnkeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h
index 48db63f6ab2..33d61634ba2 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_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/Updater/Base/Updater_Base.idl b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
index e2f354be167..e22773564d7 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Updater_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
index 8191f040a80..bc2dbfa7185 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_Updater_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Updater_Base_stub
dynamicflags += UPDATER_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
index 48c739226c0..16452237af8 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Updater_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
index 3067e3618f2..825b96d2719 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l .. -o ../lib -u DDS Updater_Connector"
project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
index 9ffc8b42c70..36538eada05 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
index 70f09d56233..ee8c5815437 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_Updater_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_UPDATER_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
index 978c368f9ca..4ccbc02a680 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_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/Updater/Receiver/Updater_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h
index dff1226a1b0..a96430fb0ed 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_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/Updater/Sender/Updater_Sender.idl b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
index e1e042c7cca..8ae5f432194 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
index c1760b54668..83da223de82 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_Updater_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
index d58ac265bcb..c127816dfdd 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_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/Updater/Sender/Updater_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h
index c10fd9b1f7a..63fe557151d 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_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/UserdataCopyCount/Base/UCC_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
index 013dcacef46..1d489688614 100644
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file UCC_Test_Base.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
index 5d96c062799..af35527d256 100755
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (UCC_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = UCC_Test_Base_stub
dynamicflags += USERDATA_COPY_COUNT_TEST_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl
index 4bebfac195b..3ec41b3c515 100644
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marcel Smit (msmit@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
index e73fb50f6b5..5577d943f76 100755
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(UCC_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += UCC_Test_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp
index 9948d18f6e2..8b2d5ea2849 100644
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_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/UserdataCopyCount/Component/UCC_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h
index 1dd92661a61..906a83c7cfd 100644
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_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/UserdataCopyCount/Connector/UCC_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
index b6dec72f248..e058fb2f905 100644
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file UCC_Test_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
index 22d384504d1..ecb293b6ccc 100755
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p UCC_Test_Base -l .. -o ../lib -u DDS UCC_Test_Connector"
project(UCC_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
index b1d79860876..851ed0ad11e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VTopic_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
index 6c79d25bd85..1aa5f52cfda 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_VTopic_Base_stub) : taoidldefaults, \
dds4ccm_ts_default, valuetype {
sharedname = DDS_VTopic_Base_stub
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
index 1ca8570ada0..7bde349812c 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VT_Array_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
index 1eaddc726bf..b1b95129172 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Array_Connector"
project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
index d9c5e9b7a02..89067ebe269 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VT_Seq_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
index f06d96700c6..8eba6b3a2ad 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Seq_Connector"
project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
index 782f5b38376..77638199e2d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VT_String_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
index 4fa02ef5724..480834a3807 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_String_Connector"
project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
index 68bd29382fa..f24b37413ee 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VT_Union_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
index 85c9d4607e3..c517a48c0c4 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_VT_UNION_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
index 7304f41e55c..d77be1c18e3 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VT_Valuetype_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
index 925f9f7cf62..41549b931ce 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_VT_VALUETYPE_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
index 19b29e451ac..5fb041c38ba 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VTopic_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
index e8f5d3f4d0e..f453a351a0b 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VTopic_Connector"
project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl
index 020b9100282..596e652a286 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
index b1185e8a62a..096d14bb5f7 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm {
after += DDS_VTopic_Connector_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h
index 15f178a0dbe..2358cf76e53 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
index e722376cefa..1f865a9eee5 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
index bb1dca76d3c..875462836f2 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_VTopic_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
index 1417d35b487..9bfe71d10d6 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
//Test different topic types, with DDS_EVENT connectors, look for 'PUBLICATION_MATCHED_STATUS
#include "VTopic_Sender_exec.h"
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h
index a92fddc93fa..501bb50c7f8 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
index 7f08e9736bd..0d4e8b46db4 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VTopics_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
index 84ec15fdbc8..93338d3676d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (DDS_VTopics_Base_stub) : taoidldefaults, \
dds4ccm_ts_default, valuetype {
sharedname = DDS_VTopics_Base_stub
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
index 2eaa5d205b1..ec502e9d437 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VTS_Array_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
index a119c9f39ec..c522762166e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Array_Connector"
project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
index 7725a3a380d..4dfa1f811e8 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VTS_Seq_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
index 783413e0ca8..757e94922d2 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Seq_Connector"
project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
index e59890edae5..d224a66f793 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VTS_String_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
index f1c9704394a..58edb6b9ad4 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_String_Connector"
project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
index 64be828b0d7..f728c9d2cdc 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VTS_Union_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
index b04e8e9ac2f..104300fd1bc 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_VTS_Union_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
index 91ab9b3933a..fc61e9b9eea 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VTS_Valuetype_Connector.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
index b87ebbf4faf..a46ce3bfc4d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_VTS_Valuetype_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
index 602daaebc60..8e454b7fe4a 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file VTopics_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
index e13ee96514f..0b49ebf7e6e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTopics_Connector"
project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl
index 60b2fba5b35..c90d09b525e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
index 15919f9a2d8..6e2ffd342cc 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += DDS_VTopics_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h
index 2922198c855..9e15ddc171a 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
index 5fe88c8a7f6..3236c47642c 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
*/
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
index ae24d2073f3..b0467e6d7c3 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l ../lib -o ../lib -c controller -u DDS Sender"
project(DDS_VTopics_Sender_idl_gen) : componentidldefaults, dds4ccm {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
index 77ccb8eac3d..be057adabaf 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
//Test different topic types, with DDS_STATE connector, look for 'PUBLICATION_MATCHED_STATUS
#include "VTopics_Sender_exec.h"
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h
index f2086ba3883..38404213210 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl
index 54d154923b6..8598a8786b8 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAPES_CONTROL_COMP_IDL_
#define SHAPES_CONTROL_COMP_IDL_
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
index 5bc6bbd1cfd..e7ffebbd33f 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Shapes_Control_idl_gen) : componentidldefaults {
after += Shapes_Control_obj_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp
index 91093f8d73e..cb003dee25f 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Shapes_Control_comp_exec.h"
#include "tao/ORB_Core.h"
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h
index 447985be687..af65894f21e 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl
index 1360f9c08c5..de2946a8d7f 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAPES_RECEIVER_COMP_IDL_
#define SHAPES_RECEIVER_COMP_IDL_
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
index 14aca41bd0f..b7166aea155 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += Shapes_ShapeType_conn_idl_gen
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
index 1c6ee6aecab..dbabbb9eaa9 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Shapes_Receiver_comp_exec.h"
namespace CIAO_Shapes_Receiver_comp_Impl
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
index 2a05da3f75a..0e7b8082298 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl
index 56e73042ddd..da2808eb22b 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAPES_SENDER_COMP_IDL_
#define SHAPES_SENDER_COMP_IDL_
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
index bdf9cff303c..4b5d07c5924 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
after += Shapes_ShapeType_conn_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
index 67245f517e7..1388ed8c152 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Shapes_Sender_comp_exec.h"
namespace CIAO_Shapes_Sender_comp_Impl
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h
index 9e630c727d2..98a2fdc5524 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl
index aa2f6e6e318..05c8c85d842 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAPES_CONTROL_IDL_
#define SHAPES_CONTROL_IDL_
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc
index 7ee17767ecb..56b3a6be4c5 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Shapes_Control_obj_idl_gen) : componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
index 02a5785fe5d..0938585b051 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAPES_SHAPETYPE_CONN_IDL_
#define SHAPES_SHAPETYPE_CONN_IDL_
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
index a8cb84baadb..2666434317d 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Shapes_ShapeType_conn_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen Shapes_ShapeType_msg_stub
custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
index 087d88f2aa4..932d4e3a143 100755
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAPES_SHAPETYPE_MSG_IDL_
#define SHAPES_SHAPETYPE_MSG_IDL_
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc
index 5e9b25b0aba..8d04e3bfb80 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Shapes_ShapeType_msg_stub) : taoidldefaults, dds4ccm_ts_default, Shapes {
idlflags += -SS -Sci \
-Wb,stub_export_macro=SHAPES_MSG_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
index 54abc79dd0e..1baeefa1ad9 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Shapes_defn_idl_gen) : taoidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp
index 83fc81c00bc..8f34f6c8fca 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h
index 7e49d22357f..2a07fae5118 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp
index 556cb5ff9ca..88276924d3e 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h
index 6c8188032f6..dfe4eb7b1d8 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp
index 0724a9d246d..a27e899cf0a 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h
index ff9a1f62f12..86fe2659cc0 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.2.3
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl
index 62a1189ccbe..09d2d7b1343 100644
--- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl
+++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file AmiDds_Base.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc
index bb6604bbfcd..dfe00d62200 100644
--- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc
+++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_AmiDds_Base_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
custom_only = 1
idlflags += -Wb,stub_export_macro=AMIDDS_BASE_STUB_Export \
diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl
index 428cfe37eea..dc1fbb3b469 100644
--- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl
+++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file AmiDds_DDS.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl
index e584503743b..813d811f3c4 100755
--- a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl
+++ b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file AmiDds_Connector.idl
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc
index 0e37ed917aa..ad0e137ad20 100755
--- a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc
+++ b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(DDS_AMIDDS_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen DDS_AmiDds_Base_stub
custom_only = 1
diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl
index 087868c30fc..5377bd444eb 100644
--- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl
+++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc
index 8f49b09e43c..6fbdc5c1775 100644
--- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc
+++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(AMI_AmiDds_Base_Receiver_idl_gen) : componentidldefaults, dds4ccm {
custom_only = 1
after += AMI_AmiDds_Base_idl_gen DDS_AMIDDS_Connector_idl_gen
diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp
index 5ee7a9e9c68..66776205355 100644
--- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp
+++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Test for combination of AMI4CCM and DDS4CCM
#include "AmiDds_Receiver_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h
index 859332cb082..24f05f00af6 100644
--- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h
+++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl
index 85e0b4ff572..66e67b7cda2 100644
--- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl
+++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc
index eab35196775..4087a4bdd6c 100644
--- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc
+++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(AMI_AmiDds_Base_AmiDds_Sender_idl_gen) : componentidldefaults, dds4ccm {
after += AMI_AmiDds_Base_idl_gen DDS_AMIDDS_Connector_idl_gen
custom_only = 1
diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp
index 3c308bcaef1..2d5814e23af 100644
--- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp
+++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
//Test combination of ami4ccm and dds4ccm
#include "AmiDds_Sender_exec.h"
#include "ace/Guard_T.h"
diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h
index e3ac699a772..a9fdbdc46fd 100644
--- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h
+++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index 7d45ce6206f..6fa1eaea1c4 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(BMClosedED_idl_gen) : componentidldefaults, avoids_ccm_noevent {
custom_only = 1
after += BasicSP_idl_gen
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
index 653efe74d11..9cc0606cb4a 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/SString.h"
#include "ace/OS_NS_string.h"
#include "BMClosedED_exec.h"
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h
index 76a07ee4bb3..06a11fb7636 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
//================================================================
/**
* @file BMClosedED_exec.h
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index 6a839746046..32fcc24629c 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(BMDevice_idl_gen): componentidldefaults, avoids_ccm_noevent {
custom_only = 1
after += BasicSP_idl_gen
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
index 6af5f5ab5d6..1587d2a3571 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "BMDevice_exec.h"
#define DISPLACEMENT 256
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h
index e1caa487239..c7fcde2c0c5 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
// ================================================================
/**
* @file BMDevice_exec.h
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 5f244845fd9..28da24aca5a 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(BMDisplay_idl_gen): componentidldefaults,anytypecode, avoids_ccm_noevent {
custom_only = 1
idlflags += -I.. \
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
index c52461c27dd..75be9f91812 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "BMDisplay_exec.h"
/// Default constructor.
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h
index e52ceb879a0..531c6b9f8a8 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
//==============================================================
/**
* @file BMDisplay_exec.h
diff --git a/CIAO/examples/BasicSP/BasicSP.idl b/CIAO/examples/BasicSP/BasicSP.idl
index d96d16fa38e..c03a4af1431 100644
--- a/CIAO/examples/BasicSP/BasicSP.idl
+++ b/CIAO/examples/BasicSP/BasicSP.idl
@@ -1,4 +1,3 @@
-// $Id$
//=============================================================================
/**
* @file BasicSP.idl
diff --git a/CIAO/examples/BasicSP/BasicSP.mpc b/CIAO/examples/BasicSP/BasicSP.mpc
index 98aff18a728..a5dcdcda0cf 100644
--- a/CIAO/examples/BasicSP/BasicSP.mpc
+++ b/CIAO/examples/BasicSP/BasicSP.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n HUDisplay"
project(BasicSP_idl_gen): componentidldefaults, avoids_ccm_noevent{
diff --git a/CIAO/examples/BasicSP/EC/EC.idl b/CIAO/examples/BasicSP/EC/EC.idl
index 3d87e64013c..4833e4846e0 100644
--- a/CIAO/examples/BasicSP/EC/EC.idl
+++ b/CIAO/examples/BasicSP/EC/EC.idl
@@ -1,4 +1,3 @@
-// $Id$
//=============================================================================
/**
* @file EC.idl
diff --git a/CIAO/examples/BasicSP/EC/EC.mpc b/CIAO/examples/BasicSP/EC/EC.mpc
index a44e3ba3bd2..0d5d31c196c 100644
--- a/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/CIAO/examples/BasicSP/EC/EC.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(EC_idl_gen): componentidldefaults, avoids_ccm_noevent {
custom_only = 1
idlflags += -I.. \
diff --git a/CIAO/examples/BasicSP/EC/EC_exec.cpp b/CIAO/examples/BasicSP/EC/EC_exec.cpp
index 0a87cc1e696..ebbe5a35700 100644
--- a/CIAO/examples/BasicSP/EC/EC_exec.cpp
+++ b/CIAO/examples/BasicSP/EC/EC_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EC_exec.h"
#include "ace/Timer_Queue.h"
#include "ace/Reactor.h"
diff --git a/CIAO/examples/BasicSP/EC/EC_exec.h b/CIAO/examples/BasicSP/EC/EC_exec.h
index 958f462fd35..ab675a14b49 100644
--- a/CIAO/examples/BasicSP/EC/EC_exec.h
+++ b/CIAO/examples/BasicSP/EC/EC_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================
/**
* @file EC_exec.h
diff --git a/CIAO/examples/BasicSP/EC/client.cpp b/CIAO/examples/BasicSP/EC/client.cpp
index ace0a8c1209..141066cf457 100644
--- a/CIAO/examples/BasicSP/EC/client.cpp
+++ b/CIAO/examples/BasicSP/EC/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//==============================================================
/**
* @file client.cpp
diff --git a/CIAO/examples/BasicSP/EC/controller.cpp b/CIAO/examples/BasicSP/EC/controller.cpp
index 5897abb93ee..86a0fe2fe6c 100644
--- a/CIAO/examples/BasicSP/EC/controller.cpp
+++ b/CIAO/examples/BasicSP/EC/controller.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file controller.cpp
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator.idl b/CIAO/examples/DevGuideExamples/Messenger/Administrator.idl
index 3833c77df83..f897fc161f7 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator.idl
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Administrator.idl
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc b/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
index 06e7212197f..3a8f4a1576f 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Messenger Administrator"
project(Messenger_Administrator_idl_gen) : componentidldefaults , avoids_ccm_noevent{
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp
index 1fb71909966..b06497badd2 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Administrator_Client.cpp
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.cpp b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.cpp
index 399faa40389..f3c508a50ef 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Administrator_Client_IDL2.cpp
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc
index cd2124c0dfd..c0cf16775ee 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Administrator_Client_IDL2_Compile): taoidl3toidl2defaults, avoids_ccm_noevent {
requires += dummy_label
after += Messenger_idl_gen Messenger_Administrator_idl_gen
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.cpp b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.cpp
index 6e83b57165f..5dd6316f986 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Administrator_Client_IDL3.cpp
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc
index 0e6c8ecb3bb..08147eeef92 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
// @file Administrator_Client_IDL3.mpc
//
// @author Don Busch <busch_d@ociweb.com>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp
index cfb6b5b7e71..4e258ac87b6 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h
index 80a0a63a110..ad2376a4b98 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/History.idl b/CIAO/examples/DevGuideExamples/Messenger/History.idl
index 4853cbc863f..f9a86734eea 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/History.idl
+++ b/CIAO/examples/DevGuideExamples/Messenger/History.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file History.idl
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp
index 10498bbdf71..7e0f75baa18 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h
index 5563a1b033b..67290b6c540 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h
+++ b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Message.idl b/CIAO/examples/DevGuideExamples/Messenger/Message.idl
index 6016ca1f249..4fb51d51aa0 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Message.idl
+++ b/CIAO/examples/DevGuideExamples/Messenger/Message.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Message.idl
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger.idl b/CIAO/examples/DevGuideExamples/Messenger/Messenger.idl
index d31f623719a..303bed0601c 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Messenger.idl
+++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Messenger.idl
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc
index 9bacf9f7094..1da47961c9a 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Messenger"
project(Messenge_idl_gen) : ciaoidldefaults, avoids_ccm_noevent, anytypecode {
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
index 2c4c3bbfb38..2493f70385c 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h
index 406996d4f47..5a11e42b36c 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h
+++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Publication.idl b/CIAO/examples/DevGuideExamples/Messenger/Publication.idl
index ea8ec6ffa4e..8741bd765ff 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Publication.idl
+++ b/CIAO/examples/DevGuideExamples/Messenger/Publication.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Publication.idl
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
index 5dfd59bc423..d99cea266c3 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h
index 07c43248586..80bd3ddbe20 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h
+++ b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Receiver.idl b/CIAO/examples/DevGuideExamples/Messenger/Receiver.idl
index 2d22feceb70..97acd05520f 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Receiver.idl
+++ b/CIAO/examples/DevGuideExamples/Messenger/Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Receiver.idl
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc b/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc
index e14e26cd97d..189ed6e6b61 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Messenger Receiver"
project(Messenger_Receiver_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp
index 46981868492..c5b4bf70273 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h
index 7ef677e9f02..70d285f1fb2 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h
+++ b/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Runnable.idl b/CIAO/examples/DevGuideExamples/Messenger/Runnable.idl
index 363ddfc51c9..ae62b187de3 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Runnable.idl
+++ b/CIAO/examples/DevGuideExamples/Messenger/Runnable.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Runnable.idl
*
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp
index 4f02a3e7e10..6b37fb383ca 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h
index c432298dfd4..e672d85baf2 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h
+++ b/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h
@@ -1,4 +1,3 @@
-// $Id$
//
// **** Code generated by the ****
// **** Component Integrated ACE ORB (CIAO) CIDL Compiler ****
diff --git a/CIAO/examples/Display/Display_Base/Display_Base.idl b/CIAO/examples/Display/Display_Base/Display_Base.idl
index fe7fb8ffd14..2e00bac0f92 100644
--- a/CIAO/examples/Display/Display_Base/Display_Base.idl
+++ b/CIAO/examples/Display/Display_Base/Display_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Display_Base.idl
*
diff --git a/CIAO/examples/Display/Display_Base/Display_Base.mpc b/CIAO/examples/Display/Display_Base/Display_Base.mpc
index c85e89028ce..16a8a8ce7f4 100644
--- a/CIAO/examples/Display/Display_Base/Display_Base.mpc
+++ b/CIAO/examples/Display/Display_Base/Display_Base.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Display_Base"
project(Display_Base_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/examples/Display/GPS/GPS.idl b/CIAO/examples/Display/GPS/GPS.idl
index 1088de1abb9..0df2e468212 100644
--- a/CIAO/examples/Display/GPS/GPS.idl
+++ b/CIAO/examples/Display/GPS/GPS.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file GPS.idl
*
diff --git a/CIAO/examples/Display/GPS/GPS.mpc b/CIAO/examples/Display/GPS/GPS.mpc
index cd38a306f54..438ec36b4e3 100644
--- a/CIAO/examples/Display/GPS/GPS.mpc
+++ b/CIAO/examples/Display/GPS/GPS.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Display_Base -u Display GPS"
project(Display_GPS_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/examples/Display/GPS/GPSEI.idl b/CIAO/examples/Display/GPS/GPSEI.idl
index ff8b2b828aa..9352351a8a9 100644
--- a/CIAO/examples/Display/GPS/GPSEI.idl
+++ b/CIAO/examples/Display/GPS/GPSEI.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file GPSEI.idl
*
diff --git a/CIAO/examples/Display/GPS/GPS_exec.cpp b/CIAO/examples/Display/GPS/GPS_exec.cpp
index b59cc92c244..7b582901666 100644
--- a/CIAO/examples/Display/GPS/GPS_exec.cpp
+++ b/CIAO/examples/Display/GPS/GPS_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "GPS_exec.h"
#include "ace/OS_NS_time.h"
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay.idl b/CIAO/examples/Display/NavDisplay/NavDisplay.idl
index 2925c19cd70..62f86234cf4 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay.idl
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file NavDisplay.idl
*
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index db572d57581..32b91973b20 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Display_Base -u Display NavDisplay"
project(Display_NavDisplay_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
index 4ede4e984ef..c622e5398e4 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NavDisplay_exec.h"
/// Default constructor.
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h
index c974083bb66..8d6ca1a5565 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file NavDisplay_exec.h
*
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp
index 3ac6aa8d4cb..abaeed0b6f2 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AddNavUnitCmd.h"
#include "RootPanel.h"
#include "NavUnit.h"
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.h b/CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.h
index 6a3930196e7..50cbd191cf5 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __ADDNAVUNITCMD_H
#define __ADDNAVUNITCMD_H
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/Command.h b/CIAO/examples/Display/NavDisplayGUI_exec/Command.h
index 5974d7c64db..beca8ab91be 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/Command.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/Command.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __COMMAND_H
#define __COMMAND_H
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/DetailView.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/DetailView.cpp
index 1cac756cdc8..f9e92f77fa7 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/DetailView.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/DetailView.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DetailView.h"
#include <QtGui/qlayout.h>
#include <QtGui/qlabel.h>
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/DetailView.h b/CIAO/examples/Display/NavDisplayGUI_exec/DetailView.h
index add1545a12d..f614b3520cc 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/DetailView.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/DetailView.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __DETAILVIEW_H
#define __DETAILVIEW_H
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/MapView.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/MapView.cpp
index 625bfc46f24..96978bd84bf 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/MapView.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/MapView.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MapView.h"
#include <stdlib.h>
#include "worldmap1.xpm"
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/MapView.h b/CIAO/examples/Display/NavDisplayGUI_exec/MapView.h
index de826ffefec..34e6e631090 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/MapView.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/MapView.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __MAPVIEW_H
#define __MAPVIEW_H
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index 2ba05c17ccb..6a8e9a5b91e 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Display_NavDisplayGUI_exec_moc) : ace_qt4, avoids_ccm_noevent{
custom_only = 1
MOC_Files {
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
index 17995aa0506..c6900d996b3 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NavDisplayGUI_exec.h"
#include <QtGui/qapplication.h>
#include <QtGui/qevent.h>
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
index 5f0c9193b0f..4f63a04972e 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file NavDisplayGUI_exec.h
*
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.cpp
index 92b06872d66..73a2a912bac 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NavUnit.h"
NavUnit::NavUnit(const UnitID &id)
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.h b/CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.h
index cfb32ad1f36..1aab7f3ae56 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __NAVUNIT_H
#define __NAVUNIT_H
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.cpp
index fa18489a82b..725dcfdc403 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NodeItem.h"
#include <QtGui/qbrush.h>
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.h b/CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.h
index 1724a0b331b..3c93970d5d2 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __NODEITEM_H
#define __NODEITEM_H
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.cpp
index e605a6a6698..b4d39f660fe 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "QuitCmd.h"
#include "RootPanel.h"
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.h b/CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.h
index 92b2b0110eb..97972f4dea1 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __QUITCMD_H
#define __QUITCMD_H
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.cpp
index e595cfe39f3..3c04492da65 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RootPanel.h"
#include <QtGui/qmenubar.h>
#include <QtGui/qapplication.h>
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.h b/CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.h
index d07342aa981..a7ef945b1c3 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __ROOTPANEL_H
#define __ROOTPANEL_H
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp
index 5f43a895214..2eeefdd2448 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RootPanel.h"
#include "UpdatePositionCmd.h"
#include <QtGui/qlcdnumber.h>
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.h b/CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.h
index 6eaa62a7770..7065c446292 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __UPDATEPOSITIONCM_H
#define __UPDATEPOSITIONCM_H
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/Worker.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/Worker.cpp
index 0bc2f5b2557..e08cb667c9c 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/Worker.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/Worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Worker.h"
#include <QtGui/qapplication.h>
#include <QtGui/qmotifstyle.h>
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/Worker.h b/CIAO/examples/Display/NavDisplayGUI_exec/Worker.h
index 73aa649bd36..f0ffd44a5c5 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/Worker.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/Worker.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __WORKER_H
#define __WORKER_H
diff --git a/CIAO/examples/Display/RateGen/RateGen.idl b/CIAO/examples/Display/RateGen/RateGen.idl
index ef398f5df78..b25084eaddb 100644
--- a/CIAO/examples/Display/RateGen/RateGen.idl
+++ b/CIAO/examples/Display/RateGen/RateGen.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file RateGen.idl
*
diff --git a/CIAO/examples/Display/RateGen/RateGen.mpc b/CIAO/examples/Display/RateGen/RateGen.mpc
index 3baaa5653ce..cab10bfdb79 100644
--- a/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Display_Base -u Display -c controller RateGen"
project(Display_RateGen_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.cpp b/CIAO/examples/Display/RateGen/RateGen_exec.cpp
index ba4834e7f24..8ad315120e8 100644
--- a/CIAO/examples/Display/RateGen/RateGen_exec.cpp
+++ b/CIAO/examples/Display/RateGen/RateGen_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RateGen_exec.h"
#include "ace/Timer_Queue.h"
#include "ace/Reactor.h"
diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.h b/CIAO/examples/Display/RateGen/RateGen_exec.h
index dc98931ce97..e820d75722c 100644
--- a/CIAO/examples/Display/RateGen/RateGen_exec.h
+++ b/CIAO/examples/Display/RateGen/RateGen_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file RateGen_exec.h
*
diff --git a/CIAO/examples/Display/RateGen/controller.cpp b/CIAO/examples/Display/RateGen/controller.cpp
index 38cc5f476cb..ef1a54964bd 100644
--- a/CIAO/examples/Display/RateGen/controller.cpp
+++ b/CIAO/examples/Display/RateGen/controller.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RateGenC.h"
#include "ace/streams.h"
#include "ace/Get_Opt.h"
diff --git a/CIAO/examples/Hello/Base/Hello.idl b/CIAO/examples/Hello/Base/Hello.idl
index f5d6a9ae36f..d60ed16a087 100644
--- a/CIAO/examples/Hello/Base/Hello.idl
+++ b/CIAO/examples/Hello/Base/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_IDL
#define HELLO_IDL
diff --git a/CIAO/examples/Hello/Base/Hello.mpc b/CIAO/examples/Hello/Base/Hello.mpc
index bff69c6b788..50555d1052b 100644
--- a/CIAO/examples/Hello/Base/Hello.mpc
+++ b/CIAO/examples/Hello/Base/Hello.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Hello_Example_idl_gen) : componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \
diff --git a/CIAO/examples/Hello/Receiver/Hello_Receiver.idl b/CIAO/examples/Hello/Receiver/Hello_Receiver.idl
index 242594e5681..f7f1ff0006b 100644
--- a/CIAO/examples/Hello/Receiver/Hello_Receiver.idl
+++ b/CIAO/examples/Hello/Receiver/Hello_Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_RECEIVER_IDL
#define HELLO_RECEIVER_IDL
diff --git a/CIAO/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/examples/Hello/Receiver/Hello_Receiver.mpc
index 8c987395bf1..4c2d3105b85 100644
--- a/CIAO/examples/Hello/Receiver/Hello_Receiver.mpc
+++ b/CIAO/examples/Hello/Receiver/Hello_Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Receiver"
project(Hello_Ex_Base_Hello_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/examples/Hello/Receiver/Hello_Receiver_exec.cpp
index bdc2eb69bcc..c62082d7f74 100644
--- a/CIAO/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/examples/Hello/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/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/examples/Hello/Receiver/Hello_Receiver_exec.h
index 602e820ac59..92bdbbb08bf 100644
--- a/CIAO/examples/Hello/Receiver/Hello_Receiver_exec.h
+++ b/CIAO/examples/Hello/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/examples/Hello/Sender/Hello_Sender.idl b/CIAO/examples/Hello/Sender/Hello_Sender.idl
index df1f83c6a18..bf98c843e54 100644
--- a/CIAO/examples/Hello/Sender/Hello_Sender.idl
+++ b/CIAO/examples/Hello/Sender/Hello_Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_SENDER_IDL
#define HELLO_SENDER_IDL
diff --git a/CIAO/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/examples/Hello/Sender/Hello_Sender.mpc
index 6b0e556adf5..b8779b64447 100644
--- a/CIAO/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/examples/Hello/Sender/Hello_Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Sender"
project(Hello_Ex_Base_Hello_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/examples/Hello/Sender/Hello_Sender_exec.cpp
index 464ebd0858c..e06f5fb521f 100644
--- a/CIAO/examples/Hello/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/examples/Hello/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/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/examples/Hello/Sender/Hello_Sender_exec.h
index d4fb18e6e35..21e407fba86 100644
--- a/CIAO/examples/Hello/Sender/Hello_Sender_exec.h
+++ b/CIAO/examples/Hello/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/examples/Hello_Event/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello_Event/Hello_Base/Hello_Base.mpc
index b8f35ae53cc..c0360455bc2 100644
--- a/CIAO/examples/Hello_Event/Hello_Base/Hello_Base.mpc
+++ b/CIAO/examples/Hello_Event/Hello_Base/Hello_Base.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -e -n -l../lib -o../lib Hello_Base"
project(Hello_Base_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/examples/Hello_Event/Receiver/Receiver.mpc b/CIAO/examples/Hello_Event/Receiver/Receiver.mpc
index c1d6b30836d..150098d4a60 100644
--- a/CIAO/examples/Hello_Event/Receiver/Receiver.mpc
+++ b/CIAO/examples/Hello_Event/Receiver/Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -e -l ../lib -o ../lib -p Hello_Base Receiver"
project(Hello_Base_Receiver_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/examples/Hello_Event/Receiver/Receiver_exec.cpp b/CIAO/examples/Hello_Event/Receiver/Receiver_exec.cpp
index 0e9fc2d5304..7566a6c7dda 100644
--- a/CIAO/examples/Hello_Event/Receiver/Receiver_exec.cpp
+++ b/CIAO/examples/Hello_Event/Receiver/Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/examples/Hello_Event/Receiver/Receiver_exec.h b/CIAO/examples/Hello_Event/Receiver/Receiver_exec.h
index dfdb782b61d..3c105cf3c35 100644
--- a/CIAO/examples/Hello_Event/Receiver/Receiver_exec.h
+++ b/CIAO/examples/Hello_Event/Receiver/Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/examples/Hello_Event/Sender/Sender.mpc b/CIAO/examples/Hello_Event/Sender/Sender.mpc
index 739ab7594f6..60699d756c1 100644
--- a/CIAO/examples/Hello_Event/Sender/Sender.mpc
+++ b/CIAO/examples/Hello_Event/Sender/Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -e -l ../lib -o ../lib -c starter -p Hello_Base Sender"
project(Hello_Base_Sender_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/examples/Hello_Event/Sender/Sender_exec.cpp b/CIAO/examples/Hello_Event/Sender/Sender_exec.cpp
index a50267712ba..c33857c5c8a 100644
--- a/CIAO/examples/Hello_Event/Sender/Sender_exec.cpp
+++ b/CIAO/examples/Hello_Event/Sender/Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/examples/Hello_Event/Sender/Sender_exec.h b/CIAO/examples/Hello_Event/Sender/Sender_exec.h
index 267c9ca360b..f4ce8d4a017 100644
--- a/CIAO/examples/Hello_Event/Sender/Sender_exec.h
+++ b/CIAO/examples/Hello_Event/Sender/Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/examples/Null_Component/Null_Component.mpc b/CIAO/examples/Null_Component/Null_Component.mpc
index 8cb15530500..66322af2917 100644
--- a/CIAO/examples/Null_Component/Null_Component.mpc
+++ b/CIAO/examples/Null_Component/Null_Component.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Null_Interface Null_Component"
project(Null_Component_idl_gen) : componentidldefaults {
diff --git a/CIAO/examples/Null_Component/Null_Interface.mpc b/CIAO/examples/Null_Component/Null_Interface.mpc
index f4c0f67de3b..4083a9be4ff 100644
--- a/CIAO/examples/Null_Component/Null_Interface.mpc
+++ b/CIAO/examples/Null_Component/Null_Interface.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Null_Interface"
project(Null_Interface_idl_gen) : componentidldefaults {
diff --git a/CIAO/performance-tests/Benchmark/Benchmark.idl b/CIAO/performance-tests/Benchmark/Benchmark.idl
index 6890e23b48b..3a259a9645c 100644
--- a/CIAO/performance-tests/Benchmark/Benchmark.idl
+++ b/CIAO/performance-tests/Benchmark/Benchmark.idl
@@ -1,4 +1,3 @@
-// $Id$
//=============================================================================
/**
* @file Benchmark.idl
diff --git a/CIAO/performance-tests/Benchmark/Benchmark.mpc b/CIAO/performance-tests/Benchmark/Benchmark.mpc
index bf9dc6c55f3..ff8a7f1315e 100644
--- a/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n -c server Benchmark"
project(Benchmark_idl_gen) : componentidldefaults {
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp b/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp
index de8238096f4..1bae375bf19 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
Client_Task::Client_Task (Benchmark::RoundTripClient_ptr roundtrip)
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc b/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
index c5a5c09eb00..87ba8042fe8 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Multi_Threaded_client) : ccm_stub, strategies {
exename = client
after += Benchmark_RoundTripClient_stub
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl
index 8b682c67cbe..116524249d8 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl
@@ -1,4 +1,3 @@
-// $Id$
//=============================================================================
/**
* @file RoundTrip.idl
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index 921d1e4c085..4128ead25fe 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Benchmark -l .. -c client Roundtrip"
project(Benchmark_RoundTrip_idl_gen) : componentidldefaults {
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
index b42a56eb907..8d4db7e1e6e 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//=============================================================================
/**
* @file RoundTripEI.idl
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
index 852b6f64d60..2c4d67ac4d5 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RoundTrip_exec.h"
//-- ACE Scheduling Params
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 3f0be5d0fad..302f19cfb2f 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//==============================================================
/**
* @file client.cpp
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl
index 109ee63cfb2..3f999a2445a 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl
@@ -1,4 +1,3 @@
-// $Id$
//=============================================================================
/**
* @file RoundTripClient.idl
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
index 567fbcfce13..d177083bfcc 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Benchmark -l .. -c client RoundTripClient"
project(Benchmark_RoundTripClient_idl_gen) : componentidldefaults {
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl
index a5a2dd90c67..24adb1f888d 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//=============================================================================
/**
* @file RoundTripClientEI.idl
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
index 30d3475f90e..7a38dba1b29 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Stats.h"
#include "ace/Throughput_Stats.h"
#include "ace/Sample_History.h"
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h
index 86b95099b15..31e10b66743 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================
/**
* @file RoundTripClient_exec.h
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
index f4cf8a52c08..1441ef0d4fe 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//==============================================================
/**
* @file client.cpp
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
index 8fdcb042392..202b95a0ddb 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LatencyTest.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc b/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
index 5c824ef9072..e3c27c52341 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (RoundTrip_server) : strategies, ciao_executor {
exename = server
after += Benchmark_skel
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
index a41e38aa6f9..a9353976b6b 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LatencyTest.h"
#include "ace/Sched_Params.h"
#include "ace/OS_NS_errno.h"
diff --git a/CIAO/performance-tests/Benchmark/server.cpp b/CIAO/performance-tests/Benchmark/server.cpp
index 1ec50d59810..9a4030c1372 100644
--- a/CIAO/performance-tests/Benchmark/server.cpp
+++ b/CIAO/performance-tests/Benchmark/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LatencyTest.h"
#include "ace/Sched_Params.h"
diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index 5f96222dd38..bc9eedc07e1 100644
--- a/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SenderC.h"
#include "ReceiverC.h"
#include "tao/ORB_Constants.h"
diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.mpc b/CIAO/performance-tests/Protocols/Controller/Controller.mpc
index af97a3d6520..433f48c4637 100644
--- a/CIAO/performance-tests/Protocols/Controller/Controller.mpc
+++ b/CIAO/performance-tests/Protocols/Controller/Controller.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Protocols_Controller) : ccm_stub, rtcorba {
after += Protocols_Sender_stub \
Protocols_Receiver_stub
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.idl b/CIAO/performance-tests/Protocols/Receiver/Receiver.idl
index f6de6e91a58..e968ff36a44 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.idl
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
#include "../common/Protocols.idl"
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index c831cc1be5f..a7d31393b91 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Protocols Receiver"
project(Protocols_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
index 428b47c1da9..117cec0aced 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver_exec.h"
#include "ace/Stats.h"
#include "ace/Throughput_Stats.h"
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h
index 827492ce119..ac8ca222e62 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ReceiverEC.h"
#include "Receiver_exec_export.h"
#include "tao/LocalObject.h"
diff --git a/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp b/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp
index 155d0516de5..ff80804b53d 100644
--- a/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp
+++ b/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Custom_Network_Priority_Mapping.h"
#include "tao/debug.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.idl b/CIAO/performance-tests/Protocols/Sender/Sender.idl
index 200eaa0350a..b3d5174976f 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.idl
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
#include "../common/Protocols.idl"
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 775ce63d5d9..8ef297b7060 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Protocols Sender"
project(Protocols_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index 8c33b41994b..5d1bf473fea 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Constants.h"
#include "tao/debug.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.h b/CIAO/performance-tests/Protocols/Sender/Sender_exec.h
index d6e38abefb5..dc6130308a7 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.h
+++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SenderEC.h"
#include "Sender_exec_export.h"
#include "tao/LocalObject.h"
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.idl b/CIAO/performance-tests/Protocols/common/Protocols.idl
index c9943657993..5f7fa0ecf7f 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.idl
+++ b/CIAO/performance-tests/Protocols/common/Protocols.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef PROTOCOLS_IDL
#define PROTOCOLS_IDL
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.mpc b/CIAO/performance-tests/Protocols/common/Protocols.mpc
index 210df2ec9a2..a41050c4a3b 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Protocols"
project(Protocols_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
index c2b2a15b719..fb8f5300e6b 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TSEC_CHECKPOINTEI_IDL
#define TSEC_CHECKPOINTEI_IDL
diff --git a/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc b/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc
index f0d959c90ec..fb78bf503d4 100644
--- a/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc
+++ b/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Foo"
project(Foo_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_3769_Regression/Foo.idl b/CIAO/tests/Bug_3769_Regression/Foo.idl
index e63951f66ff..ff384c84fac 100644
--- a/CIAO/tests/Bug_3769_Regression/Foo.idl
+++ b/CIAO/tests/Bug_3769_Regression/Foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FOO_IDL_
#define FOO_IDL_
diff --git a/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp b/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp
index 2bd5b4fbdd8..668d2cab9e6 100644
--- a/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp
+++ b/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Foo_exec.h"
// Helper methods.
diff --git a/CIAO/tests/Bug_3769_Regression/Foo_exec.h b/CIAO/tests/Bug_3769_Regression/Foo_exec.h
index 8644d9aa875..de2ee6fe44c 100644
--- a/CIAO/tests/Bug_3769_Regression/Foo_exec.h
+++ b/CIAO/tests/Bug_3769_Regression/Foo_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_FOO_EXEC_H_
#define CIAO_FOO_EXEC_H_
diff --git a/CIAO/tests/Bug_3817_Regression/Bar.idl b/CIAO/tests/Bug_3817_Regression/Bar.idl
index a35db34579c..8a03b6dad2c 100644
--- a/CIAO/tests/Bug_3817_Regression/Bar.idl
+++ b/CIAO/tests/Bug_3817_Regression/Bar.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BAR_IDL_
#define BAR_IDL_
diff --git a/CIAO/tests/Bug_3817_Regression/Bar.mpc b/CIAO/tests/Bug_3817_Regression/Bar.mpc
index 05f444a0196..61ed203acf6 100644
--- a/CIAO/tests/Bug_3817_Regression/Bar.mpc
+++ b/CIAO/tests/Bug_3817_Regression/Bar.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Bar"
project(Bar_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_3834_Regression/CompA.idl b/CIAO/tests/Bug_3834_Regression/CompA.idl
index 7499894518f..02800b5e00d 100644
--- a/CIAO/tests/Bug_3834_Regression/CompA.idl
+++ b/CIAO/tests/Bug_3834_Regression/CompA.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef COMPA_IDL_
#define COMPA_IDL_
diff --git a/CIAO/tests/Bug_3834_Regression/CompA.mpc b/CIAO/tests/Bug_3834_Regression/CompA.mpc
index c2e6587eb47..9bf3956460a 100644
--- a/CIAO/tests/Bug_3834_Regression/CompA.mpc
+++ b/CIAO/tests/Bug_3834_Regression/CompA.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Moo CompA"
project(Moo_CompA_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_3834_Regression/CompA_exec.cpp b/CIAO/tests/Bug_3834_Regression/CompA_exec.cpp
index 4aee8020fd9..381c29ca803 100644
--- a/CIAO/tests/Bug_3834_Regression/CompA_exec.cpp
+++ b/CIAO/tests/Bug_3834_Regression/CompA_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/Bug_3834_Regression/CompA_exec.h b/CIAO/tests/Bug_3834_Regression/CompA_exec.h
index ffcb67dd244..1e994f213ab 100644
--- a/CIAO/tests/Bug_3834_Regression/CompA_exec.h
+++ b/CIAO/tests/Bug_3834_Regression/CompA_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/Bug_3834_Regression/CompB.idl b/CIAO/tests/Bug_3834_Regression/CompB.idl
index d903d569c96..5e4273e2177 100644
--- a/CIAO/tests/Bug_3834_Regression/CompB.idl
+++ b/CIAO/tests/Bug_3834_Regression/CompB.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef COMPB_IDL_
#define COMPB_IDL_
diff --git a/CIAO/tests/Bug_3834_Regression/CompB.mpc b/CIAO/tests/Bug_3834_Regression/CompB.mpc
index 0077cb5ef34..36428207858 100644
--- a/CIAO/tests/Bug_3834_Regression/CompB.mpc
+++ b/CIAO/tests/Bug_3834_Regression/CompB.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Moo CompB"
project(Moo_CompB_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_3834_Regression/CompB_exec.cpp b/CIAO/tests/Bug_3834_Regression/CompB_exec.cpp
index 5377d103e92..811888cc1fa 100644
--- a/CIAO/tests/Bug_3834_Regression/CompB_exec.cpp
+++ b/CIAO/tests/Bug_3834_Regression/CompB_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/Bug_3834_Regression/CompB_exec.h b/CIAO/tests/Bug_3834_Regression/CompB_exec.h
index 4a07b83fe2c..bbd7059f616 100644
--- a/CIAO/tests/Bug_3834_Regression/CompB_exec.h
+++ b/CIAO/tests/Bug_3834_Regression/CompB_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/Bug_3834_Regression/Moo.idl b/CIAO/tests/Bug_3834_Regression/Moo.idl
index 7a32e41104d..e744cfc3c30 100644
--- a/CIAO/tests/Bug_3834_Regression/Moo.idl
+++ b/CIAO/tests/Bug_3834_Regression/Moo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MOO_IDL_
#define MOO_IDL_
diff --git a/CIAO/tests/Bug_3834_Regression/Moo.mpc b/CIAO/tests/Bug_3834_Regression/Moo.mpc
index 46ce818eb66..e37bd415eae 100644
--- a/CIAO/tests/Bug_3834_Regression/Moo.mpc
+++ b/CIAO/tests/Bug_3834_Regression/Moo.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Moo"
project(Moo_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc b/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc
index 763f526c233..9b5f41f95e6 100644
--- a/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc
+++ b/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Foo"
project(Bug_3890_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_3890_Regression/Foo.idl b/CIAO/tests/Bug_3890_Regression/Foo.idl
index 72026a41bec..7821644a85a 100644
--- a/CIAO/tests/Bug_3890_Regression/Foo.idl
+++ b/CIAO/tests/Bug_3890_Regression/Foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FOO_IDL_
#define FOO_IDL_
diff --git a/CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl b/CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl
index bb51553b796..f6c560ebbf7 100644
--- a/CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl
+++ b/CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
module Foo <typename T, sequence <T> TSeq>
diff --git a/CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl b/CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl
index bf6f891ae9d..4c8085b70dd 100644
--- a/CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl
+++ b/CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
module Foo <typename T, sequence <T> TSeq>
diff --git a/CIAO/tests/Bug_3944_Regression/base_connector_conn.idl b/CIAO/tests/Bug_3944_Regression/base_connector_conn.idl
index fbce1bb2a97..ad397c1b12a 100644
--- a/CIAO/tests/Bug_3944_Regression/base_connector_conn.idl
+++ b/CIAO/tests/Bug_3944_Regression/base_connector_conn.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BASE_CONNECTOR_CONN_IDL
#define BASE_CONNECTOR_CONN_IDL
diff --git a/CIAO/tests/Bug_3944_Regression/connector_conn.idl b/CIAO/tests/Bug_3944_Regression/connector_conn.idl
index 2af8e4a1a9f..f249de3013a 100644
--- a/CIAO/tests/Bug_3944_Regression/connector_conn.idl
+++ b/CIAO/tests/Bug_3944_Regression/connector_conn.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CONNECTOR_CONN_IDL
#define CONNECTOR_CONN_IDL
diff --git a/CIAO/tests/Bug_3944_Regression/connector_inst_conn.idl b/CIAO/tests/Bug_3944_Regression/connector_inst_conn.idl
index 699a05a624f..029e266aa97 100644
--- a/CIAO/tests/Bug_3944_Regression/connector_inst_conn.idl
+++ b/CIAO/tests/Bug_3944_Regression/connector_inst_conn.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CONNECTOR_INST_CONN_IDL
#define CONNECTOR_INST_CONN_IDL
diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl
index 9edb2204387..ba4b6175b89 100644
--- a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl
+++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Bug_4009_Foo.idl"
#pragma ciao lem "Bug_4009_BarE.idl"
diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc
index c783431399a..ae7101f683d 100644
--- a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc
+++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Bug_4009_Bar"
project(Bug_4009_Bar_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl
index 9619684986e..ed3704ec3c6 100644
--- a/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl
+++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef IC_Foo_IDL
#define IC_Foo_IDL
diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc
index c9c13cb04df..c604154ca86 100644
--- a/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc
+++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Bug_4009_Foo"
project(Bug_4009_Foo_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_4086_Regression/Bug_4086_Regression.mpc b/CIAO/tests/Bug_4086_Regression/Bug_4086_Regression.mpc
index 9018cb37cd2..71ed1659a9e 100644
--- a/CIAO/tests/Bug_4086_Regression/Bug_4086_Regression.mpc
+++ b/CIAO/tests/Bug_4086_Regression/Bug_4086_Regression.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Foo"
project(*idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Bug_4086_Regression/Foo.idl b/CIAO/tests/Bug_4086_Regression/Foo.idl
index 7d3672d5806..c3526d98ace 100644
--- a/CIAO/tests/Bug_4086_Regression/Foo.idl
+++ b/CIAO/tests/Bug_4086_Regression/Foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FOO_IDL_
#define FOO_IDL_
diff --git a/CIAO/tests/Bug_4086_Regression/Foo_exec.cpp b/CIAO/tests/Bug_4086_Regression/Foo_exec.cpp
index 594db22db4f..4be93f7bb9d 100644
--- a/CIAO/tests/Bug_4086_Regression/Foo_exec.cpp
+++ b/CIAO/tests/Bug_4086_Regression/Foo_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Foo_exec.h"
namespace CIAO_Foo_Impl
diff --git a/CIAO/tests/Bug_4086_Regression/Foo_exec.h b/CIAO/tests/Bug_4086_Regression/Foo_exec.h
index 6514ee311e8..95174f3eb3c 100644
--- a/CIAO/tests/Bug_4086_Regression/Foo_exec.h
+++ b/CIAO/tests/Bug_4086_Regression/Foo_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_FOO_EXEC_H_
#define CIAO_FOO_EXEC_H_
diff --git a/CIAO/tests/Bug_4087_Regression/test.idl b/CIAO/tests/Bug_4087_Regression/test.idl
index 56b0b6feea5..e0c2aa1956d 100644
--- a/CIAO/tests/Bug_4087_Regression/test.idl
+++ b/CIAO/tests/Bug_4087_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/CIAO/tests/CIDL/CodeGen/Basic.idl b/CIAO/tests/CIDL/CodeGen/Basic.idl
index 0ae75f867eb..a1cde8b2f68 100644
--- a/CIAO/tests/CIDL/CodeGen/Basic.idl
+++ b/CIAO/tests/CIDL/CodeGen/Basic.idl
@@ -1,4 +1,3 @@
-// $Id$
//=============================================================================
/**
* @file Basic.idl
diff --git a/CIAO/tests/CIDL/CodeGen/Basic.mpc b/CIAO/tests/CIDL/CodeGen/Basic.mpc
index 9bc565d5b66..af5b2244ab7 100644
--- a/CIAO/tests/CIDL/CodeGen/Basic.mpc
+++ b/CIAO/tests/CIDL/CodeGen/Basic.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Basic"
project(Basic_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 6a9320a9d28..c3ea2aca9b4 100644
--- a/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Basic CodeGen"
//
// NOTE: This MPC file has been hand edited so the executor files
diff --git a/CIAO/tests/CIF/Common/CIF_Common.cpp b/CIAO/tests/CIF/Common/CIF_Common.cpp
index 7760e220f05..e8cc3dff596 100644
--- a/CIAO/tests/CIF/Common/CIF_Common.cpp
+++ b/CIAO/tests/CIF/Common/CIF_Common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "CIF_Common.h"
#include "ciao/Base/Client_init.h"
#include "ace/Get_Opt.h"
diff --git a/CIAO/tests/CIF/Common/CIF_Common.h b/CIAO/tests/CIF/Common/CIF_Common.h
index c8d3007293c..e5692f4234d 100644
--- a/CIAO/tests/CIF/Common/CIF_Common.h
+++ b/CIAO/tests/CIF/Common/CIF_Common.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CIF_COMMON_H_
#define CIF_COMMON_H_
diff --git a/CIAO/tests/CIF/Common/CIF_Common.mpc b/CIAO/tests/CIF/Common/CIF_Common.mpc
index ee8087e81f5..e7f74eccaae 100644
--- a/CIAO/tests/CIF/Common/CIF_Common.mpc
+++ b/CIAO/tests/CIF/Common/CIF_Common.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (CIF_Common) : ccm_configvalue, ciao_logger, naming, ciao_base {
dynamicflags += CIF_COMMON_BUILD_DLL
sharedname = CIF_Common
diff --git a/CIAO/tests/CIF/Common/CIF_Common_export.h b/CIAO/tests/CIF/Common/CIF_Common_export.h
index 00136471b93..b9aabba3846 100644
--- a/CIAO/tests/CIF/Common/CIF_Common_export.h
+++ b/CIAO/tests/CIF/Common/CIF_Common_export.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIF_COMMON_EXPORT_H
#define CIF_COMMON_EXPORT_H
diff --git a/CIAO/tests/CIF/Component/CIF_Component.idl b/CIAO/tests/CIF/Component/CIF_Component.idl
index 12c240e703d..209d8dd3308 100644
--- a/CIAO/tests/CIF/Component/CIF_Component.idl
+++ b/CIAO/tests/CIF/Component/CIF_Component.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIF_COMPONENT_IDL_
#define CIF_COMPONENT_IDL_
diff --git a/CIAO/tests/CIF/Component/CIF_Component.mpc b/CIAO/tests/CIF/Component/CIF_Component.mpc
index 6ad684379b6..00b214b1383 100644
--- a/CIAO/tests/CIF/Component/CIF_Component.mpc
+++ b/CIAO/tests/CIF/Component/CIF_Component.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -c CIF_TestDriver CIF_Component"
project(CIF_Component_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/CIF/Component/CIF_Component_exec.cpp b/CIAO/tests/CIF/Component/CIF_Component_exec.cpp
index aabd72cf8a8..2c7638516db 100644
--- a/CIAO/tests/CIF/Component/CIF_Component_exec.cpp
+++ b/CIAO/tests/CIF/Component/CIF_Component_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/CIF/Component/CIF_Component_exec.h b/CIAO/tests/CIF/Component/CIF_Component_exec.h
index 04d9dd0236d..9e2364ee1aa 100644
--- a/CIAO/tests/CIF/Component/CIF_Component_exec.h
+++ b/CIAO/tests/CIF/Component/CIF_Component_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/CIF/Events/Events.mpc b/CIAO/tests/CIF/Events/Events.mpc
index b12b98a3ba3..b02f4f0f03b 100644
--- a/CIAO/tests/CIF/Events/Events.mpc
+++ b/CIAO/tests/CIF/Events/Events.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Events_Test_Client) : ccm_configvalue, naming, ciao_base {
after += CIF_Common CIF_Component_stub
libpaths += ../lib
diff --git a/CIAO/tests/CIF/Events/client.cpp b/CIAO/tests/CIF/Events/client.cpp
index c89c9768450..b5720317895 100644
--- a/CIAO/tests/CIF/Events/client.cpp
+++ b/CIAO/tests/CIF/Events/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Common/CIF_Common.h"
#include "Component/CIF_ComponentC.h"
diff --git a/CIAO/tests/CIF/Navigation/Navigation.mpc b/CIAO/tests/CIF/Navigation/Navigation.mpc
index f217be645c4..5a3af27ee57 100644
--- a/CIAO/tests/CIF/Navigation/Navigation.mpc
+++ b/CIAO/tests/CIF/Navigation/Navigation.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Navigation_Test_Client) : ccm_configvalue, naming, ciao_base {
after += CIF_Common CIF_Component_stub
libpaths += ../lib
diff --git a/CIAO/tests/CIF/Navigation/client.cpp b/CIAO/tests/CIF/Navigation/client.cpp
index 3f54cd1045d..f60e811cb47 100644
--- a/CIAO/tests/CIF/Navigation/client.cpp
+++ b/CIAO/tests/CIF/Navigation/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Common/CIF_Common.h"
//============================================================
diff --git a/CIAO/tests/CIF/Receptacle/Receptacle.mpc b/CIAO/tests/CIF/Receptacle/Receptacle.mpc
index db068fbcfe1..26d790ed930 100644
--- a/CIAO/tests/CIF/Receptacle/Receptacle.mpc
+++ b/CIAO/tests/CIF/Receptacle/Receptacle.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Receptacle_Test_Client) : ccm_configvalue, naming, ciao_base {
after += CIF_Common CIF_Component_stub
libpaths += ../lib
diff --git a/CIAO/tests/CIF/Receptacle/client.cpp b/CIAO/tests/CIF/Receptacle/client.cpp
index 9c76595590f..cf4c50f1545 100644
--- a/CIAO/tests/CIF/Receptacle/client.cpp
+++ b/CIAO/tests/CIF/Receptacle/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Common/CIF_Common.h"
#include <vector>
diff --git a/CIAO/tests/Collocation/Coll_Base/Base.idl b/CIAO/tests/Collocation/Coll_Base/Base.idl
index d1ba48ad9f3..9e2b6d9bb9d 100644
--- a/CIAO/tests/Collocation/Coll_Base/Base.idl
+++ b/CIAO/tests/Collocation/Coll_Base/Base.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef BASE_IDL_
#define BASE_IDL_
diff --git a/CIAO/tests/Collocation/Coll_Base/Base.mpc b/CIAO/tests/Collocation/Coll_Base/Base.mpc
index a61ef47507e..c62a1f44646 100644
--- a/CIAO/tests/Collocation/Coll_Base/Base.mpc
+++ b/CIAO/tests/Collocation/Coll_Base/Base.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n -e -I .. -l ../lib -o ../lib Base"
project(CollBase_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Collocation/Receiver/Receiver.idl b/CIAO/tests/Collocation/Receiver/Receiver.idl
index d40e794b9ad..2a4c41dce14 100644
--- a/CIAO/tests/Collocation/Receiver/Receiver.idl
+++ b/CIAO/tests/Collocation/Receiver/Receiver.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef RECEIVER_IDL_
#define RECEIVER_IDL_
diff --git a/CIAO/tests/Collocation/Receiver/Receiver.mpc b/CIAO/tests/Collocation/Receiver/Receiver.mpc
index 4702aa7b7c6..e006cc33f62 100644
--- a/CIAO/tests/Collocation/Receiver/Receiver.mpc
+++ b/CIAO/tests/Collocation/Receiver/Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Base -c IDL2Client -e -I .. -l ../lib -o ../lib Receiver"
project(CollBase_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp
index 8ec594eb4e9..6d8221778a0 100644
--- a/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp
+++ b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/Collocation/Receiver/Receiver_exec.h b/CIAO/tests/Collocation/Receiver/Receiver_exec.h
index f307546bd6b..c7e8126776f 100644
--- a/CIAO/tests/Collocation/Receiver/Receiver_exec.h
+++ b/CIAO/tests/Collocation/Receiver/Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_0HSO8P_H_
#define CIAO_RECEIVER_EXEC_0HSO8P_H_
diff --git a/CIAO/tests/Collocation/Sender/Sender.idl b/CIAO/tests/Collocation/Sender/Sender.idl
index ecc70bff6c8..4efae54d1fe 100644
--- a/CIAO/tests/Collocation/Sender/Sender.idl
+++ b/CIAO/tests/Collocation/Sender/Sender.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SENDER_IDL_
#define SENDER_IDL_
diff --git a/CIAO/tests/Collocation/Sender/Sender.mpc b/CIAO/tests/Collocation/Sender/Sender.mpc
index 57e574d0aa9..6455c064546 100644
--- a/CIAO/tests/Collocation/Sender/Sender.mpc
+++ b/CIAO/tests/Collocation/Sender/Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Base -e -I .. -l ../lib -o ../lib Sender"
project(CollBase_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Collocation/Sender/Sender_exec.cpp b/CIAO/tests/Collocation/Sender/Sender_exec.cpp
index 95310c3b1d8..91b1a866eb3 100644
--- a/CIAO/tests/Collocation/Sender/Sender_exec.cpp
+++ b/CIAO/tests/Collocation/Sender/Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Sender_exec.h"
namespace CIAO_Sender_Impl
diff --git a/CIAO/tests/Collocation/Sender/Sender_exec.h b/CIAO/tests/Collocation/Sender/Sender_exec.h
index 5ac9a6dacb7..cc10b287dce 100644
--- a/CIAO/tests/Collocation/Sender/Sender_exec.h
+++ b/CIAO/tests/Collocation/Sender/Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/Cookies/Cookie.cpp b/CIAO/tests/Cookies/Cookie.cpp
index 5d6b71102d8..5d7371ebe6f 100644
--- a/CIAO/tests/Cookies/Cookie.cpp
+++ b/CIAO/tests/Cookies/Cookie.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Cookie.h"
#include "ciao/Valuetype_Factories/Cookies.h"
diff --git a/CIAO/tests/Cookies/Cookies.mpc b/CIAO/tests/Cookies/Cookies.mpc
index 350acdbc3a3..e8f3c89a4d5 100644
--- a/CIAO/tests/Cookies/Cookies.mpc
+++ b/CIAO/tests/Cookies/Cookies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
idlflags += -I $(CIAO_ROOT)
diff --git a/CIAO/tests/Cookies/client.cpp b/CIAO/tests/Cookies/client.cpp
index ca6940f459d..919c7a8375c 100644
--- a/CIAO/tests/Cookies/client.cpp
+++ b/CIAO/tests/Cookies/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ciao/Base/Client_init.h"
diff --git a/CIAO/tests/Cookies/server.cpp b/CIAO/tests/Cookies/server.cpp
index 941397bf818..ec4e2890eaa 100644
--- a/CIAO/tests/Cookies/server.cpp
+++ b/CIAO/tests/Cookies/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Cookie.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/CIAO/tests/DAnCE/Components/ProcessColocation.idl b/CIAO/tests/DAnCE/Components/ProcessColocation.idl
index 3651c57debc..9d5312686b7 100644
--- a/CIAO/tests/DAnCE/Components/ProcessColocation.idl
+++ b/CIAO/tests/DAnCE/Components/ProcessColocation.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
module Simple
diff --git a/CIAO/tests/DAnCE/Components/ProcessColocation.mpc b/CIAO/tests/DAnCE/Components/ProcessColocation.mpc
index 2d8930bb5f1..9498fb0fa2c 100644
--- a/CIAO/tests/DAnCE/Components/ProcessColocation.mpc
+++ b/CIAO/tests/DAnCE/Components/ProcessColocation.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl ProcessColocation"
project(ProcessColocation_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/ProcessColocation_exec.cpp b/CIAO/tests/DAnCE/Components/ProcessColocation_exec.cpp
index 74d214d871a..fe5968bf771 100644
--- a/CIAO/tests/DAnCE/Components/ProcessColocation_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/ProcessColocation_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ProcessColocation_exec.h"
#include "ace/Log_Msg.h"
#include "ace/Singleton.h"
diff --git a/CIAO/tests/DAnCE/Components/Progressive.idl b/CIAO/tests/DAnCE/Components/Progressive.idl
index 0eb8f80bb39..9fa3b45150d 100644
--- a/CIAO/tests/DAnCE/Components/Progressive.idl
+++ b/CIAO/tests/DAnCE/Components/Progressive.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_USER_IDL
#define SIMPLE_USER_IDL
diff --git a/CIAO/tests/DAnCE/Components/Progressive.mpc b/CIAO/tests/DAnCE/Components/Progressive.mpc
index 83e1b59627a..8a0d3773f00 100644
--- a/CIAO/tests/DAnCE/Components/Progressive.mpc
+++ b/CIAO/tests/DAnCE/Components/Progressive.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleUser"
project(SimpleCommon_Progressive_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/Progressive_exec.cpp b/CIAO/tests/DAnCE/Components/Progressive_exec.cpp
index 01843b9ccdb..11df54b1101 100644
--- a/CIAO/tests/DAnCE/Components/Progressive_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/Progressive_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/Components/Progressive_exec.h b/CIAO/tests/DAnCE/Components/Progressive_exec.h
index 51d209d70ab..4ce8eb24809 100644
--- a/CIAO/tests/DAnCE/Components/Progressive_exec.h
+++ b/CIAO/tests/DAnCE/Components/Progressive_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/Components/SimpleAttribute.idl b/CIAO/tests/DAnCE/Components/SimpleAttribute.idl
index 4d58fb0ae9a..21f233d4093 100644
--- a/CIAO/tests/DAnCE/Components/SimpleAttribute.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleAttribute.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_ATTRIBUTE_IDL
#define SIMPLE_ATTRIBUTE_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc b/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc
index e11c70278f0..dd7bf4fbcec 100644
--- a/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl SimpleAttribute"
project(SimpleAttribute_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleAttribute_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleAttribute_exec.cpp
index c713e2b2660..95c7cc5a9a1 100644
--- a/CIAO/tests/DAnCE/Components/SimpleAttribute_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleAttribute_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleAttribute_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleAttribute_exec.h b/CIAO/tests/DAnCE/Components/SimpleAttribute_exec.h
index 72a7805247f..e50b9ff37ba 100644
--- a/CIAO/tests/DAnCE/Components/SimpleAttribute_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleAttribute_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLEATTRIBUTE_EXEC_H
#define CIAO_SIMPLEATTRIBUTE_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleCommon.idl b/CIAO/tests/DAnCE/Components/SimpleCommon.idl
index fd55ae4914a..2307775eec1 100644
--- a/CIAO/tests/DAnCE/Components/SimpleCommon.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleCommon.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_COMMON_IDL
#define SIMPLE_COMMON_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleCommon.mpc b/CIAO/tests/DAnCE/Components/SimpleCommon.mpc
index 43c23deb2d8..2cd94cf86c9 100644
--- a/CIAO/tests/DAnCE/Components/SimpleCommon.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleCommon.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl SimpleCommon"
project(SimpleCommon_idl_gen) : ciaoidldefaults, anytypecode {
diff --git a/CIAO/tests/DAnCE/Components/SimpleConsumer.idl b/CIAO/tests/DAnCE/Components/SimpleConsumer.idl
index 9218a20ee13..e648d5a2edf 100644
--- a/CIAO/tests/DAnCE/Components/SimpleConsumer.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleConsumer.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_CONSUMER_IDL
#define SIMPLE_CONSUMER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc b/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc
index e7b2c041de2..4552c9f5d09 100644
--- a/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleConsumer"
project(SimpleCommon_SimpleConsumer_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp
index c5b0c19d1e9..f1a700fa18d 100644
--- a/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleConsumer_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.h b/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.h
index 1b84393094e..1f70f317d82 100644
--- a/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLECONSUMER_EXEC_H
#define CIAO_SIMPLECONSUMER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleEmitter.idl b/CIAO/tests/DAnCE/Components/SimpleEmitter.idl
index b3675470bd0..182bb06c950 100644
--- a/CIAO/tests/DAnCE/Components/SimpleEmitter.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleEmitter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_EMITTER_IDL
#define SIMPLE_EMITTER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc b/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc
index 954d4a7792f..569c494115c 100644
--- a/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleEmitter"
project(SimpleCommon_SimpleEmitter_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleEmitter_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleEmitter_exec.cpp
index 17e46be0731..3ba9d3208ed 100644
--- a/CIAO/tests/DAnCE/Components/SimpleEmitter_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleEmitter_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleEmitter_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleEmitter_exec.h b/CIAO/tests/DAnCE/Components/SimpleEmitter_exec.h
index 0501bfb6977..404a9fe87dc 100644
--- a/CIAO/tests/DAnCE/Components/SimpleEmitter_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleEmitter_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLEEMITTER_EXEC_H
#define CIAO_SIMPLEEMITTER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleFailure.idl b/CIAO/tests/DAnCE/Components/SimpleFailure.idl
index ac588ab0db6..302979fb860 100644
--- a/CIAO/tests/DAnCE/Components/SimpleFailure.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleFailure.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_FAILURE_IDL
#define SIMPLE_FAILURE_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleFailure.mpc b/CIAO/tests/DAnCE/Components/SimpleFailure.mpc
index 3edf3b96a75..b098d4da697 100644
--- a/CIAO/tests/DAnCE/Components/SimpleFailure.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleFailure.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl SimpleFailure"
project(SimpleFailure_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleFailure_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleFailure_exec.cpp
index ac9626a387f..89346d52c6c 100644
--- a/CIAO/tests/DAnCE/Components/SimpleFailure_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleFailure_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleFailure_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleFailure_exec.h b/CIAO/tests/DAnCE/Components/SimpleFailure_exec.h
index 35d7f2211d5..ee74d471c7c 100644
--- a/CIAO/tests/DAnCE/Components/SimpleFailure_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleFailure_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLEFAILURE_EXEC_H
#define CIAO_SIMPLEFAILURE_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalProvider.idl b/CIAO/tests/DAnCE/Components/SimpleLocalProvider.idl
index 0b87e3a282e..1aa4ae8874b 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalProvider.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalProvider.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_PROVIDER_IDL
#define SIMPLE_PROVIDER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc b/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc
index cac2ef1fa87..cad4579d787 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleLocalProvider"
project(SimpleLocalProvider_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp
index 9983d25b593..35d4777dcca 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleLocalProvider_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h b/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h
index 1fb3a05f095..40bdb8ce201 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLEPROVIDER_EXEC_H
#define CIAO_SIMPLEPROVIDER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalUser.idl b/CIAO/tests/DAnCE/Components/SimpleLocalUser.idl
index 88e58be4d0d..188b1e863dc 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalUser.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalUser.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_USER_IDL
#define SIMPLE_USER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc b/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc
index 601df62a436..6843fd0f0b1 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleLocalUser"
project(SimpleCommon_SimpleLocalUser_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp
index 614a6c1f784..5eafbf91441 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleLocalUser_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.h b/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.h
index 3c564d711cd..8122bcc5b2e 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLEUSER_EXEC_H
#define CIAO_SIMPLEUSER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl
index 4d2c2292f42..3376fd48834 100644
--- a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_MULTIPLEUSER_IDL
#define SIMPLE_MULTIPLEUSER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc
index b534158c547..18dcb29a021 100644
--- a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleMultipleUser"
project(SimpleCom_SimpleMulUser_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp
index ede38ef5a5b..900ac962694 100644
--- a/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleMultipleUser_exec.h"
#include "ace/Log_Msg.h"
#include "ciao/Logger/Log_Macros.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.h b/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.h
index 3b61eba9571..c24d1c9e2b8 100644
--- a/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLEMULTIPLEUSER_EXEC_H
#define CIAO_SIMPLEMULTIPLEUSER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.idl b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.idl
index 11f93f62568..21ed231ffe7 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_PROVIDER_IDL
#define SIMPLE_PROVIDER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc
index 965eb2650ec..9b3f7ec4670 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleNilFacetProvider"
project(SimpleCommon_SNFP_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.cpp
index ac381fb2904..8dc79755951 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleNilFacetProvider_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.h b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.h
index 3050f07f278..dc90f4ff1e9 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLENILFACETPROVIDER_EXEC_H
#define CIAO_SIMPLENILFACETPROVIDER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.idl b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.idl
index b686aab5d25..4fc792b0805 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_USER_IDL
#define SIMPLE_USER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc
index 78805726832..1bd93043436 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleNilFacetUser"
project(SimpleCommon_SNFU_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.cpp
index 819f77a8166..a6c01bfc3fe 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "SimpleNilFacetUser_exec.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.h b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.h
index 897acf3ba99..7cae2a0af31 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLENILFACETUSER_EXEC_H
#define CIAO_SIMPLENILFACETUSER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleNull.idl b/CIAO/tests/DAnCE/Components/SimpleNull.idl
index 83782761858..3054c8747e5 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNull.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleNull.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
module Simple
diff --git a/CIAO/tests/DAnCE/Components/SimpleNull.mpc b/CIAO/tests/DAnCE/Components/SimpleNull.mpc
index 01c1cba289f..ff3a7e2e9c3 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNull.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleNull.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl SimpleNull"
project(SimpleNull_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleNull_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleNull_exec.cpp
index 25166aca4e9..f12fc8e028e 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNull_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleNull_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleNull_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleNull_exec.h b/CIAO/tests/DAnCE/Components/SimpleNull_exec.h
index 5f0cce9bfbb..8c79b59538b 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNull_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleNull_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLENULL_EXEC_H
#define CIAO_SIMPLENULL_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleProvider.idl b/CIAO/tests/DAnCE/Components/SimpleProvider.idl
index 01a8f783a30..0e5ca0c1252 100644
--- a/CIAO/tests/DAnCE/Components/SimpleProvider.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleProvider.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_PROVIDER_IDL
#define SIMPLE_PROVIDER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleProvider.mpc b/CIAO/tests/DAnCE/Components/SimpleProvider.mpc
index eb743ecc70c..16e7cc0f98c 100644
--- a/CIAO/tests/DAnCE/Components/SimpleProvider.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleProvider.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleProvider"
project(SimpleCommon_SimpleProvider_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp
index 3be2d15c266..9ce209a0347 100644
--- a/CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleProvider_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleProvider_exec.h b/CIAO/tests/DAnCE/Components/SimpleProvider_exec.h
index 61290752ebd..54e1cfa483f 100644
--- a/CIAO/tests/DAnCE/Components/SimpleProvider_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleProvider_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLEPROVIDER_EXEC_H
#define CIAO_SIMPLEPROVIDER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimplePublisher.idl b/CIAO/tests/DAnCE/Components/SimplePublisher.idl
index 27afdd0fc70..5976868e5e7 100644
--- a/CIAO/tests/DAnCE/Components/SimplePublisher.idl
+++ b/CIAO/tests/DAnCE/Components/SimplePublisher.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_PUBLISHER_IDL
#define SIMPLE_PUBLISHER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimplePublisher.mpc b/CIAO/tests/DAnCE/Components/SimplePublisher.mpc
index 3091fc8aca1..9256611289c 100644
--- a/CIAO/tests/DAnCE/Components/SimplePublisher.mpc
+++ b/CIAO/tests/DAnCE/Components/SimplePublisher.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimplePublisher"
project(SimpleCommon_SimplePublisher_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimplePublisher_exec.cpp b/CIAO/tests/DAnCE/Components/SimplePublisher_exec.cpp
index 3876af8956d..d7bc498fa79 100644
--- a/CIAO/tests/DAnCE/Components/SimplePublisher_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimplePublisher_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimplePublisher_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimplePublisher_exec.h b/CIAO/tests/DAnCE/Components/SimplePublisher_exec.h
index 0f5ab965757..d394391ca4d 100644
--- a/CIAO/tests/DAnCE/Components/SimplePublisher_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimplePublisher_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLEPUBLISHER_EXEC_H
#define CIAO_SIMPLEPUBLISHER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Components/SimpleUser.idl b/CIAO/tests/DAnCE/Components/SimpleUser.idl
index cb158408608..8b7f9cab111 100644
--- a/CIAO/tests/DAnCE/Components/SimpleUser.idl
+++ b/CIAO/tests/DAnCE/Components/SimpleUser.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_USER_IDL
#define SIMPLE_USER_IDL
diff --git a/CIAO/tests/DAnCE/Components/SimpleUser.mpc b/CIAO/tests/DAnCE/Components/SimpleUser.mpc
index e892e1f5399..0b10feae4bb 100644
--- a/CIAO/tests/DAnCE/Components/SimpleUser.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleUser.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleUser"
project(SimpleCommon_SimpleUser_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp
index 9b187f68a58..5e11118014e 100644
--- a/CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SimpleUser_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/DAnCE/Components/SimpleUser_exec.h b/CIAO/tests/DAnCE/Components/SimpleUser_exec.h
index 7041ae92ba4..88fe1df3066 100644
--- a/CIAO/tests/DAnCE/Components/SimpleUser_exec.h
+++ b/CIAO/tests/DAnCE/Components/SimpleUser_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CIAO_SIMPLEUSER_EXEC_H
#define CIAO_SIMPLEUSER_EXEC_H
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp
index 556520b961b..c7111041130 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Exec_Dest_Status.h"
#include "dance/Deployment/Deployment_DeploymentPlanC.h"
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h
index a733cda9d89..aa1eadfda9d 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Exec_Dest_Status.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h
index 6d4775199c9..5878193bcef 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef EXEC_DEST_STATUS_EXPORT_H
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_export.h b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_export.h
index 0b7c42df6f6..d67a2f48755 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_export.h
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// ------------------------------
#ifndef EXECUTOR_DESTRUCTOR_INTERCEPTOR_EXPORT_H
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl
index 4dbffd6787c..5520b2f3337 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
module dance_test
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc
index 78e9d7bfae9..8c30b734509 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Executor_Destructor"
project(Executor_Destructor_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp
index 56ef42b8273..32f09b40a17 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Executor_Destructor_Interceptor.h"
#include "Exec_Dest_Status.h"
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h
index b3cf24724e1..ea3983ba4af 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* @file Executor_Destructor_Interceptor.h
*
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp
index a78f3f367d9..a6b80742d66 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h
index bbbb14f3810..4d1017fce65 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.idl b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.idl
index e23ed62cb78..5c38052f71e 100644
--- a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.idl
+++ b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
interface Remote_Interface
diff --git a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc
index de946e27569..a0940efb9d7 100644
--- a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc
+++ b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Launch_Failure"
project(Launch_Failure_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp
index ea7d9cd93dc..d574cf19931 100644
--- a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp
+++ b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.h b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.h
index 4e8dd5a610e..47a21006787 100644
--- a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.h
+++ b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Interceptors.mpc b/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Interceptors.mpc
index f5017e9b659..83c169adf2e 100644
--- a/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Interceptors.mpc
+++ b/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Interceptors.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (Launch_Failure_Interceptors) : dance_skel, dance_lib, dance_logger {
dynamicflags += SELECTIVE_ERROR_BUILD_DLL
libout = ../lib
diff --git a/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.cpp b/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.cpp
index ec8724970c6..cc4e7945abe 100644
--- a/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.cpp
+++ b/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Selective_Error.h"
#include "dance/Deployment/Deployment_StartErrorC.h"
#include "dance/DAnCE_PropertiesC.h"
diff --git a/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.h b/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.h
index 036325f4463..8558ca08301 100644
--- a/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.h
+++ b/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.h
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Selective_Error.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error_Export.h b/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error_Export.h
index fe3c2762cce..602b5c1f50f 100644
--- a/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error_Export.h
+++ b/CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl Selective_Error
// ------------------------------
diff --git a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.idl b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.idl
index 27d2d122435..afece188ca7 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.idl
+++ b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc
index 1ee324339c8..5b967dfbefc 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc
+++ b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CPUAffinity_idl_gen) : componentidldefaults {
after +=
custom_only = 1
diff --git a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp
index e93ba64080f..f6ef69a57f8 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp
+++ b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CPUAffinity_exec.h"
#include "ace/Log_Msg.h"
#include "ace/os_include/os_sched.h"
diff --git a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h
index d98965b903c..7b5d6ffab62 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h
+++ b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef COMPONENTLINPASSAGE_EXEC_H_
#define COMPONENTLINPASSAGE_EXEC_H_
diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.idl b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.idl
index 5a9d8853795..3ef9d119209 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.idl
+++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc
index 3e308ac4543..9e3d9c1b0b4 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc
+++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(CommandlinePassage_idl_gen) : componentidldefaults {
after +=
custom_only = 1
diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp
index 75a97ef64d7..807a84d85ec 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp
+++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CommandlinePassage_exec.h"
#include "ace/Log_Msg.h"
#include "tao/ORB_Core.h"
diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h
index b4052950655..55510c1c671 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h
+++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef COMPONENTLINPASSAGE_EXEC_H_
#define COMPONENTLINPASSAGE_EXEC_H_
diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.idl b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.idl
index 60bc4ae0587..8b9cbacbbad 100644
--- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.idl
+++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc
index 8dec8229046..f27b411c01d 100644
--- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc
+++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(UnexpectedShutdown_idl_gen) : componentidldefaults {
after +=
custom_only = 1
diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp
index 36aa0f200cf..c70a36c9399 100644
--- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp
+++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h
index 583942ce07f..31e8989b972 100644
--- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h
+++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl
index 66b1686c074..84fe594ebbe 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl
+++ b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file PartialShutdown.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc
index 0ee47989de2..db05869ff35 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc
+++ b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n PartialShutdown"
project(PartialShutdown_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl
index 0c8f995aaa7..dac92173714 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Component1.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc
index 36e1d9eaa4d..3fb281a4d5c 100755
--- a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p PartialShutdown Component1"
project(PartialShutdown_Component1_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp
index 5568f388956..b7ac7384574 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h
index ef767ed653b..bb0d5b69480 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl
index 1dab9675e35..29030c9409c 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Component2.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc
index eca2a9e0ea5..9bacf08a0c9 100755
--- a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p PartialShutdown Component2"
project(PartialShutdown_Component2_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp
index 96d644bff34..36a507e2557 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h
index 1fb44c5ecac..05359f13a88 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl
index 82ac9ca3bb8..8e3ea242b53 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Component3.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc
index a7b39c70250..3876ac8034b 100755
--- a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p PartialShutdown Component3"
project(PartialShutdown_Component3_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp
index cbfd5f8ce97..3bed1efe123 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h
index 97c4fc5247e..57b4ec5d706 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/StoreReferences/StoreReferences.mpc b/CIAO/tests/DAnCE/StoreReferences/StoreReferences.mpc
index b0c85238714..dde3c266d5e 100644
--- a/CIAO/tests/DAnCE/StoreReferences/StoreReferences.mpc
+++ b/CIAO/tests/DAnCE/StoreReferences/StoreReferences.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(StoreReferences_idl_gen) : componentidldefaults {
after +=
custom_only = 1
diff --git a/CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.cpp b/CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.cpp
index e816ddadd2b..8b08dea108e 100644
--- a/CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.cpp
+++ b/CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StoreReferences_exec.h"
#include "ace/Log_Msg.h"
#include "tao/ORB_Core.h"
diff --git a/CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.h b/CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.h
index 2b70dd8ca5e..f2ce7917895 100644
--- a/CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.h
+++ b/CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef STOREREFERENCES_EXEC_H_
#define STOREREFERENCES_EXEC_H_
diff --git a/CIAO/tests/DAnCE/StoreReferences/client.cpp b/CIAO/tests/DAnCE/StoreReferences/client.cpp
index 595764db466..951e3777b55 100644
--- a/CIAO/tests/DAnCE/StoreReferences/client.cpp
+++ b/CIAO/tests/DAnCE/StoreReferences/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
int ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/CIAO/tests/DAnCE/Threading/Base/Threading.idl b/CIAO/tests/DAnCE/Threading/Base/Threading.idl
index 5f215090a7c..b14a16183ef 100644
--- a/CIAO/tests/DAnCE/Threading/Base/Threading.idl
+++ b/CIAO/tests/DAnCE/Threading/Base/Threading.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Threading.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/Threading/Base/Threading.mpc b/CIAO/tests/DAnCE/Threading/Base/Threading.mpc
index 43ac64b328c..3a5573579dc 100644
--- a/CIAO/tests/DAnCE/Threading/Base/Threading.mpc
+++ b/CIAO/tests/DAnCE/Threading/Base/Threading.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Threading"
project(Threading_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Threading/Component1/Component1.idl b/CIAO/tests/DAnCE/Threading/Component1/Component1.idl
index fe88ebdea07..002ca8e7b54 100644
--- a/CIAO/tests/DAnCE/Threading/Component1/Component1.idl
+++ b/CIAO/tests/DAnCE/Threading/Component1/Component1.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Component1.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc b/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc
index 42b32014eb0..f129b517aa8 100755
--- a/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc
+++ b/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Threading Component1"
project(Threading_Component1_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Threading/Component1/Component1_exec.cpp b/CIAO/tests/DAnCE/Threading/Component1/Component1_exec.cpp
index 7b5a9ee2adf..fa10b70f7ba 100644
--- a/CIAO/tests/DAnCE/Threading/Component1/Component1_exec.cpp
+++ b/CIAO/tests/DAnCE/Threading/Component1/Component1_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/Threading/Component1/Component1_exec.h b/CIAO/tests/DAnCE/Threading/Component1/Component1_exec.h
index 0ab7b9d45c8..fe5e3325fdd 100644
--- a/CIAO/tests/DAnCE/Threading/Component1/Component1_exec.h
+++ b/CIAO/tests/DAnCE/Threading/Component1/Component1_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/Threading/Component2/Component2.idl b/CIAO/tests/DAnCE/Threading/Component2/Component2.idl
index ff513687331..ac3a324da85 100644
--- a/CIAO/tests/DAnCE/Threading/Component2/Component2.idl
+++ b/CIAO/tests/DAnCE/Threading/Component2/Component2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Component2.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc b/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc
index 6e5cbe9f92a..77c8c13c8a9 100755
--- a/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc
+++ b/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Threading Component2"
project(Threading_Component2_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/DAnCE/Threading/Component2/Component2_exec.cpp b/CIAO/tests/DAnCE/Threading/Component2/Component2_exec.cpp
index e7c12b2cc0d..dcc7cf39f19 100644
--- a/CIAO/tests/DAnCE/Threading/Component2/Component2_exec.cpp
+++ b/CIAO/tests/DAnCE/Threading/Component2/Component2_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/DAnCE/Threading/Component2/Component2_exec.h b/CIAO/tests/DAnCE/Threading/Component2/Component2_exec.h
index 92c205d91c0..6b05eea028a 100644
--- a/CIAO/tests/DAnCE/Threading/Component2/Component2_exec.h
+++ b/CIAO/tests/DAnCE/Threading/Component2/Component2_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.1
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl
index e65b1ea7794..3a5491609a9 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Attributes.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
index 325f6450dcb..959aaee76b6 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Attributes"
project(Attributes_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl
index 0d6f578cef0..550ab671dcb 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file EventSink.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
index c253138b5f1..2944db20ccf 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n EventSink"
project(EventSink_stub): ccm_stub, avoids_ccm_noevent {
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl
index 761c5c3a5b0..f1fe88fee9c 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file EventSource.idl
* @author Will Otte <wotte@dre.vanderblit.edu>
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
index 5eaa93ee648..eabfb4d4daf 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n EventSource"
project(EventSource_stub): ccm_stub, avoids_ccm_noevent {
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl
index f2c5a1417b5..cb382d00bb7 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Facets.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
index 410b318c046..f2ee4e1fbc4 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Facets"
project(Facets_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl
index 2e0db26d6a4..61552f131b8 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Receptacles.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
index 3a3b0c4b051..a396b597318 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Receptacles"
project(Receptacles_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl
index 8b020a77e54..7ea04a7e982 100644
--- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl
+++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file SimpleComponent.idl
*
diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
index 612a082cb68..e092ed7abe5 100644
--- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
+++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl SimpleComponent"
project(SimpleComponent_stub_idl3): ccm_stub {
diff --git a/CIAO/tests/IDL3/Connectors/incorrect_consumes.idl b/CIAO/tests/IDL3/Connectors/incorrect_consumes.idl
index 16771d306a4..6d10649266b 100644
--- a/CIAO/tests/IDL3/Connectors/incorrect_consumes.idl
+++ b/CIAO/tests/IDL3/Connectors/incorrect_consumes.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
eventtype foo_event
diff --git a/CIAO/tests/IDL3/Connectors/incorrect_emits.idl b/CIAO/tests/IDL3/Connectors/incorrect_emits.idl
index 19ea0403091..826a1e8741e 100644
--- a/CIAO/tests/IDL3/Connectors/incorrect_emits.idl
+++ b/CIAO/tests/IDL3/Connectors/incorrect_emits.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
eventtype foo_event
diff --git a/CIAO/tests/IDL3/Connectors/incorrect_publishes.idl b/CIAO/tests/IDL3/Connectors/incorrect_publishes.idl
index c89eec32706..685189c6681 100644
--- a/CIAO/tests/IDL3/Connectors/incorrect_publishes.idl
+++ b/CIAO/tests/IDL3/Connectors/incorrect_publishes.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
eventtype foo_event
diff --git a/CIAO/tests/IDL3/Events/Abstract/Abstract.idl b/CIAO/tests/IDL3/Events/Abstract/Abstract.idl
index 8608f2c4039..bb527a5fbcd 100644
--- a/CIAO/tests/IDL3/Events/Abstract/Abstract.idl
+++ b/CIAO/tests/IDL3/Events/Abstract/Abstract.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Abstract.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc b/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
index 72d866b72e8..286a70074de 100644
--- a/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
+++ b/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Abstract"
project(Abstract_stub): ccm_stub, avoids_ccm_noevent {
diff --git a/CIAO/tests/IDL3/Events/Any/Any.mpc b/CIAO/tests/IDL3/Events/Any/Any.mpc
index 09e069668eb..da5e1d51570 100644
--- a/CIAO/tests/IDL3/Events/Any/Any.mpc
+++ b/CIAO/tests/IDL3/Events/Any/Any.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(EventAny_local): ccm_stub, avoids_ccm_noevent {
exename = EventAny
idlflags += -SS
diff --git a/CIAO/tests/IDL3/Events/Any/EventAny.idl b/CIAO/tests/IDL3/Events/Any/EventAny.idl
index d53ddf55c08..402f468a9b1 100644
--- a/CIAO/tests/IDL3/Events/Any/EventAny.idl
+++ b/CIAO/tests/IDL3/Events/Any/EventAny.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file EventAny.idl
* @author Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Events/Any/main.cpp b/CIAO/tests/IDL3/Events/Any/main.cpp
index 4ce90923aa1..a4db947428c 100644
--- a/CIAO/tests/IDL3/Events/Any/main.cpp
+++ b/CIAO/tests/IDL3/Events/Any/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EventAnyC.h"
#include "tao/AnyTypeCode/Any.h"
#include "ace/Get_Opt.h"
diff --git a/CIAO/tests/IDL3/Events/Regular/Regular.idl b/CIAO/tests/IDL3/Events/Regular/Regular.idl
index c244ea4af3e..d995e6b1c48 100644
--- a/CIAO/tests/IDL3/Events/Regular/Regular.idl
+++ b/CIAO/tests/IDL3/Events/Regular/Regular.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Regular.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/CIAO/tests/IDL3/Events/Regular/Regular.mpc
index cc84d858f37..a7dbc5d4771 100644
--- a/CIAO/tests/IDL3/Events/Regular/Regular.mpc
+++ b/CIAO/tests/IDL3/Events/Regular/Regular.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Regular"
project(Regular_stub): ccm_stub, avoids_ccm_noevent {
diff --git a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl
index 245a0eb449c..9801c5fd5bd 100644
--- a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl
+++ b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file HomeAttributes.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
index 60741c2c380..3879edfd61a 100644
--- a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
+++ b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n HomeAttributes"
project(HomeAttributes_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/Homes/Basic/Basic.idl b/CIAO/tests/IDL3/Homes/Basic/Basic.idl
index 63cef517331..ef3eae0def5 100644
--- a/CIAO/tests/IDL3/Homes/Basic/Basic.idl
+++ b/CIAO/tests/IDL3/Homes/Basic/Basic.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Basic.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Homes/Basic/Basic.mpc b/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
index cd14af3d279..eb6ad3e7b08 100644
--- a/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
+++ b/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Basic"
project(IDL3_Basic_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/Homes/Factory/Factory.idl b/CIAO/tests/IDL3/Homes/Factory/Factory.idl
index 88e5c72b7b2..bf6bd323235 100644
--- a/CIAO/tests/IDL3/Homes/Factory/Factory.idl
+++ b/CIAO/tests/IDL3/Homes/Factory/Factory.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Factory.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Homes/Factory/Factory.mpc b/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
index 2820fe37ddf..d718625f057 100644
--- a/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
+++ b/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Factory"
project(Factory_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/Homes/Finder/Finder.idl b/CIAO/tests/IDL3/Homes/Finder/Finder.idl
index ce5abc74804..ea12d69b2f2 100644
--- a/CIAO/tests/IDL3/Homes/Finder/Finder.idl
+++ b/CIAO/tests/IDL3/Homes/Finder/Finder.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Finder.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Homes/Finder/Finder.mpc b/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
index 4a8eb77f649..1dbe3987f0c 100644
--- a/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
+++ b/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Finder"
project(Finder_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl
index dca1c828c20..db98ed66ac4 100644
--- a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl
+++ b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Inheritance.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
index 6c9e25e60b4..31d3c25ef62 100644
--- a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
+++ b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Inheritance"
project(Inheritance_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc b/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
index c6e3a2bc144..a7c92f807c0 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
+++ b/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(ConvertIDL3) : taoidl3toidl2defaults, ciao_executor, avoids_ccm_noevent {
avoids += mfc
idlflags += -Sm
diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl b/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl
index a5caf420f4d..9efbb2520a4 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file convert.idl
* @author Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/include.idl b/CIAO/tests/IDL3/ImpliedIDL/All/include.idl
index aa3758723b1..4d8409385b9 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/All/include.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/All/include.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file include.idl
* @author Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl b/CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl
index acbcb32f9ef..3436d258f47 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file keyword_clash.idl
* @author Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl b/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl
index 97d05edffe8..68b4a33a53b 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file pass_through.idl
* @author Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl b/CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl
index 5c79d382e95..76c6c7899d4 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file raw_include.idl
* @author Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.idl b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.idl
index a5d5897f8cc..24cc7addae6 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file ICBasic.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
index 51d0706053b..119b266238c 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n ICBasic"
project(ICBasic_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl
index 4e2c99b2a40..264d91af28d 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file ICEventSink.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
index ced254fe995..077b9740d9e 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n ICEventSink"
project(ICEventSink_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl
index 25abe6983ff..4a232ff873b 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file ICEventSource.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
index 31d72262e6d..cb07fd6c295 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n ICEventSource"
project(ICEventSource_stub): ccm_stub, avoids_ccm_noevent {
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl
index 56681c3a5cb..129fdd506a6 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file ICReceptacles.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
index 09f4eb08f58..a4751a6c787 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n ICReceptacles"
project(ICReceptacles_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl b/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl
index c7940d821e8..ae349b16ad9 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Events.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc b/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
index fab0b8c9766..57672e5374b 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
+++ b/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Events"
project(Events_stub): ccm_stub, avoids_ccm_noevent {
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl
index 8c781e8fea4..296cf81b310 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Homes.idl
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
index 6a39c9006f6..05207ecc7b9 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
+++ b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Homes"
project(Homes_stub): ccm_stub {
diff --git a/CIAO/tests/IDL3/Lookup/lookup_test.idl b/CIAO/tests/IDL3/Lookup/lookup_test.idl
index 4850ab2e743..31801322540 100644
--- a/CIAO/tests/IDL3/Lookup/lookup_test.idl
+++ b/CIAO/tests/IDL3/Lookup/lookup_test.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file lookup_test.idl
* @authors Boris Kolpackov <boris@dre.vanderbilt.edu>
diff --git a/CIAO/tests/IDL3/Lookup/lookup_test.mpc b/CIAO/tests/IDL3/Lookup/lookup_test.mpc
index d5e65c7191e..ddb787e8507 100644
--- a/CIAO/tests/IDL3/Lookup/lookup_test.mpc
+++ b/CIAO/tests/IDL3/Lookup/lookup_test.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(LookupTest_stub): ccm_stub {
sharedname = LookupTest_stub
diff --git a/CIAO/tests/IDL3_to_XMI/Bug_3607_Regression/test.idl b/CIAO/tests/IDL3_to_XMI/Bug_3607_Regression/test.idl
index 265969ac96a..2b5253e84a7 100644
--- a/CIAO/tests/IDL3_to_XMI/Bug_3607_Regression/test.idl
+++ b/CIAO/tests/IDL3_to_XMI/Bug_3607_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/CIAO/tests/IDL3_to_XMI/Forward_Declared/Forward_Declared.mpc b/CIAO/tests/IDL3_to_XMI/Forward_Declared/Forward_Declared.mpc
index 779fe1c888f..0d1ac99fddd 100644
--- a/CIAO/tests/IDL3_to_XMI/Forward_Declared/Forward_Declared.mpc
+++ b/CIAO/tests/IDL3_to_XMI/Forward_Declared/Forward_Declared.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (*IDL): taoidl3toxmidefaults {
IDL3TOXMI_Files {
c_ok.idl
diff --git a/CIAO/tests/IDL3_to_XMI/Forward_Declared/a.idl b/CIAO/tests/IDL3_to_XMI/Forward_Declared/a.idl
index 501d649da7f..dac68967d98 100644
--- a/CIAO/tests/IDL3_to_XMI/Forward_Declared/a.idl
+++ b/CIAO/tests/IDL3_to_XMI/Forward_Declared/a.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef A_IDL
#define A_IDL
diff --git a/CIAO/tests/IDL3_to_XMI/Forward_Declared/b.idl b/CIAO/tests/IDL3_to_XMI/Forward_Declared/b.idl
index 80e133d29c3..2e0571d89b9 100644
--- a/CIAO/tests/IDL3_to_XMI/Forward_Declared/b.idl
+++ b/CIAO/tests/IDL3_to_XMI/Forward_Declared/b.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef B_IDL
#define B_IDL
diff --git a/CIAO/tests/IDL3_to_XMI/Forward_Declared/c_nok.idl b/CIAO/tests/IDL3_to_XMI/Forward_Declared/c_nok.idl
index effea6d6bec..d7449f9dbe8 100644
--- a/CIAO/tests/IDL3_to_XMI/Forward_Declared/c_nok.idl
+++ b/CIAO/tests/IDL3_to_XMI/Forward_Declared/c_nok.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef C_IDL
#define C_IDL
diff --git a/CIAO/tests/IDL3_to_XMI/Forward_Declared/c_ok.idl b/CIAO/tests/IDL3_to_XMI/Forward_Declared/c_ok.idl
index ee9611515e9..826e2a82b0b 100644
--- a/CIAO/tests/IDL3_to_XMI/Forward_Declared/c_ok.idl
+++ b/CIAO/tests/IDL3_to_XMI/Forward_Declared/c_ok.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef C_IDL
#define C_IDL
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc
index 2dc5288f70e..b372330f8d1 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL2XMI_Test) : taoexe, ace_xml_utils {
exename = xmlvalidator
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp
index f01765b8b4a..000b63867ca 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "XML_Helper.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h
index ab8de5f4a96..cb0f9cca5bc 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h
@@ -1,4 +1,3 @@
-// $Id$
//============================================================
/**
* @file XML_Helper.h
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp
index be73e801d0a..1a57ff4255f 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/CIAO/tests/IDL3_to_XMI/XMI_For_Array/test.idl b/CIAO/tests/IDL3_to_XMI/XMI_For_Array/test.idl
index a941887b452..d8b2abdb42a 100644
--- a/CIAO/tests/IDL3_to_XMI/XMI_For_Array/test.idl
+++ b/CIAO/tests/IDL3_to_XMI/XMI_For_Array/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IDL
#define TEST_IDL
diff --git a/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File1.idl b/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File1.idl
index 4c3659f4f48..a2babf15ba4 100644
--- a/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File1.idl
+++ b/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File1.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef File_1_
#define File_1_
diff --git a/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File2.idl b/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File2.idl
index f8c3106e352..6d3799f0a6f 100644
--- a/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File2.idl
+++ b/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FILE_2_
#define FILE_2_
diff --git a/CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/test.idl b/CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/test.idl
index 9ec8562abb9..3e7e89997cb 100644
--- a/CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/test.idl
+++ b/CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IDL
#define TEST_IDL
diff --git a/CIAO/tests/IDL3_to_XMI/XMI_For_Native/test.idl b/CIAO/tests/IDL3_to_XMI/XMI_For_Native/test.idl
index f3d97257e7e..c319b913ef1 100644
--- a/CIAO/tests/IDL3_to_XMI/XMI_For_Native/test.idl
+++ b/CIAO/tests/IDL3_to_XMI/XMI_For_Native/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IDL
#define TEST_IDL
diff --git a/CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/test.idl b/CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/test.idl
index 36797a5e1b9..5816035345d 100644
--- a/CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/test.idl
+++ b/CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IDL
#define TEST_IDL
diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl
index c5f2bd86250..b5507a7ebb7 100644
--- a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl
+++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Cornucopia.idl
* @author Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc
index 03068d46826..eac393be799 100644
--- a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc
+++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Cornucopia_idl_gen) : componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=CORNUCOPIA_STUB_Export \
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp
index 262972e6263..44091448f02 100644
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ComponentC_exec.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h
index b819f018224..822d514cc39 100644
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef INHERITED_COMPONENTS_EXEC_H_
#define INHERITED_COMPONENTS_EXEC_H_
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl
index ee2b160f02c..4e11ca6513a 100644
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Inherited_components.idl
* @author Marcel Smit (msmit@remedy.nl)
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
index 5aeb294873b..85b249573d0 100644
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Inherited_Components_idl_gen) : componentidldefaults {
after +=
custom_only = 1
diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl
index 48821950eb1..88f501e9c7a 100644
--- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl
+++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file KitchenSink.idl
* @author Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
index d9a3f079839..76897c8e5b9 100644
--- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
+++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(KitchenSink_idl_gen) : componentidldefaults {
custom_only = 1
idlflags += -Gex \
diff --git a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl
index 903354317f3..dcd673d659f 100644
--- a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl
+++ b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IC_Foo.idl"
#pragma ciao lem "IC_BarE.idl"
diff --git a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc
index 0a0838b0b15..dc27a68059d 100644
--- a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc
+++ b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl IC_Bar"
project(IC_Bar_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Included_Component/IC_Foo.idl b/CIAO/tests/IDL_Test/Included_Component/IC_Foo.idl
index 989482da693..1beb70eda7b 100644
--- a/CIAO/tests/IDL_Test/Included_Component/IC_Foo.idl
+++ b/CIAO/tests/IDL_Test/Included_Component/IC_Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef IC_Foo_IDL
#define IC_Foo_IDL
diff --git a/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc b/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc
index 1d158ef9d8e..ed776cfc794 100644
--- a/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc
+++ b/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl IC_Foo"
project(IC_Foo_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl
index e66f89b6829..e464b4f869c 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl
+++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BASE_IDL
#define BASE_IDL
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc
index f34b1120cad..a8b50be9431 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Base"
project(Base_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl
index 0557867f7cb..5fbac471ae5 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl
+++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DERIVED_IDL
#define DERIVED_IDL
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc
index c291f0dbd9c..914b254bdde 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p IhC_Foo Derived"
project(Base_Derived_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl
index b569cb0bfe8..1c575f96c79 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl
+++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef IHC_BAR_IDL
#define IHC_BAR_IDL
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc
index a47f9b75728..de80dc7e399 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p IhC_Foo IhC_Bar"
project(IhC_Foo_IhC_Bar_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.idl b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.idl
index 8d4a46abe0d..7e67ef8545c 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.idl
+++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef IHC_FOO_IDL
#define IHC_FOO_IDL
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc
index c4ee937fc5a..be2d80c46e6 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl IhC_Foo"
project(IhC_Foo_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl b/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl
index 6e570086ee9..f08624b79af 100644
--- a/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BASE_IDL
#define BASE_IDL
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc b/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc
index c67cafa359b..e8e4430e7e5 100644
--- a/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Base"
project(IS_Base_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl
index 831af3282ff..1b2e380e025 100644
--- a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DERIVED_IDL
#define DERIVED_IDL
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc
index dc83639de9d..636ba843b24 100644
--- a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p IhC_Foo Derived"
project(IS_Base_Derived_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl b/CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl
index 4bd44e7ea28..41dc43c5938 100644
--- a/CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl
+++ b/CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file Keyword_Clash.idl
* @author Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/CIAO/tests/IDL_Test/Keywords/Keywords.mpc b/CIAO/tests/IDL_Test/Keywords/Keywords.mpc
index 1bb1e90bbfa..697c4c3c912 100644
--- a/CIAO/tests/IDL_Test/Keywords/Keywords.mpc
+++ b/CIAO/tests/IDL_Test/Keywords/Keywords.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Keyword_Clash_idl_gen) : componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=KEYWORD_CLASH_STUB_Export \
diff --git a/CIAO/tests/IDL_Test/Lem_Pragma/A.idl b/CIAO/tests/IDL_Test/Lem_Pragma/A.idl
index bf1b98b1c59..c649c4bcfb3 100644
--- a/CIAO/tests/IDL_Test/Lem_Pragma/A.idl
+++ b/CIAO/tests/IDL_Test/Lem_Pragma/A.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef A_IDL
#define A_IDL
diff --git a/CIAO/tests/IDL_Test/Lem_Pragma/B.idl b/CIAO/tests/IDL_Test/Lem_Pragma/B.idl
index e695263eb20..657bb096e4c 100644
--- a/CIAO/tests/IDL_Test/Lem_Pragma/B.idl
+++ b/CIAO/tests/IDL_Test/Lem_Pragma/B.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef B_IDL
#define B_IDL
diff --git a/CIAO/tests/IDL_Test/Lem_Pragma/C.idl b/CIAO/tests/IDL_Test/Lem_Pragma/C.idl
index d1817b0b0d4..ad8c0c1ce5a 100644
--- a/CIAO/tests/IDL_Test/Lem_Pragma/C.idl
+++ b/CIAO/tests/IDL_Test/Lem_Pragma/C.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef C_IDL
#define C_IDL
diff --git a/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc b/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc
index d184065407d..8bd47b32c77 100644
--- a/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc
+++ b/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Lem_Pragma_idl_gen) : componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=KEYWORD_CLASH_STUB_Export \
diff --git a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.idl b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.idl
index 28248068aff..69ee642ada6 100644
--- a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.idl
+++ b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.idl
@@ -1,6 +1,4 @@
-// $Id$
-
#include <Components.idl>
component Foo
diff --git a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc
index e25fb3e31a3..caa25c7ddfd 100644
--- a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc
+++ b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Lem_Export"
project(Lem_Export_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Base.idl b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Base.idl
index d1bdf03a155..a4df5217a46 100644
--- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Base.idl
+++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Base.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file NonTopic_Base.idl
* @author
diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.idl b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.idl
index 06a0b4e6a69..0d43bdb0f66 100644
--- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.idl
+++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file NonTopic_Connector.idl
* @author
diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc
index bc129212402..b557c3198bb 100644
--- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc
+++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(NT_Base_idl_gen) : componentidldefaults, anytypecode {
custom_only = 1
idlflags += -Wb,stub_export_macro=NONTOPIC_BASE_STUB_Export \
diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp
index 633a64d985c..c6f80f718a3 100644
--- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp
+++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// connector template for Typed_NonTopic_Test_1
template <typename CCM_TYPE,
typename T, bool FIXED_T,
diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h
index fc81831e0b4..4710a55cd1a 100644
--- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h
+++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NT_CONNECTOR_T
#define NT_CONNECTOR_T
diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/nontopic_test.idl b/CIAO/tests/IDL_Test/NonTopic_Connector/nontopic_test.idl
index f536049caf4..04b87042e1f 100644
--- a/CIAO/tests/IDL_Test/NonTopic_Connector/nontopic_test.idl
+++ b/CIAO/tests/IDL_Test/NonTopic_Connector/nontopic_test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file
* @author
diff --git a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.idl b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.idl
index b56142dbf2d..8a9986a7ba2 100644
--- a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.idl
+++ b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <Components.idl>
#include "tao/StringSeq.pidl"
diff --git a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc
index 6e2189c4215..53f345a769a 100644
--- a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc
+++ b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl PIDLInclude"
project(PIDLInclude_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl
index 2bb86a28626..79525f433a0 100644
--- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl
+++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl
@@ -1,4 +1,3 @@
-// $Id$
//=============================================================================
/**
* @file Basic.idl
diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc
index 018f10f429d..c3c865349cc 100644
--- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc
+++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Basic"
project(Reused_Facet_Interface_Basic_idl_gen) : ciaoidldefaults, anytypecode {
diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc
index c985a972f7b..b1572c79770 100644
--- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc
+++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc
@@ -1,4 +1,3 @@
-// $Id$
//
project(Reused_Facet_Interface_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl
index 66fae8261b9..e435990889b 100644
--- a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl
+++ b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MY_TEST_IDL
#define MY_TEST_IDL
diff --git a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc
index c36a8ae51c0..eb86cd9afe9 100644
--- a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc
+++ b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(TwoTemplArgs_idl_gen) : componentidldefaults {
custom_only = 1
idlflags += -Gex \
diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc
index 06331d9c2ea..872f1f1b694 100644
--- a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc
+++ b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Minimum_Base"
project(Minimum_Base_idl_gen) : ciaoidldefaults, anytypecode, ccm {
diff --git a/CIAO/tests/Minimum/Receiver/Receiver.mpc b/CIAO/tests/Minimum/Receiver/Receiver.mpc
index e79e6619e8e..31884565885 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Minimum_Base Receiver"
project(Minimum_Base_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
index e7533cd1a62..baa93806321 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
index dcf1eef284f..8580d9e03ee 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.h
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/Minimum/Sender/Sender.mpc b/CIAO/tests/Minimum/Sender/Sender.mpc
index 302695e6e4a..c4a4f24ae76 100644
--- a/CIAO/tests/Minimum/Sender/Sender.mpc
+++ b/CIAO/tests/Minimum/Sender/Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Minimum_Base Sender"
project(Minimum_Base_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.cpp b/CIAO/tests/Minimum/Sender/Sender_exec.cpp
index 850b81ae67c..c8ea481bce9 100644
--- a/CIAO/tests/Minimum/Sender/Sender_exec.cpp
+++ b/CIAO/tests/Minimum/Sender/Sender_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.h b/CIAO/tests/Minimum/Sender/Sender_exec.h
index 5be25e46b6d..7a8dd88a98b 100644
--- a/CIAO/tests/Minimum/Sender/Sender_exec.h
+++ b/CIAO/tests/Minimum/Sender/Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tests/TTSCTest/Sender/Sender.mpc b/CIAO/tests/TTSCTest/Sender/Sender.mpc
index d69b66ac70e..cc6a6dfd014 100644
--- a/CIAO/tests/TTSCTest/Sender/Sender.mpc
+++ b/CIAO/tests/TTSCTest/Sender/Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(TTSC_Sender_idl_gen) : componentidldefaults {
custom_only = 1
after += TTSConnector_idl_gen
diff --git a/CIAO/tests/TTSCTest/Sender/Sender_exec.cpp b/CIAO/tests/TTSCTest/Sender/Sender_exec.cpp
index 691e98f6b3e..1f59dbdf14b 100644
--- a/CIAO/tests/TTSCTest/Sender/Sender_exec.cpp
+++ b/CIAO/tests/TTSCTest/Sender/Sender_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_exec.h"
#include "ace/OS_NS_time.h"
diff --git a/CIAO/tests/TTSCTest/Sender/Sender_exec.h b/CIAO/tests/TTSCTest/Sender/Sender_exec.h
index 0c478b7d53e..cb6905bf899 100644
--- a/CIAO/tests/TTSCTest/Sender/Sender_exec.h
+++ b/CIAO/tests/TTSCTest/Sender/Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/tests/TTSCTest/TTSConnector/TTSConnector.mpc b/CIAO/tests/TTSCTest/TTSConnector/TTSConnector.mpc
index b6d5e6e7968..c8af8e28fb4 100644
--- a/CIAO/tests/TTSCTest/TTSConnector/TTSConnector.mpc
+++ b/CIAO/tests/TTSCTest/TTSConnector/TTSConnector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(TTSConnector_idl_gen) : connectoridldefaults, anytypecode {
custom_only = 1
//don' generate CIAO connector implementation code in this example!
diff --git a/CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp b/CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp
index f9afb24d071..54b3ac1f75c 100644
--- a/CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp
+++ b/CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "TTSConnector_conn.h"
#include "ace/OS_NS_unistd.h"
diff --git a/CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.h b/CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.h
index 1d704a4bee1..5c44b647e4e 100644
--- a/CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.h
+++ b/CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_TTCONNECTOR_EXEC_H_
#define CIAO_TTCONNECTOR_EXEC_H_
diff --git a/CIAO/tests/TTSConnContext/Sender/Sender.mpc b/CIAO/tests/TTSConnContext/Sender/Sender.mpc
index ec891063907..88c19429577 100644
--- a/CIAO/tests/TTSConnContext/Sender/Sender.mpc
+++ b/CIAO/tests/TTSConnContext/Sender/Sender.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(TTSCC_Sender_idl_gen) : componentidldefaults {
custom_only = 1
after += TTSCConnector_idl_gen
diff --git a/CIAO/tests/TTSConnContext/Sender/Sender_exec.cpp b/CIAO/tests/TTSConnContext/Sender/Sender_exec.cpp
index d4d65020087..0f5950d7086 100644
--- a/CIAO/tests/TTSConnContext/Sender/Sender_exec.cpp
+++ b/CIAO/tests/TTSConnContext/Sender/Sender_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_exec.h"
#include "ace/OS_NS_time.h"
diff --git a/CIAO/tests/TTSConnContext/Sender/Sender_exec.h b/CIAO/tests/TTSConnContext/Sender/Sender_exec.h
index 81b0171671e..020bafe7ed8 100644
--- a/CIAO/tests/TTSConnContext/Sender/Sender_exec.h
+++ b/CIAO/tests/TTSConnContext/Sender/Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector.mpc b/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector.mpc
index f31d135cf20..2b251f8a491 100644
--- a/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector.mpc
+++ b/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(TTSCConnector_idl_gen) : connectoridldefaults, anytypecode {
custom_only = 1
//don' generate CIAO connector implementation code in this example!
diff --git a/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp b/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp
index 206b620c911..6608f63500b 100644
--- a/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp
+++ b/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "TTSCConnector_conn.h"
#include "ace/OS_NS_unistd.h"
diff --git a/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.h b/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.h
index ef5d0ae2a94..650c44cde80 100644
--- a/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.h
+++ b/CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_TTCONNECTOR_EXEC_H_
#define CIAO_TTCONNECTOR_EXEC_H_
diff --git a/CIAO/tests/Thread/Receiver/Receiver.mpc b/CIAO/tests/Thread/Receiver/Receiver.mpc
index 41537017b9c..16f3fafbbee 100644
--- a/CIAO/tests/Thread/Receiver/Receiver.mpc
+++ b/CIAO/tests/Thread/Receiver/Receiver.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl Receiver"
project(Thread_Receiver_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Thread/Receiver/Receiver_exec.cpp b/CIAO/tests/Thread/Receiver/Receiver_exec.cpp
index fcbf2716a96..f6d27ffff40 100644
--- a/CIAO/tests/Thread/Receiver/Receiver_exec.cpp
+++ b/CIAO/tests/Thread/Receiver/Receiver_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver_exec.h"
#include "ace/OS_NS_unistd.h"
diff --git a/CIAO/tests/Thread/Receiver/Receiver_exec.h b/CIAO/tests/Thread/Receiver/Receiver_exec.h
index 527fcd5183f..8d51771a341 100644
--- a/CIAO/tests/Thread/Receiver/Receiver_exec.h
+++ b/CIAO/tests/Thread/Receiver/Receiver_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_RECEIVER_EXEC_H_
#define CIAO_RECEIVER_EXEC_H_
diff --git a/CIAO/tests/Thread/Sender/Sender.mpc b/CIAO/tests/Thread/Sender/Sender.mpc
index 95b07882af4..a8ea83752d8 100644
--- a/CIAO/tests/Thread/Sender/Sender.mpc
+++ b/CIAO/tests/Thread/Sender/Sender.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -p Thread_Base -u Thread -c starter Sender"
project(Thread_Sender_idl_gen) : componentidldefaults {
diff --git a/CIAO/tests/Thread/Sender/Sender_exec.cpp b/CIAO/tests/Thread/Sender/Sender_exec.cpp
index ec7630fd21b..ee1bac199b2 100644
--- a/CIAO/tests/Thread/Sender/Sender_exec.cpp
+++ b/CIAO/tests/Thread/Sender/Sender_exec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_exec.h"
#include "ace/OS_NS_time.h"
diff --git a/CIAO/tests/Thread/Sender/Sender_exec.h b/CIAO/tests/Thread/Sender/Sender_exec.h
index d6483aa1de4..29f610b974f 100644
--- a/CIAO/tests/Thread/Sender/Sender_exec.h
+++ b/CIAO/tests/Thread/Sender/Sender_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_SENDER_EXEC_H_
#define CIAO_SENDER_EXEC_H_
diff --git a/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc b/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc
index 506204f343e..4dff6add5cb 100644
--- a/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc
+++ b/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n Thread_Base"
project(Thread_Base_idl_gen) : componentidldefaults {
diff --git a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
index cb8e40a24f5..bd1f7399a1a 100644
--- a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
+++ b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TAO_IDL3_TO_IDL2_BE) : acelib, install_lib, ciao_output, tao_idl_fe {
sharedname = TAO_IDL3_TO_IDL2_BE
dynamicflags += TAO_IDL3_TO_IDL2_BE_BUILD_DLL
diff --git a/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h b/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h
index 7b54e254326..1854cc4b45c 100644
--- a/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h
+++ b/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_IDL3_TO_IDL2_BE
// ------------------------------
diff --git a/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp
index 4699779de5d..ea13f2c31b9 100644
--- a/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "basic_visitor.h"
#include "identifier_helper.h"
#include "be_sunsoft.h"
diff --git a/CIAO/tools/IDL3_to_IDL2/be_extern.h b/CIAO/tools/IDL3_to_IDL2/be_extern.h
index c7dc3daaf41..173d7a4f05f 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_extern.h
+++ b/CIAO/tools/IDL3_to_IDL2/be_extern.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/CIAO/tools/IDL3_to_IDL2/be_init.cpp b/CIAO/tools/IDL3_to_IDL2/be_init.cpp
index fe111e60a47..474adfa6747 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_init.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/be_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global_extern.h"
#include "be_extern.h"
#include "../../ciao/Version.h"
diff --git a/CIAO/tools/IDL3_to_IDL2/be_produce.cpp b/CIAO/tools/IDL3_to_IDL2/be_produce.cpp
index 9800eb5b242..4729b54e706 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_produce.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/be_produce.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp b/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
index 754c8bcab26..90df0068832 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_sunsoft.h"
#include "identifier_helper.h"
diff --git a/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp
index f8381842509..1ab19b56c7a 100644
--- a/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "checking_visitor.h"
#include "identifier_helper.h"
#include "be_extern.h"
diff --git a/CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp b/CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp
index 7e2f2222d9b..153dc45b4c3 100644
--- a/CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "identifier_helper.h"
#include "utl_identifier.h"
#include "utl_string.h"
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
index 04f42c17259..944e82fca9f 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "idl3_to_idl2_visitor.h"
#include "idl3p_checking_visitor.h"
#include "identifier_helper.h"
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp
index b0bb85e673e..b4856c4fd1f 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "idl3p_checking_visitor.h"
#include "ast_module.h"
diff --git a/CIAO/tools/IDL3_to_XMI/CIAO_IDL3_TO_XMI_Export.h b/CIAO/tools/IDL3_to_XMI/CIAO_IDL3_TO_XMI_Export.h
index d34de5bdfd3..199b5141736 100644
--- a/CIAO/tools/IDL3_to_XMI/CIAO_IDL3_TO_XMI_Export.h
+++ b/CIAO/tools/IDL3_to_XMI/CIAO_IDL3_TO_XMI_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl CIAO_IDL3_TO_XMI
// ------------------------------
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
index b518c436874..82642b3e1a2 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CIAO_IDL3_TO_XMI_BE) : acelib, install_lib, ciao_output, ace_xml_utils, tao_idl_fe {
sharedname = CIAO_IDL3_TO_XMI_BE
dynamicflags += CIAO_IDL3_TO_XMI_BUILD_DLL
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
index 0b7345d6984..f2f24f05a67 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IDL3_to_XMI_visitor.h"
#include "identifier_helper.h"
diff --git a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
index 5e653c4b086..ceb1202f1c2 100644
--- a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
+++ b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IR_Simulator_visitor.h"
#include "be_sunsoft.h"
diff --git a/CIAO/tools/IDL3_to_XMI/Literals.cpp b/CIAO/tools/IDL3_to_XMI/Literals.cpp
index 0bad170a739..1224107f24c 100644
--- a/CIAO/tools/IDL3_to_XMI/Literals.cpp
+++ b/CIAO/tools/IDL3_to_XMI/Literals.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Literals.h"
namespace DAnCE
diff --git a/CIAO/tools/IDL3_to_XMI/be_extern.h b/CIAO/tools/IDL3_to_XMI/be_extern.h
index 532b5ebe64e..1c84da15ce0 100644
--- a/CIAO/tools/IDL3_to_XMI/be_extern.h
+++ b/CIAO/tools/IDL3_to_XMI/be_extern.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/CIAO/tools/IDL3_to_XMI/be_helper.h b/CIAO/tools/IDL3_to_XMI/be_helper.h
index 657dbde3ffc..b471887e39e 100644
--- a/CIAO/tools/IDL3_to_XMI/be_helper.h
+++ b/CIAO/tools/IDL3_to_XMI/be_helper.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
/**
* @file be_helper.h
* @author Aniruddha Gokhale
diff --git a/CIAO/tools/IDL3_to_XMI/be_init.cpp b/CIAO/tools/IDL3_to_XMI/be_init.cpp
index 7863fcae9d8..22985cbaa95 100644
--- a/CIAO/tools/IDL3_to_XMI/be_init.cpp
+++ b/CIAO/tools/IDL3_to_XMI/be_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global_extern.h"
#include "be_extern.h"
#include "../../ciao/Version.h"
diff --git a/CIAO/tools/IDL3_to_XMI/be_produce.cpp b/CIAO/tools/IDL3_to_XMI/be_produce.cpp
index a229acad0c8..d119655fd12 100644
--- a/CIAO/tools/IDL3_to_XMI/be_produce.cpp
+++ b/CIAO/tools/IDL3_to_XMI/be_produce.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp b/CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp
index d04e6c1f287..ede6220d500 100644
--- a/CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp
+++ b/CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_sunsoft.h"
#include "ast_expression.h"
#include "utl_identifier.h"
diff --git a/CIAO/tools/IDL3_to_XMI/be_sunsoft.h b/CIAO/tools/IDL3_to_XMI/be_sunsoft.h
index e1c42fc1276..d02bf7e300b 100644
--- a/CIAO/tools/IDL3_to_XMI/be_sunsoft.h
+++ b/CIAO/tools/IDL3_to_XMI/be_sunsoft.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
/**
* @file be_sunsoft.h
*
diff --git a/CIAO/tools/IDL3_to_XMI/identifier_helper.cpp b/CIAO/tools/IDL3_to_XMI/identifier_helper.cpp
index 929e1ae6fcc..6a0df3d7199 100644
--- a/CIAO/tools/IDL3_to_XMI/identifier_helper.cpp
+++ b/CIAO/tools/IDL3_to_XMI/identifier_helper.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "identifier_helper.h"
#include "utl_identifier.h"
#include "utl_string.h"
diff --git a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc
index 9ca5e3babea..7bc6d4a39f6 100644
--- a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc
+++ b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -e -p Stock_Base -l ../lib -o ../lib -c StockBrokerDriver StockBroker"
project(Stock_Base_StockBroker_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp
index e1cd31c109b..ad618b4951a 100644
--- a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp
+++ b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "StockBroker_exec.h"
namespace CIAO_Stock_StockBroker_Impl
diff --git a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.h b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.h
index 445464f849e..d7564310d2d 100644
--- a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.h
+++ b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CIAO_STOCKBROKER_EXEC_H_
#define CIAO_STOCKBROKER_EXEC_H_
diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
index 3e96a70a10a..51847f37df6 100644
--- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
+++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -e -p Stock_Base -l ../lib -o ../lib -c StockDistributorDriver StockDistributor"
project(Stock_Base_StockDistributor_idl_gen) : componentidldefaults, avoids_ccm_noevent {
diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp
index bf1df07dff7..b11fffe191b 100644
--- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp
+++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "StockDistributor_exec.h"
#include "ace/Reactor.h"
diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
index 30f9fde0738..f5d2d316016 100644
--- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
+++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
index 9aa72e8fc47..bb83c41f70c 100644
--- a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+++ b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
@@ -1,4 +1,3 @@
-// $Id$
// This file is generated with "generate_component_mpc.pl -n -e -l ../lib -o ../lib Stock_Base"
project(Stock_Base_idl_gen) : componentidldefaults, avoids_ccm_noevent {