summaryrefslogtreecommitdiff
path: root/TAO/examples
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples')
-rw-r--r--TAO/examples/AMH/Sink_Server/Base_Server.cpp2
-rw-r--r--TAO/examples/AMH/Sink_Server/Base_Server.inl2
-rw-r--r--TAO/examples/AMH/Sink_Server/Client_Task.cpp2
-rw-r--r--TAO/examples/AMH/Sink_Server/Sink_Server.mpc2
-rw-r--r--TAO/examples/AMH/Sink_Server/mt_server.cpp2
-rw-r--r--TAO/examples/AMH/Sink_Server/st_server.cpp2
-rw-r--r--TAO/examples/AMI/FL_Callback/FL_Callback.mpc2
-rw-r--r--TAO/examples/AMI/FL_Callback/Peer_i.cpp2
-rw-r--r--TAO/examples/AMI/FL_Callback/Progress_i.cpp2
-rw-r--r--TAO/examples/AMI/FL_Callback/peer.cpp2
-rw-r--r--TAO/examples/AMI/FL_Callback/progress.cpp2
-rw-r--r--TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc2
-rw-r--r--TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc2
-rw-r--r--TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc2
-rw-r--r--TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc2
-rw-r--r--TAO/examples/Advanced/ch_3/server.cpp1
-rw-r--r--TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc2
-rw-r--r--TAO/examples/Borland/Broadcaster.idl2
-rw-r--r--TAO/examples/Borland/ChatClient.cpp1
-rw-r--r--TAO/examples/Borland/ChatClient.mpc2
-rw-r--r--TAO/examples/Borland/ChatClientWnd.cpp1
-rw-r--r--TAO/examples/Borland/ChatClientWnd.h1
-rw-r--r--TAO/examples/Borland/ORBThread.cpp1
-rw-r--r--TAO/examples/Borland/ORBThread.h1
-rw-r--r--TAO/examples/Borland/Receiver.idl2
-rw-r--r--TAO/examples/Borland/ReceiverImpl.cpp1
-rw-r--r--TAO/examples/Borland/ReceiverImpl.h1
-rw-r--r--TAO/examples/Borland/pch.h1
-rw-r--r--TAO/examples/Buffered_AMI/Buffered_AMI.mpc2
-rw-r--r--TAO/examples/Buffered_AMI/server.cpp2
-rw-r--r--TAO/examples/Buffered_AMI/test_i.cpp2
-rw-r--r--TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc2
-rw-r--r--TAO/examples/Buffered_Oneways/server.cpp2
-rw-r--r--TAO/examples/Buffered_Oneways/test_i.cpp2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp1
-rw-r--r--TAO/examples/Callback_Quoter/Callback_Quoter.mpc2
-rw-r--r--TAO/examples/Callback_Quoter/Consumer.idl2
-rw-r--r--TAO/examples/Callback_Quoter/Notifier.idl2
-rw-r--r--TAO/examples/Callback_Quoter/consumer.cpp2
-rw-r--r--TAO/examples/Callback_Quoter/notifier.cpp2
-rw-r--r--TAO/examples/Callback_Quoter/supplier.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/client.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/server.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/client.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/server.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/client.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/server.cpp2
-rw-r--r--TAO/examples/Event_Comm/Consumer_Handler.cpp2
-rw-r--r--TAO/examples/Event_Comm/Consumer_Input_Handler.cpp2
-rw-r--r--TAO/examples/Event_Comm/Event_Comm.mpc2
-rw-r--r--TAO/examples/Event_Comm/Event_Comm_i.cpp2
-rw-r--r--TAO/examples/Event_Comm/Notifier_Handler.cpp2
-rw-r--r--TAO/examples/Event_Comm/Notifier_Server.cpp2
-rw-r--r--TAO/examples/Event_Comm/Supplier_Input_Handler.cpp2
-rw-r--r--TAO/examples/Event_Comm/consumer.cpp2
-rw-r--r--TAO/examples/Event_Comm/notifier.cpp2
-rw-r--r--TAO/examples/Event_Comm/supplier.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h1
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl2
-rw-r--r--TAO/examples/Load_Balancing/Load_Balancing.mpc2
-rw-r--r--TAO/examples/Load_Balancing_persistent/Identity_Server.cpp2
-rw-r--r--TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp1
-rw-r--r--TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc2
-rw-r--r--TAO/examples/Logging/Logger.idl2
-rw-r--r--TAO/examples/Logging/Logger_i.cpp2
-rw-r--r--TAO/examples/Logging/Logging.mpc2
-rw-r--r--TAO/examples/Logging/Logging_Service.cpp2
-rw-r--r--TAO/examples/Logging/Logging_Service_i.cpp2
-rw-r--r--TAO/examples/Logging/Logging_Test.cpp2
-rw-r--r--TAO/examples/Logging/Logging_Test_i.cpp2
-rw-r--r--TAO/examples/OBV/Simple_util.cpp2
-rw-r--r--TAO/examples/OBV/Typed_Events/Event_Types.idl2
-rw-r--r--TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp2
-rw-r--r--TAO/examples/OBV/Typed_Events/Event_Types_impl.h2
-rw-r--r--TAO/examples/OBV/Typed_Events/Server_i.cpp2
-rw-r--r--TAO/examples/OBV/Typed_Events/Typed_Events.mpc2
-rw-r--r--TAO/examples/OBV/Typed_Events/server.cpp1
-rw-r--r--TAO/examples/Persistent_Grid/Grid.idl2
-rw-r--r--TAO/examples/Persistent_Grid/Grid_i.cpp2
-rw-r--r--TAO/examples/Persistent_Grid/Persistent_Grid.mpc2
-rw-r--r--TAO/examples/Persistent_Grid/client.cpp2
-rw-r--r--TAO/examples/Persistent_Grid/persistent_client.cpp2
-rw-r--r--TAO/examples/Persistent_Grid/server.cpp2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/Performance.mpc2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/UDP.idl2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp2
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc2
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp2
-rw-r--r--TAO/examples/Quoter/Quoter.mpc2
-rw-r--r--TAO/examples/Quoter/client.cpp2
-rw-r--r--TAO/examples/RTCORBA/Activity/Activity.mpc2
-rw-r--r--TAO/examples/RTCORBA/Activity/activity_export.h1
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc2
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h1
-rw-r--r--TAO/examples/RTScheduling/Job.mpc2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h1
-rw-r--r--TAO/examples/RTScheduling/RTSchedTestLib.mpc2
-rw-r--r--TAO/examples/RTScheduling/Synch.mpc2
-rw-r--r--TAO/examples/RTScheduling/job_export.h1
-rw-r--r--TAO/examples/RTScheduling/rtschedtestlib_export.h1
-rw-r--r--TAO/examples/RTScheduling/synch_export.h1
-rw-r--r--TAO/examples/Simple/Simple_util.cpp2
-rw-r--r--TAO/examples/Simple/bank/AccountManager_i.cpp2
-rw-r--r--TAO/examples/Simple/bank/Account_i.cpp2
-rw-r--r--TAO/examples/Simple/bank/Bank.idl2
-rw-r--r--TAO/examples/Simple/bank/bank.mpc2
-rw-r--r--TAO/examples/Simple/bank/client.cpp2
-rw-r--r--TAO/examples/Simple/bank/server.cpp1
-rw-r--r--TAO/examples/Simple/chat/Broadcaster.idl2
-rw-r--r--TAO/examples/Simple/chat/Receiver.idl2
-rw-r--r--TAO/examples/Simple/chat/chat.mpc2
-rw-r--r--TAO/examples/Simple/echo/Echo.idl2
-rw-r--r--TAO/examples/Simple/echo/Echo_i.cpp2
-rw-r--r--TAO/examples/Simple/echo/echo.mpc2
-rw-r--r--TAO/examples/Simple/echo/server.cpp1
-rw-r--r--TAO/examples/Simple/grid/Grid.idl2
-rw-r--r--TAO/examples/Simple/grid/Grid_i.cpp2
-rw-r--r--TAO/examples/Simple/grid/client.cpp2
-rw-r--r--TAO/examples/Simple/grid/grid.mpc2
-rw-r--r--TAO/examples/Simple/grid/server.cpp1
-rw-r--r--TAO/examples/Simple/time-date/Alt_Resource_Factory.h2
-rw-r--r--TAO/examples/Simple/time-date/Simple_time_date.mpc2
-rw-r--r--TAO/examples/Simple/time-date/Time_Date.cpp2
-rw-r--r--TAO/examples/Simple/time-date/Time_Date.idl2
-rw-r--r--TAO/examples/Simple/time-date/Time_Date_i.cpp2
-rw-r--r--TAO/examples/Simple/time-date/client.cpp2
-rw-r--r--TAO/examples/Simple/time/Time.idl2
-rw-r--r--TAO/examples/Simple/time/Time_i.cpp2
-rw-r--r--TAO/examples/Simple/time/server.cpp1
-rw-r--r--TAO/examples/Simple/time/time.mpc2
-rw-r--r--TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc2
-rw-r--r--TAO/examples/Simulator/NavWeap.idl2
-rw-r--r--TAO/examples/Simulator/Persian.idl2
-rw-r--r--TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc2
-rw-r--r--TAO/examples/TypeCode_Creation/main.cpp2
-rw-r--r--TAO/examples/ior_corbaloc/corbaloc.idl2
-rw-r--r--TAO/examples/ior_corbaloc/ior_corbaloc.mpc2
-rw-r--r--TAO/examples/ior_corbaloc/server.cpp1
-rw-r--r--TAO/examples/ior_corbaloc/status_i.cpp2
-rw-r--r--TAO/examples/ior_corbaloc/status_i.h2
-rw-r--r--TAO/examples/mfc/MainFrm.cpp2
-rw-r--r--TAO/examples/mfc/MainFrm.h2
-rw-r--r--TAO/examples/mfc/Resource.h2
-rw-r--r--TAO/examples/mfc/StdAfx.cpp2
-rw-r--r--TAO/examples/mfc/StdAfx.h2
-rw-r--r--TAO/examples/mfc/client.cpp2
-rw-r--r--TAO/examples/mfc/client.mpc2
-rw-r--r--TAO/examples/mfc/server.cpp2
-rw-r--r--TAO/examples/mfc/server.h2
-rw-r--r--TAO/examples/mfc/server.mpc2
-rw-r--r--TAO/examples/mfc/serverDoc.cpp2
-rw-r--r--TAO/examples/mfc/serverDoc.h2
-rw-r--r--TAO/examples/mfc/serverView.cpp2
-rw-r--r--TAO/examples/mfc/serverView.h2
-rw-r--r--TAO/examples/mfc/w32_test.idl2
-rw-r--r--TAO/examples/mfc/w32_test_impl.cpp2
-rw-r--r--TAO/examples/mfc/w32_test_impl.h2
256 files changed, 0 insertions, 428 deletions
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index f4c2a9f81d9..19a8ab7a5f3 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Sched_Params.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.inl b/TAO/examples/AMH/Sink_Server/Base_Server.inl
index 70dd0a098d1..87240a2232c 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.inl
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.inl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Base_Server.h"
ACE_INLINE CORBA::ORB_ptr
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index c729d440b5d..a04b0456469 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
index 5e7d22fe322..79c7fa8f9a5 100644
--- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
+++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) : taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/examples/AMH/Sink_Server/mt_server.cpp b/TAO/examples/AMH/Sink_Server/mt_server.cpp
index 53419811254..151db89c651 100644
--- a/TAO/examples/AMH/Sink_Server/mt_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/mt_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MT_AMH_Server.h"
#include "AMH_Servant.h"
diff --git a/TAO/examples/AMH/Sink_Server/st_server.cpp b/TAO/examples/AMH/Sink_Server/st_server.cpp
index bc3477c888b..e9eb93c6da2 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/st_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMH_Servant.h"
#include "Base_Server.h"
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index 26dfc3111de..b11d7e7baaa 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoexe, messaging, ami {
IDL_Files {
test.idl
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 5b7120d0b94..e6138231d81 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index de12b1e1fab..6fc01d78829 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Progress_i.h"
#include <FL/Fl_Slider.H>
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 39a19803ca3..878d1c9d740 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index a2ebfb494da..0408df00347 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Progress_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc b/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc
index 468c4508383..8dda2c7ce93 100644
--- a/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc
+++ b/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
CCS.idl
diff --git a/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc b/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc
index c61eb267c20..4d86c0fc893 100644
--- a/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc
+++ b/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
CCS.idl
diff --git a/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc b/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc
index 740dcb48c2f..966002197db 100644
--- a/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc
+++ b/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
CCS.idl
diff --git a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
index d20f18f86d7..0c845713b02 100644
--- a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
+++ b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
time.idl
diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp
index bace6362305..14caa68f7b9 100644
--- a/TAO/examples/Advanced/ch_3/server.cpp
+++ b/TAO/examples/Advanced/ch_3/server.cpp
@@ -37,7 +37,6 @@ get_gmt (void)
return tod;
}
-// $Id$
// Changelog for Henning and Vinoski's chapter 18 example
// ______________________________________________________
diff --git a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
index 468c4508383..8dda2c7ce93 100644
--- a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
+++ b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
CCS.idl
diff --git a/TAO/examples/Borland/Broadcaster.idl b/TAO/examples/Borland/Broadcaster.idl
index 5eae517f59b..cb80c7fae57 100644
--- a/TAO/examples/Borland/Broadcaster.idl
+++ b/TAO/examples/Borland/Broadcaster.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Receiver.idl"
interface Broadcaster
diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp
index cc51ac124a2..996a0865fb6 100644
--- a/TAO/examples/Borland/ChatClient.cpp
+++ b/TAO/examples/Borland/ChatClient.cpp
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#include "pch.h"
#pragma hdrstop
diff --git a/TAO/examples/Borland/ChatClient.mpc b/TAO/examples/Borland/ChatClient.mpc
index cb44c0bd968..532ff30269d 100644
--- a/TAO/examples/Borland/ChatClient.mpc
+++ b/TAO/examples/Borland/ChatClient.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : taoserver, utils, iortable, vcl {
exename = chatclient
IDL_Files {
diff --git a/TAO/examples/Borland/ChatClientWnd.cpp b/TAO/examples/Borland/ChatClientWnd.cpp
index ca04e226874..777ceac534c 100644
--- a/TAO/examples/Borland/ChatClientWnd.cpp
+++ b/TAO/examples/Borland/ChatClientWnd.cpp
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#include "pch.h"
#pragma hdrstop
diff --git a/TAO/examples/Borland/ChatClientWnd.h b/TAO/examples/Borland/ChatClientWnd.h
index 230fe893287..6d81abdcb4e 100644
--- a/TAO/examples/Borland/ChatClientWnd.h
+++ b/TAO/examples/Borland/ChatClientWnd.h
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#ifndef ChatClientWndH
#define ChatClientWndH
diff --git a/TAO/examples/Borland/ORBThread.cpp b/TAO/examples/Borland/ORBThread.cpp
index dfa11b3d185..4a0ae7da59e 100644
--- a/TAO/examples/Borland/ORBThread.cpp
+++ b/TAO/examples/Borland/ORBThread.cpp
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
// To be able to handle CORBA requests an application usually calls orb->run().
// To integrate this into VCL applications we will run the orb in a separate
diff --git a/TAO/examples/Borland/ORBThread.h b/TAO/examples/Borland/ORBThread.h
index 8c4e50d6b50..b8174e44a48 100644
--- a/TAO/examples/Borland/ORBThread.h
+++ b/TAO/examples/Borland/ORBThread.h
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#ifndef ORBThreadH
#define ORBThreadH
diff --git a/TAO/examples/Borland/Receiver.idl b/TAO/examples/Borland/Receiver.idl
index 90ea6570071..9ccca7244d1 100644
--- a/TAO/examples/Borland/Receiver.idl
+++ b/TAO/examples/Borland/Receiver.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface Receiver
{
// = TITLE
diff --git a/TAO/examples/Borland/ReceiverImpl.cpp b/TAO/examples/Borland/ReceiverImpl.cpp
index de9d9dd2746..0814ed2eda3 100644
--- a/TAO/examples/Borland/ReceiverImpl.cpp
+++ b/TAO/examples/Borland/ReceiverImpl.cpp
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#include "pch.h"
#pragma hdrstop
diff --git a/TAO/examples/Borland/ReceiverImpl.h b/TAO/examples/Borland/ReceiverImpl.h
index f48fa48bdd8..b4ce57cd8f8 100644
--- a/TAO/examples/Borland/ReceiverImpl.h
+++ b/TAO/examples/Borland/ReceiverImpl.h
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#ifndef ReceiverImplH
#define ReceiverImplH
diff --git a/TAO/examples/Borland/pch.h b/TAO/examples/Borland/pch.h
index b890766880e..84ff767cab4 100644
--- a/TAO/examples/Borland/pch.h
+++ b/TAO/examples/Borland/pch.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef INCLUDE_PCH_H
#define INCLUDE_PCH_H
diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
index 4681a366900..c4086557990 100644
--- a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
+++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, ami {
IDL_Files {
test.idl
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index 6657488c8c4..dc71e7223d6 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp
index 5907b23948a..a01d94181e4 100644
--- a/TAO/examples/Buffered_AMI/test_i.cpp
+++ b/TAO/examples/Buffered_AMI/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
index 15d4771a09c..9d173dccde3 100644
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 365d3550e6c..87d910c12b9 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp
index f3333908a56..9910ee0e5f0 100644
--- a/TAO/examples/Buffered_Oneways/test_i.cpp
+++ b/TAO/examples/Buffered_Oneways/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc b/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
index f3b5e903ecf..d0309b39b15 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
index 72bc6832494..e932771d85d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "FooC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
index 059d878bcab..137791f75c5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl
index f4a756a31b1..58ecb9b7646 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
index ab94d4f520a..ddcf4f4e82f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
index b7b33f0638e..9751030b8ae 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
index fd20301060f..15b2f17f4c2 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
index ef49e94a384..f9d1517383f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
index a4c0931488c..7dd626716ac 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "ace/SString.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
index b3f427fb678..db9540357b3 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
index fe1ed1fbc77..fc093084f1e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
index 4b368339776..035329c2b13 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "FooC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
index 3126bd31074..eb50cb27a4f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl
index f4a756a31b1..58ecb9b7646 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
index ad87e0cc2e1..b688a1991d9 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "FooServantList.h"
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index 94a4c970852..84c39803f86 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOOSERVANTLIST_H
#define FOOSERVANTLIST_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index 8b86406037e..eca9c5e79db 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "FooServantList.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
index cd448d7c64c..4e191c54b2a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
index 68a5a9caf78..15826a53af5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "FooServantList.h"
#include "FooC.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
index 8e6e6abdfd4..0f5b1e1a040 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
index 0c217199a38..f32f6ce770b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "ace/SString.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
index 7ef554f5499..c0bf7adb85d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
index a1956a49971..e71f14f0860 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
index 095e2ce0e90..24f3ef64fa2 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "FooC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
index 3126bd31074..eb50cb27a4f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl
index f4a756a31b1..58ecb9b7646 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
index 426b75936a0..5018a78c872 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
index eb1ca654c5a..ea7db122e12 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
index 6cb5f2399b0..aee9cea9cfe 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_i.h"
#include "OrbTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
index dc422b926b2..76e7619aca6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
index 5599a70d674..b197ebd4588 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
index 70e98b7adae..356a29a0f8e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc b/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
index 905491e3204..9ad558fa6cb 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_threadpool, messaging, taoserver, pi, avoids_corba_e_micro {
exename = server_main
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl b/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl
index 717d74adea5..5a57daa64f1 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_IDL
#define CALLBACK_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
index 81301279214..ce50c43b3e6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Callback_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
index 18f8b0f6631..5a013fe4f88 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl
index 845d9ccfab7..f1e633185ba 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index 8271798514e..50984c0332d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
index bda78300650..651e3c1d151 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
index 7c186a6394b..c8742f70cfd 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_i.h"
#include "Callback_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
index 1a77e8463f7..fba7ea86b08 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
index 961ebd01d21..4131a591654 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc b/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
index aad69c6586d..98bb3e96ce0 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Callback.idl
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl b/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl
index 717d74adea5..5a57daa64f1 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_IDL
#define CALLBACK_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
index 81301279214..ce50c43b3e6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Callback_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
index d45d948fb53..ce967dfe29b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
index fa9783bd18b..f9772d5c7a6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "Callback_i.h"
#include "ClientTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
index 2d852a56d1b..689c7371573 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
index 36b85adcad6..c2fcd1377e6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
index 1035c897cab..00a50947930 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "FooServantList.h"
#include "Foo_i.h"
#include "Callback_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
index 13ec1db2ede..4a06102f735 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOOSERVANTLIST_H
#define FOOSERVANTLIST_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
index 74f53da07f8..7a5925b63b9 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "FooServantList.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index ab3ad761965..df548468b7a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
index eaec63e6e49..9773a40f86a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "OrbTask.h"
#include "FooServantList.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
index 967f4dab144..6f390f129cc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
index a4c0931488c..7dd626716ac 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "ace/SString.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
index 5af35beb0fc..d6c955a974c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
index 824dca4d76d..44807f56780 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -GT
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
index c003a88e7ef..ccfcbb7837d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "FooC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
index 3126bd31074..eb50cb27a4f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl
index f4a756a31b1..58ecb9b7646 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
index 84807a8b9f0..a5a2f905d7e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
index a5bf36c4040..858fc65a6da 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
index 85508b0d44f..eb21e8b2c91 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_i.h"
#include "FooS_T.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
index ef49e94a384..f9d1517383f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
index a4c0931488c..7dd626716ac 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "ace/SString.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
index 5af35beb0fc..d6c955a974c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index d5014089066..25e016ec2fe 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Consumer.idl
diff --git a/TAO/examples/Callback_Quoter/Consumer.idl b/TAO/examples/Callback_Quoter/Consumer.idl
index 4e6020992e6..b6af1c59514 100644
--- a/TAO/examples/Callback_Quoter/Consumer.idl
+++ b/TAO/examples/Callback_Quoter/Consumer.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#if !defined (_CONSUMER_IDL)
#define _CONSUMER_IDL
diff --git a/TAO/examples/Callback_Quoter/Notifier.idl b/TAO/examples/Callback_Quoter/Notifier.idl
index 1c86ed60537..bfce4c6eb7c 100644
--- a/TAO/examples/Callback_Quoter/Notifier.idl
+++ b/TAO/examples/Callback_Quoter/Notifier.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#if !defined (_NOTIFIER_IDL)
#define _NOTTIFIER_IDL
diff --git a/TAO/examples/Callback_Quoter/consumer.cpp b/TAO/examples/Callback_Quoter/consumer.cpp
index a9115e68ca5..d270936307c 100644
--- a/TAO/examples/Callback_Quoter/consumer.cpp
+++ b/TAO/examples/Callback_Quoter/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Handler.h"
// This function runs the Callback Quoter Consumer application.
diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp
index 71f37e18d99..dde220c305c 100644
--- a/TAO/examples/Callback_Quoter/notifier.cpp
+++ b/TAO/examples/Callback_Quoter/notifier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Input_Handler.h"
// This is the main driver program for the Callback Quoter Notifier.
diff --git a/TAO/examples/Callback_Quoter/supplier.cpp b/TAO/examples/Callback_Quoter/supplier.cpp
index 7b914093937..e4149bc9027 100644
--- a/TAO/examples/Callback_Quoter/supplier.cpp
+++ b/TAO/examples/Callback_Quoter/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier_i.h"
// This function runs the Callback Quoter Supplier daemon.
diff --git a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
index 02b9580e694..dda94ad2795 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, ami {
IDL_Files {
Web_Server.idl
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index d9d6b766b42..ef4f4883e4a 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index ce3f466f560..528ecbb6071 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "Content_Iterator_i.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index e9280f93f83..33476782525 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl b/TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl
index f669e39d98c..ffc7c9f13a3 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl
+++ b/TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Web_Server
// = TITLE
// IDL schema definition for Web server interface.
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index 87a83637077..b28938ec142 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/Process_Manager.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index 3f8ad1f65a4..1f1949e5bd5 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
index 9ebc2e75c6c..5fce6a6c45e 100644
--- a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
+++ b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, ami {
IDL_Files {
Push_Web_Server.idl
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index be9f9f1f6e4..cc3d6900c3b 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index 9dcf50f26c6..1741f68d52e 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
index 5fddbc0a6a5..f6ccae5cba0 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "Push_Iterator_Factory_i.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index 85674d453df..ad1b852321c 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/Log_Msg.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl b/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl
index 96e0b8be4e4..267a677c4e8 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Web_Server
// = TITLE
// IDL schema definition for Web server interface.
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index 08cf6ab48e1..0d9e236c511 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/Process_Manager.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp
index 260b304f23e..42306470870 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 6c65b16a9fa..83f06289214 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
index e7acb5611c0..301f86f033d 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "Content_Iterator_i.h"
diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
index 4675543c102..4913265e7e1 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Web_Server.idl
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl b/TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl
index 4b1c6eeb54e..240c44a6384 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl
+++ b/TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// IDL schema definition for Web server interface.
module Web_Server
{
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index d89d9cd7370..41e1d89b3ce 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
index da1af33a3e1..b85b1283d0d 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index 3041d1afbb5..f32b1c1ba03 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Handler.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
index 914bfed034d..4a6a49ee4a2 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Input_Handler.h"
#include "Consumer_Handler.h"
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index ef11c776d47..ad8c80495e5 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Event_Comm.idl
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index a657a17d73c..85b523498c8 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Comm_i.h"
#include "ace/OS_NS_regex.h"
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index 9f900949038..8fcf3d4b7e8 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Handler.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp
index dac24dbb822..05b7eb175aa 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Server.h"
#include "Event_CommC.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
index 94b1b1eda12..cef8fb40b2c 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Comm_i.h"
#include "Notifier_Handler.h"
#include "Supplier_Input_Handler.h"
diff --git a/TAO/examples/Event_Comm/consumer.cpp b/TAO/examples/Event_Comm/consumer.cpp
index 7d088d2b0ed..73088a48391 100644
--- a/TAO/examples/Event_Comm/consumer.cpp
+++ b/TAO/examples/Event_Comm/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Handler.h"
#include "Consumer_Input_Handler.h"
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index f0ad39d3226..7596f378a0f 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Server.h"
#include "notifier.h"
diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp
index 97431ab7973..a6dd1cb8cac 100644
--- a/TAO/examples/Event_Comm/supplier.cpp
+++ b/TAO/examples/Event_Comm/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Handler.h"
#include "Supplier_Input_Handler.h"
#include "supplier.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
index 819b2417b66..951c31ede5b 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file EDF_Scheduling.idl
*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc
index 050093a6815..bc340972ac1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Kokyu_DSRT_Schedulers) : orbsvcslib, kokyu, rtscheduling, rtcorba, codecfactory {
sharedname = Kokyu_DSRT_Schedulers
dynamicflags += KOKYU_DSRT_SCHEDULERS_BUILD_DLL
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h
index 4d9236a75f2..63e4c8d5473 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Kokyu_DSRT_Schedulers
// ------------------------------
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 84714ec2543..7434ad5c740 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
index 5a74bab0021..bffc3e5cde2 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index 5900943be33..5c508a5d761 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
index c4f8f2c095a..82730645a95 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/High_Res_Timer.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
index 60a08452bc1..8d54b24d6f0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
RTScheduling::Current_ptr current,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index 0a1f7838295..0b4ad021f97 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
index 9b222313347..e4e297d659d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index 95d01d23791..202ee9489a3 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
index 5ef2c2820a5..ebe9a514d1b 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/High_Res_Timer.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
index 60a08452bc1..8d54b24d6f0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
RTScheduling::Current_ptr current,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 73284159fa9..ada335dc7f1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
index ed79bd08918..103c4017317 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index cfab2f8bd16..f28ae234f5d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
index 5ef2c2820a5..ebe9a514d1b 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/High_Res_Timer.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
index 60a08452bc1..8d54b24d6f0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
RTScheduling::Current_ptr current,
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index 711ed4e8235..641f79354ff 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Identity.idl
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index ff8308fc06d..e6a4069813d 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Identity_Server.h"
#include "Identity_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 292a5096df1..24294b84f8a 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Load_Balancer_i.h"
#include "ace/Auto_Ptr.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 1eed96e354b..7e688db602c 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Identity.idl
diff --git a/TAO/examples/Logging/Logger.idl b/TAO/examples/Logging/Logger.idl
index a87d9a799dc..b1cdfd31a95 100644
--- a/TAO/examples/Logging/Logger.idl
+++ b/TAO/examples/Logging/Logger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_LOGGER_IDL
#define TAO_LOGGER_IDL
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index e0f2f98a515..765a792642e 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LoggerC.h"
#include "Logger_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index b6ab1cd9e13..f6bf7b4e9ce 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Logger.idl
diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp
index 8bfc668cb41..9c72c3ba08e 100644
--- a/TAO/examples/Logging/Logging_Service.cpp
+++ b/TAO/examples/Logging/Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Logging_Service_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp
index 0c8c78361a3..01068f6bfab 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/examples/Logging/Logging_Service_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Logging_Service_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp
index 1a887e5a1db..83fe0565eb7 100644
--- a/TAO/examples/Logging/Logging_Test.cpp
+++ b/TAO/examples/Logging/Logging_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Logging_Test_i.h"
// This function runs the Logging service test.
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index c628af31064..865adcf7d55 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LoggerC.h"
#include "Logging_Test_i.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 4955e621d89..83d39bc3037 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This version of Simple_Util doesn't need to link against orbsvcs
// On the other hand it has no naming service.
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types.idl b/TAO/examples/OBV/Typed_Events/Event_Types.idl
index 40c167d1250..c12607b0d2f 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types.idl
+++ b/TAO/examples/OBV/Typed_Events/Event_Types.idl
@@ -5,8 +5,6 @@
// Torsten Kuepper
//
-// $Id$
-
// Event inheritance hierarchy ===========================
// Base class --------------------------------------------
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 89beb8bc74f..7ce46031ad8 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Types_impl.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index b39e70b0a22..93657769e99 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined (EVENT_TYPES_IMPL_H)
#define EVENT_TYPES_IMPL_H
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 515974a0005..2cdd221fc7b 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "Event_Types_impl.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index 02469a4f9d6..52818a238a5 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags -= -St
IDL_Files {
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index fc7aad0ca62..6c6db881151 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "Server_i.h"
diff --git a/TAO/examples/Persistent_Grid/Grid.idl b/TAO/examples/Persistent_Grid/Grid.idl
index 20f885c4978..bf3eaf0dc49 100644
--- a/TAO/examples/Persistent_Grid/Grid.idl
+++ b/TAO/examples/Persistent_Grid/Grid.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
interface Grid
{
// = TITLE
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index f9974bf5511..89f5082b7dc 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Grid_i.h"
// Default constructor.
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index 29c7283f87a..b6df6788444 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Grid.idl
diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp
index 479b8a8cf98..a8d3ab80ead 100644
--- a/TAO/examples/Persistent_Grid/client.cpp
+++ b/TAO/examples/Persistent_Grid/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Grid_Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Persistent_Grid/persistent_client.cpp b/TAO/examples/Persistent_Grid/persistent_client.cpp
index 4e6c7791336..9c9d2311dd2 100644
--- a/TAO/examples/Persistent_Grid/persistent_client.cpp
+++ b/TAO/examples/Persistent_Grid/persistent_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Persistent_Client.h"
// The "persistent client" program for the application.
diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp
index 5b830ac001c..5511f3154e9 100644
--- a/TAO/examples/Persistent_Grid/server.cpp
+++ b/TAO/examples/Persistent_Grid/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Simple_util.h"
#include "Grid_i.h"
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
index ebbfe56df81..11458556880 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
+++ b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags += -Sd -Sp
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP.idl b/TAO/examples/PluggableUDP/tests/Performance/UDP.idl
index 23386cbee7c..504bc47132e 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP.idl
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface UDP
{
// = TITLE
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
index 1cb47fa5c34..f453fbbb379 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/High_Res_Timer.h"
#include "ace/SString.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
index d09b526d3fb..b598f94f81e 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "UDP_i.h"
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
index ed5ce859b74..f13f3f5f303 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags += -Sp -Sd
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
index 74daec629d4..2986f5ce526 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
int Simple_Server_count=0;
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index 3ed51650eb1..c6b33c60748 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Quoter.idl
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 82237568e89..c001988e8c0 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Read_Buffer.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/RTCORBA/Activity/Activity.mpc b/TAO/examples/RTCORBA/Activity/Activity.mpc
index 0d7054ff5b0..e85ed290b83 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.mpc
+++ b/TAO/examples/RTCORBA/Activity/Activity.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcslib, namingexe, rt_server {
exename = activity
// We use macros instead of dynamicflags so that
diff --git a/TAO/examples/RTCORBA/Activity/activity_export.h b/TAO/examples/RTCORBA/Activity/activity_export.h
index a33eec53a40..e1f4c003eb8 100644
--- a/TAO/examples/RTCORBA/Activity/activity_export.h
+++ b/TAO/examples/RTCORBA/Activity/activity_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
index 3c34d07b456..77cb464198f 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Starter): portableserver, namingexe {
after += MIF_Scheduler_Starter
libs += RTSchedSynch
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h
index fb76d92387c..ccc0fb5e06b 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl FP_DT_Creator
// ------------------------------
diff --git a/TAO/examples/RTScheduling/Job.mpc b/TAO/examples/RTScheduling/Job.mpc
index 8e46c315901..d868a7dabd5 100644
--- a/TAO/examples/RTScheduling/Job.mpc
+++ b/TAO/examples/RTScheduling/Job.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Job): portableserver {
idlflags += -St \
-Wb,export_macro=JOB_Export \
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
index 2bc6940bf48..a77487e663e 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Starter): portableserver, namingexe {
after += RTSchedSynch
libs += RTSchedSynch
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h b/TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h
index 58ef8f81839..bbca86d5e3a 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl MIF_DT_Creator
// ------------------------------
diff --git a/TAO/examples/RTScheduling/RTSchedTestLib.mpc b/TAO/examples/RTScheduling/RTSchedTestLib.mpc
index 1db65b1257d..43e0a70c442 100644
--- a/TAO/examples/RTScheduling/RTSchedTestLib.mpc
+++ b/TAO/examples/RTScheduling/RTSchedTestLib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTSchedTestLib): naming, rtscheduling, negotiate_codesets, rtportableserver, rtcorba {
after += Job
libs += Job RTSchedSynch
diff --git a/TAO/examples/RTScheduling/Synch.mpc b/TAO/examples/RTScheduling/Synch.mpc
index 77a2ae1d681..3f7a7e08081 100644
--- a/TAO/examples/RTScheduling/Synch.mpc
+++ b/TAO/examples/RTScheduling/Synch.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTSchedSynch): portableserver {
idlflags += -St \
-Wb,export_macro=SYNCH_Export \
diff --git a/TAO/examples/RTScheduling/job_export.h b/TAO/examples/RTScheduling/job_export.h
index ce66aa0fdbb..1d2ef2b6da0 100644
--- a/TAO/examples/RTScheduling/job_export.h
+++ b/TAO/examples/RTScheduling/job_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl SYNCH
// ------------------------------
diff --git a/TAO/examples/RTScheduling/rtschedtestlib_export.h b/TAO/examples/RTScheduling/rtschedtestlib_export.h
index f0af7a1a282..42b430af689 100644
--- a/TAO/examples/RTScheduling/rtschedtestlib_export.h
+++ b/TAO/examples/RTScheduling/rtschedtestlib_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl SYNCH
// ------------------------------
diff --git a/TAO/examples/RTScheduling/synch_export.h b/TAO/examples/RTScheduling/synch_export.h
index eed7a51efcc..96a49576df4 100644
--- a/TAO/examples/RTScheduling/synch_export.h
+++ b/TAO/examples/RTScheduling/synch_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl SYNCH
// ------------------------------
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 4ecda885ac7..131ecc962d1 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_UTIL_C
#define SIMPLE_UTIL_C
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index 0e06d61a688..7ce8ccbb7b0 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AccountManager_i.h"
#include "Account_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp
index ab95ce86fc1..799af2aac41 100644
--- a/TAO/examples/Simple/bank/Account_i.cpp
+++ b/TAO/examples/Simple/bank/Account_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Account_i.h"
// Constructor
diff --git a/TAO/examples/Simple/bank/Bank.idl b/TAO/examples/Simple/bank/Bank.idl
index 7061fcaf462..b08174d10e1 100644
--- a/TAO/examples/Simple/bank/Bank.idl
+++ b/TAO/examples/Simple/bank/Bank.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
module Bank
{
// = TITLE
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index 34179d05bdd..8538b3889ca 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
Bank.idl
diff --git a/TAO/examples/Simple/bank/client.cpp b/TAO/examples/Simple/bank/client.cpp
index 297d3e5527f..668808968a9 100644
--- a/TAO/examples/Simple/bank/client.cpp
+++ b/TAO/examples/Simple/bank/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Bank_Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index 63cd167bf87..17585f3e419 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "AccountManager_i.h"
diff --git a/TAO/examples/Simple/chat/Broadcaster.idl b/TAO/examples/Simple/chat/Broadcaster.idl
index 2704650fb74..44d175c9755 100644
--- a/TAO/examples/Simple/chat/Broadcaster.idl
+++ b/TAO/examples/Simple/chat/Broadcaster.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Receiver.idl"
interface Broadcaster
diff --git a/TAO/examples/Simple/chat/Receiver.idl b/TAO/examples/Simple/chat/Receiver.idl
index 90ea6570071..9ccca7244d1 100644
--- a/TAO/examples/Simple/chat/Receiver.idl
+++ b/TAO/examples/Simple/chat/Receiver.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface Receiver
{
// = TITLE
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index 074729eee76..e341d8d7773 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Receiver.idl
diff --git a/TAO/examples/Simple/echo/Echo.idl b/TAO/examples/Simple/echo/Echo.idl
index 993d08612bd..ffc69e77ab6 100644
--- a/TAO/examples/Simple/echo/Echo.idl
+++ b/TAO/examples/Simple/echo/Echo.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#if !defined (_ECHO_IDL)
#define _ECHO_IDL
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index f3e45069e40..c96b220634c 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_i.h"
// Constructor.
diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc
index 8cf5cd00295..942f1e502e2 100644
--- a/TAO/examples/Simple/echo/echo.mpc
+++ b/TAO/examples/Simple/echo/echo.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Echo.idl
diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index 4c9ab20ae95..a49faf9c04e 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "Echo_i.h"
diff --git a/TAO/examples/Simple/grid/Grid.idl b/TAO/examples/Simple/grid/Grid.idl
index 1a1c14bc1b4..f356da4a95a 100644
--- a/TAO/examples/Simple/grid/Grid.idl
+++ b/TAO/examples/Simple/grid/Grid.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
interface Grid
{
// = TITLE
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index a06e6bea30a..df8733c3027 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Grid_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/examples/Simple/grid/client.cpp b/TAO/examples/Simple/grid/client.cpp
index 80e59a5b0a7..3e32772a96d 100644
--- a/TAO/examples/Simple/grid/client.cpp
+++ b/TAO/examples/Simple/grid/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Grid_Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index b1560d75e3d..b616d1981f8 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Grid.idl
diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index ed349bf0ecd..7069e3acc74 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "Grid_i.h"
diff --git a/TAO/examples/Simple/time-date/Alt_Resource_Factory.h b/TAO/examples/Simple/time-date/Alt_Resource_Factory.h
index 34bcb27cebf..463e0e5cec3 100644
--- a/TAO/examples/Simple/time-date/Alt_Resource_Factory.h
+++ b/TAO/examples/Simple/time-date/Alt_Resource_Factory.h
@@ -1,5 +1,3 @@
-// $Id$
-
// Definition for Win32 Export directives.
// This file is generated automatically by
// ${ACE_ROOT}/GenExportH.BAT
diff --git a/TAO/examples/Simple/time-date/Simple_time_date.mpc b/TAO/examples/Simple/time-date/Simple_time_date.mpc
index 7eaefad4fc4..692e8c64d8f 100644
--- a/TAO/examples/Simple/time-date/Simple_time_date.mpc
+++ b/TAO/examples/Simple/time-date/Simple_time_date.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*lib): portableserver, taolib_with_idl {
sharedname = Time_Date
// The svc conf files assume that the dll is in the current directory
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index b98abc6a2d0..935af26ce7c 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ACE_BUILD_SVC_DLL
# define ACE_BUILD_SVC_DLL
#endif
diff --git a/TAO/examples/Simple/time-date/Time_Date.idl b/TAO/examples/Simple/time-date/Time_Date.idl
index f32d58e2b6b..2fea0aafb1d 100644
--- a/TAO/examples/Simple/time-date/Time_Date.idl
+++ b/TAO/examples/Simple/time-date/Time_Date.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
interface Time_Date
{
// = TITLE
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index 8a0fe5c13e6..05d0a085854 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Time_Date_i.h"
#include "ace/OS_NS_time.h"
#include "ace/Reactor.h"
diff --git a/TAO/examples/Simple/time-date/client.cpp b/TAO/examples/Simple/time-date/client.cpp
index b29c342665f..38575d118d1 100644
--- a/TAO/examples/Simple/time-date/client.cpp
+++ b/TAO/examples/Simple/time-date/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Time_Date_Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Simple/time/Time.idl b/TAO/examples/Simple/time/Time.idl
index 3d07b80659f..f58b2eaec33 100644
--- a/TAO/examples/Simple/time/Time.idl
+++ b/TAO/examples/Simple/time/Time.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface Time
{
// = TITLE
diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp
index 1d4fc6c70e0..e65b6add559 100644
--- a/TAO/examples/Simple/time/Time_i.cpp
+++ b/TAO/examples/Simple/time/Time_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Time_i.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index 37d0a64e62c..2a7be01b8ba 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "Time_i.h"
diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc
index e48f95033bc..51ceed80494 100644
--- a/TAO/examples/Simple/time/time.mpc
+++ b/TAO/examples/Simple/time/time.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Time.idl
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
index dd3b916adb2..3558942289e 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
gendir = .
diff --git a/TAO/examples/Simulator/NavWeap.idl b/TAO/examples/Simulator/NavWeap.idl
index e2478529262..8044fa72dc2 100644
--- a/TAO/examples/Simulator/NavWeap.idl
+++ b/TAO/examples/Simulator/NavWeap.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// =========================================================================================================
//
// = FILE
diff --git a/TAO/examples/Simulator/Persian.idl b/TAO/examples/Simulator/Persian.idl
index cca3dfb14d8..fc10d9aa80b 100644
--- a/TAO/examples/Simulator/Persian.idl
+++ b/TAO/examples/Simulator/Persian.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// ===========================================================================
//
// = FILE
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
index 6cdef42a6a3..3b01e89fbec 100644
--- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
+++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (TypeCode_Creation_Test) : taoclient, typecodefactory {
exename = create_tc
Source_Files {
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index 93e39c2ac0c..ba0c21c4a93 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/IFR_Client/IFR_BasicC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
diff --git a/TAO/examples/ior_corbaloc/corbaloc.idl b/TAO/examples/ior_corbaloc/corbaloc.idl
index 968fb66e80e..71a220ea3ae 100644
--- a/TAO/examples/ior_corbaloc/corbaloc.idl
+++ b/TAO/examples/ior_corbaloc/corbaloc.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module corbaloc
{
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index f2c5451d7cd..46b05e70f35 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
corbaloc.idl
diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp
index b6c2cefea6d..c1eb257d44d 100644
--- a/TAO/examples/ior_corbaloc/server.cpp
+++ b/TAO/examples/ior_corbaloc/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
// server.cpp
#include "status_i.h"
diff --git a/TAO/examples/ior_corbaloc/status_i.cpp b/TAO/examples/ior_corbaloc/status_i.cpp
index ebc94e73019..d9e7c972a22 100644
--- a/TAO/examples/ior_corbaloc/status_i.cpp
+++ b/TAO/examples/ior_corbaloc/status_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "status_i.h"
corbaloc_Status_i::corbaloc_Status_i ()
diff --git a/TAO/examples/ior_corbaloc/status_i.h b/TAO/examples/ior_corbaloc/status_i.h
index 7873d238dc3..59438b1b708 100644
--- a/TAO/examples/ior_corbaloc/status_i.h
+++ b/TAO/examples/ior_corbaloc/status_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef STATUS_I_H
#define STATUS_I_H
diff --git a/TAO/examples/mfc/MainFrm.cpp b/TAO/examples/mfc/MainFrm.cpp
index 2e4f4e1db01..650259e3b71 100644
--- a/TAO/examples/mfc/MainFrm.cpp
+++ b/TAO/examples/mfc/MainFrm.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// MainFrm.cpp : implementation of the CMainFrame class
//
diff --git a/TAO/examples/mfc/MainFrm.h b/TAO/examples/mfc/MainFrm.h
index 3ec56663f6e..2e29e9f9c81 100644
--- a/TAO/examples/mfc/MainFrm.h
+++ b/TAO/examples/mfc/MainFrm.h
@@ -1,5 +1,3 @@
-// $Id$
-
// MainFrm.h : interface of the CMainFrame class
//
/////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/examples/mfc/Resource.h b/TAO/examples/mfc/Resource.h
index d0cff0d6290..b9967602d74 100644
--- a/TAO/examples/mfc/Resource.h
+++ b/TAO/examples/mfc/Resource.h
@@ -1,5 +1,3 @@
-// $Id$
-
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by SERVER.RC
diff --git a/TAO/examples/mfc/StdAfx.cpp b/TAO/examples/mfc/StdAfx.cpp
index 154d3b78886..bd1211b1c68 100644
--- a/TAO/examples/mfc/StdAfx.cpp
+++ b/TAO/examples/mfc/StdAfx.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// stdafx.cpp : source file that includes just the standard includes
// server.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
diff --git a/TAO/examples/mfc/StdAfx.h b/TAO/examples/mfc/StdAfx.h
index 5b6159d207a..b1ad956399b 100644
--- a/TAO/examples/mfc/StdAfx.h
+++ b/TAO/examples/mfc/StdAfx.h
@@ -1,5 +1,3 @@
-// $Id$
-
// stdafx.h : include file for standard system include files,
// or project specific include files that are used
// frequently, but are changed infrequently
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index 84859ecb403..55daf764cee 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "w32_testS.h"
#include "ace/streams.h"
diff --git a/TAO/examples/mfc/client.mpc b/TAO/examples/mfc/client.mpc
index ac08fdbb715..8ddd815e284 100644
--- a/TAO/examples/mfc/client.mpc
+++ b/TAO/examples/mfc/client.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(MFC_Client): namingexe, portableserver {
idlflags += -Wb,pch_include=StdAfx.h
diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index 8edf273928d..235478c21ba 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp : Defines the class behaviors for the application.
#include "stdafx.h"
diff --git a/TAO/examples/mfc/server.h b/TAO/examples/mfc/server.h
index 93685fdd03f..cc281431d3f 100644
--- a/TAO/examples/mfc/server.h
+++ b/TAO/examples/mfc/server.h
@@ -1,5 +1,3 @@
-// $Id$
-
// server.h : main header file for the SERVER application
//
diff --git a/TAO/examples/mfc/server.mpc b/TAO/examples/mfc/server.mpc
index 0c1bad91693..d109a479e88 100644
--- a/TAO/examples/mfc/server.mpc
+++ b/TAO/examples/mfc/server.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(MFC_Server): namingexe, portableserver, ace_mfc {
after += MFC_Client
exename = server
diff --git a/TAO/examples/mfc/serverDoc.cpp b/TAO/examples/mfc/serverDoc.cpp
index 99fe9e6b357..8941e455c90 100644
--- a/TAO/examples/mfc/serverDoc.cpp
+++ b/TAO/examples/mfc/serverDoc.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// serverDoc.cpp : implementation of the CServerDoc class
#include "stdafx.h"
diff --git a/TAO/examples/mfc/serverDoc.h b/TAO/examples/mfc/serverDoc.h
index 1c5e90fd4b4..7abfa6f910a 100644
--- a/TAO/examples/mfc/serverDoc.h
+++ b/TAO/examples/mfc/serverDoc.h
@@ -1,5 +1,3 @@
-// $Id$
-
// serverDoc.h : interface of the CServerDoc class
//
/////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/examples/mfc/serverView.cpp b/TAO/examples/mfc/serverView.cpp
index de68f815540..d5c50850b4c 100644
--- a/TAO/examples/mfc/serverView.cpp
+++ b/TAO/examples/mfc/serverView.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// serverView.cpp : implementation of the CServerView class
#include "stdafx.h"
diff --git a/TAO/examples/mfc/serverView.h b/TAO/examples/mfc/serverView.h
index 87a80348ea8..25c5a1714be 100644
--- a/TAO/examples/mfc/serverView.h
+++ b/TAO/examples/mfc/serverView.h
@@ -1,5 +1,3 @@
-// $Id$
-
// serverView.h : interface of the CServerView class
//
/////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/examples/mfc/w32_test.idl b/TAO/examples/mfc/w32_test.idl
index 4f6423e2ad5..56e33c88e7d 100644
--- a/TAO/examples/mfc/w32_test.idl
+++ b/TAO/examples/mfc/w32_test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface W32_Test_Interface
{
// = TITLE
diff --git a/TAO/examples/mfc/w32_test_impl.cpp b/TAO/examples/mfc/w32_test_impl.cpp
index 0deb96a2837..eecacc3dbc4 100644
--- a/TAO/examples/mfc/w32_test_impl.cpp
+++ b/TAO/examples/mfc/w32_test_impl.cpp
@@ -1,7 +1,5 @@
#include "StdAfx.h"
-// $Id$
-
#include "w32_test_impl.h"
W32_Test_Impl::~W32_Test_Impl (void)
diff --git a/TAO/examples/mfc/w32_test_impl.h b/TAO/examples/mfc/w32_test_impl.h
index 846029aa05a..1022be5cf40 100644
--- a/TAO/examples/mfc/w32_test_impl.h
+++ b/TAO/examples/mfc/w32_test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef w32_test_impl_h
#define w32_test_impl_h