summaryrefslogtreecommitdiff
path: root/TAO/tests
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
commitc88815f2039e7152d735c18650c102df84d9aa36 (patch)
treea703b59c98e6739970c4f3b51396c2284c9ce12b /TAO/tests
parent0fbdabcd0a8970712cbbdef06465d061a4ec13c4 (diff)
downloadATCD-c88815f2039e7152d735c18650c102df84d9aa36.tar.gz
Removed single line Id tag
Diffstat (limited to 'TAO/tests')
-rw-r--r--TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc2
-rw-r--r--TAO/tests/AMH_Exceptions/client.cpp2
-rw-r--r--TAO/tests/AMH_Exceptions/server.cpp2
-rw-r--r--TAO/tests/AMH_Oneway/AMH_Oneway.mpc2
-rw-r--r--TAO/tests/AMH_Oneway/client.cpp2
-rw-r--r--TAO/tests/AMH_Oneway/server.cpp2
-rw-r--r--TAO/tests/AMI/AMI.mpc2
-rw-r--r--TAO/tests/AMI_Buffering/AMI_Buffering.mpc2
-rw-r--r--TAO/tests/AMI_Buffering/admin.cpp2
-rw-r--r--TAO/tests/AMI_Buffering/client.cpp2
-rw-r--r--TAO/tests/AMI_Buffering/server.cpp2
-rw-r--r--TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc2
-rw-r--r--TAO/tests/Abstract_Interface/Abstract_Interface.mpc2
-rw-r--r--TAO/tests/Abstract_Interface/client.cpp2
-rw-r--r--TAO/tests/Abstract_Interface/server.cpp2
-rw-r--r--TAO/tests/Abstract_Interface/test.idl2
-rw-r--r--TAO/tests/Abstract_Interface/test_i.cpp2
-rw-r--r--TAO/tests/Abstract_Interface/test_i.h2
-rw-r--r--TAO/tests/Alt_Mapping/alt_mapping.idl2
-rw-r--r--TAO/tests/Alt_Mapping/alt_mapping.mpc2
-rw-r--r--TAO/tests/Any/Indirected/client.cpp2
-rw-r--r--TAO/tests/Any/Recursive/Hello.cpp2
-rw-r--r--TAO/tests/Any/Recursive/NonRecursive.idl1
-rw-r--r--TAO/tests/Any/Recursive/client.cpp2
-rw-r--r--TAO/tests/Any/Recursive/server.cpp2
-rw-r--r--TAO/tests/BiDirectional/BiDirectional.mpc2
-rw-r--r--TAO/tests/BiDirectional/client.cpp2
-rw-r--r--TAO/tests/BiDirectional/server.cpp2
-rw-r--r--TAO/tests/BiDirectional/test_i.cpp2
-rw-r--r--TAO/tests/BiDirectional/test_i.inl2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/client.cpp2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/server.cpp2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/test_i.inl2
-rw-r--r--TAO/tests/BiDirectional_MultipleORB/destroy.mpc2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/client.cpp2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/server.cpp2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/test_i.cpp2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/test_i.inl2
-rw-r--r--TAO/tests/Big_AMI/Big_AMI.mpc2
-rw-r--r--TAO/tests/Big_Oneways/Big_Oneways.mpc2
-rw-r--r--TAO/tests/Big_Oneways/client.cpp2
-rw-r--r--TAO/tests/Big_Oneways/server.cpp2
-rw-r--r--TAO/tests/Big_Reply/Big_Reply.mpc2
-rw-r--r--TAO/tests/Big_Reply/client.cpp2
-rw-r--r--TAO/tests/Big_Reply/server.cpp2
-rw-r--r--TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc2
-rw-r--r--TAO/tests/Big_Request_Muxing/client.cpp2
-rw-r--r--TAO/tests/Big_Request_Muxing/server.cpp2
-rw-r--r--TAO/tests/Big_Twoways/Big_Twoways.mpc2
-rw-r--r--TAO/tests/Big_Twoways/client.cpp2
-rw-r--r--TAO/tests/Big_Twoways/server.cpp2
-rw-r--r--TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc2
-rw-r--r--TAO/tests/Blocking_Sync_None/client.cpp2
-rw-r--r--TAO/tests/Blocking_Sync_None/server.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Echo.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1020_Regression/Server_i.cpp2
-rw-r--r--TAO/tests/Bug_1020_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1020_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1254_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1254_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1269_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1269_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1269_Regression/shutdown.cpp2
-rw-r--r--TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1270_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1270_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1270_Regression/shutdown.cpp2
-rw-r--r--TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp2
-rw-r--r--TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h2
-rw-r--r--TAO/tests/Bug_1361_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1361_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1361_Regression/shutdown.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1383_Regression/Callee_i.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/Callee_i.h2
-rw-r--r--TAO/tests/Bug_1383_Regression/SimpleClient.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/SimpleServer.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/callee.idl2
-rw-r--r--TAO/tests/Bug_1383_Regression/simple.idl2
-rw-r--r--TAO/tests/Bug_1383_Regression/simple_i.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/simple_i.h2
-rw-r--r--TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1476_Regression/Sender_i.cpp2
-rw-r--r--TAO/tests/Bug_1476_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1476_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc2
-rw-r--r--TAO/tests/Bug_1476_Test/client.cpp2
-rw-r--r--TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1482_Regression/Reply_Handler.cpp1
-rw-r--r--TAO/tests/Bug_1482_Regression/Reply_Handler.h1
-rw-r--r--TAO/tests/Bug_1482_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1482_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1495_Regression/Bug_1495.mpc2
-rw-r--r--TAO/tests/Bug_1495_Regression/Threaded_Server.cpp2
-rw-r--r--TAO/tests/Bug_1495_Regression/client_interceptor.cpp2
-rw-r--r--TAO/tests/Bug_1495_Regression/server_interceptor.cpp2
-rw-r--r--TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1535_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1551_Regression/Client_Task.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/Reply_Handler.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1636_Regression/test.mpc2
-rw-r--r--TAO/tests/Bug_1639_Regression/test.mpc2
-rw-r--r--TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1676_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1676_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc2
-rw-r--r--TAO/tests/Bug_1693_Test/client.cpp2
-rw-r--r--TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc2
-rw-r--r--TAO/tests/Bug_1812_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_1812_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc2
-rw-r--r--TAO/tests/Bug_1813_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_1813_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_1869_Regression/AMI.idl2
-rw-r--r--TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1869_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1869_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1904_Regression/test.cpp1
-rw-r--r--TAO/tests/Bug_1904_Regression/test.idl1
-rw-r--r--TAO/tests/Bug_1904_Regression/test.mpc1
-rw-r--r--TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp2
-rw-r--r--TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2119_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_2119_Regression/test.mpc2
-rw-r--r--TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2134_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2134_Regression/Hello.idl2
-rw-r--r--TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2144_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2174_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2174_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2174_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2183_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2183_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2186_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2186_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2188_Regression/broken.mpc2
-rw-r--r--TAO/tests/Bug_2188_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2188_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2201_Regression/TestData.idl2
-rw-r--r--TAO/tests/Bug_2201_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2222_Regression/TestCase.idl2
-rw-r--r--TAO/tests/Bug_2222_Regression/TestType.idl2
-rw-r--r--TAO/tests/Bug_2222_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2234_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2234_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2234_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp1
-rw-r--r--TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2289_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2319_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2328_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2328_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2345_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2349_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2349_Regression/foo.idl2
-rw-r--r--TAO/tests/Bug_2349_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc1
-rw-r--r--TAO/tests/Bug_2375_Regression/test.cpp1
-rw-r--r--TAO/tests/Bug_2375_Regression/test.idl1
-rw-r--r--TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc1
-rw-r--r--TAO/tests/Bug_2399_Regression/included.idl2
-rw-r--r--TAO/tests/Bug_2399_Regression/mytmp/included.idl2
-rw-r--r--TAO/tests/Bug_2399_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2399_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2417_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/publisher.idl2
-rw-r--r--TAO/tests/Bug_2417_Regression/publisher_impl.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/publisher_impl.h2
-rw-r--r--TAO/tests/Bug_2417_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/subscriber.idl2
-rw-r--r--TAO/tests/Bug_2417_Regression/subscriber_impl.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/subscriber_impl.h2
-rw-r--r--TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc1
-rw-r--r--TAO/tests/Bug_2419_Regression/abstract_parent.idl2
-rw-r--r--TAO/tests/Bug_2419_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2419_Regression/local_child.idl1
-rw-r--r--TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc1
-rw-r--r--TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl1
-rw-r--r--TAO/tests/Bug_2424_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2429_Regression/Child.idl2
-rw-r--r--TAO/tests/Bug_2429_Regression/ChildServant.cpp2
-rw-r--r--TAO/tests/Bug_2429_Regression/ChildServant.h2
-rw-r--r--TAO/tests/Bug_2429_Regression/Parent.idl2
-rw-r--r--TAO/tests/Bug_2429_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2429_Regression/server.cpp1
-rw-r--r--TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2494_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2494_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2494_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_2494_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_2494_Regression/test_i.inl2
-rw-r--r--TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2503_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2503_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/common.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/common.h2
-rw-r--r--TAO/tests/Bug_2503_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2542_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp2
-rw-r--r--TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2543_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp2
-rw-r--r--TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2549_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2549_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2593_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2593_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2595_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2595_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2654_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2654_Regression/Hello.h2
-rw-r--r--TAO/tests/Bug_2654_Regression/Hello.idl2
-rw-r--r--TAO/tests/Bug_2654_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2654_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2677_Regression/DllORB.cpp1
-rw-r--r--TAO/tests/Bug_2677_Regression/DllORB.h1
-rw-r--r--TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h1
-rw-r--r--TAO/tests/Bug_2677_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2678_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2678_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2678_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_2683_Regression/IORTable.mpc2
-rw-r--r--TAO/tests/Bug_2683_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2683_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2702_Regression/CloseConnection.mpc2
-rw-r--r--TAO/tests/Bug_2702_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2734_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2734_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2734_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2735_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2768_Regression/Messenger_i.cpp2
-rw-r--r--TAO/tests/Bug_2768_Regression/Messenger_i.h2
-rw-r--r--TAO/tests/Bug_2768_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2768_Regression/server.cpp2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/Message.idl2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/MessageFactory.cpp2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/MessageFactory.h2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/Message_i.cpp2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/Message_i.h2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2792_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2795_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2804_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2804_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2804_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2809_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp2
-rw-r--r--TAO/tests/Bug_2826_Regression/foo.idl2
-rw-r--r--TAO/tests/Bug_2844_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2844_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2844_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2869_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2918_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2918_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2918_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2918_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2935_Regression/ThreeTier.idl2
-rw-r--r--TAO/tests/Bug_2935_Regression/middle.cpp1
-rw-r--r--TAO/tests/Bug_2935_Regression/middle_i.cpp2
-rw-r--r--TAO/tests/Bug_2935_Regression/sink.cpp1
-rw-r--r--TAO/tests/Bug_2935_Regression/sink_i.cpp2
-rw-r--r--TAO/tests/Bug_2936_Regression/DllORB.cpp1
-rw-r--r--TAO/tests/Bug_2936_Regression/DllORB.h1
-rw-r--r--TAO/tests/Bug_2936_Regression/PersistentPOA.h2
-rw-r--r--TAO/tests/Bug_2936_Regression/bug2936.cpp2
-rw-r--r--TAO/tests/Bug_2936_Regression/bug2936.mpc2
-rw-r--r--TAO/tests/Bug_2936_Regression/bug2936_export.h1
-rw-r--r--TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2953_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2953_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2966_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2966_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2966_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3000_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3000_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc2
-rw-r--r--TAO/tests/Bug_3042_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3068_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3068_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3068_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3068_Regression/test_i.inl2
-rw-r--r--TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3108_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3108_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3108_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3108_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3108_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl2
-rw-r--r--TAO/tests/Bug_3154_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3163_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3163_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3171_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp2
-rw-r--r--TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3251_Regression/DllOrb.cpp2
-rw-r--r--TAO/tests/Bug_3251_Regression/DllOrb.h2
-rw-r--r--TAO/tests/Bug_3251_Regression/PersistentPoa.cpp2
-rw-r--r--TAO/tests/Bug_3251_Regression/PersistentPoa.h2
-rw-r--r--TAO/tests/Bug_3251_Regression/bug_3251_export.h1
-rw-r--r--TAO/tests/Bug_3251_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3276_Regression/Servant_Locator.cpp2
-rw-r--r--TAO/tests/Bug_3276_Regression/Servant_Locator.h2
-rw-r--r--TAO/tests/Bug_3276_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3276_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3276_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3299_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_3299_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3299_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3311_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3311_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3315_Regression/main.cpp2
-rw-r--r--TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3321_Regression/main.cpp2
-rw-r--r--TAO/tests/Bug_3333_Regression/Bug3333.mpc2
-rw-r--r--TAO/tests/Bug_3333_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3333_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/Client_i.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/Client_i.h2
-rw-r--r--TAO/tests/Bug_3384_Regression/Server_i.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/Server_i.h2
-rw-r--r--TAO/tests/Bug_3384_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_3384_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/test.mpc2
-rw-r--r--TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3430_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3430_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3471_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3471_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3479_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3479_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp2
-rw-r--r--TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3481_Regression/Foo.idl1
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service.cpp2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service.h2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service.mpc2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service_export.h1
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h1
-rw-r--r--TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl2
-rw-r--r--TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl2
-rw-r--r--TAO/tests/Bug_3506_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3506_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3513_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3513_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3514_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3514_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3524_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3524_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3524_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3531_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3531_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3531_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3531_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_3531_Regression/test_i.inl2
-rw-r--r--TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3531b_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3542_Regression/Bug_3542.mpc2
-rw-r--r--TAO/tests/Bug_3542_Regression/DllOrb.cpp2
-rw-r--r--TAO/tests/Bug_3542_Regression/DllOrb.h2
-rw-r--r--TAO/tests/Bug_3542_Regression/bug_3542_export.h1
-rw-r--r--TAO/tests/Bug_3542_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3543_Regression/master.cpp2
-rw-r--r--TAO/tests/Bug_3543_Regression/master.idl2
-rw-r--r--TAO/tests/Bug_3543_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter.idl2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h2
-rw-r--r--TAO/tests/Bug_3547_Regression/UDPTest.idl2
-rw-r--r--TAO/tests/Bug_3547_Regression/UDPTest_i.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/UDPTest_i.h2
-rw-r--r--TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3548_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3548_Regression/memeater.idl1
-rw-r--r--TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3552_Regression/check.cpp2
-rw-r--r--TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp2
-rw-r--r--TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp2
-rw-r--r--TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3558_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3558_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp2
-rw-r--r--TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc2
-rw-r--r--TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp2
-rw-r--r--TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc2
-rw-r--r--TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp2
-rw-r--r--TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc2
-rw-r--r--TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3574_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3575_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3597_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp2
-rw-r--r--TAO/tests/Bug_3598a_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3598a_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3630_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3632_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3632_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3636_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3636_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/Backend_Impl.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3647_Regression/Middle_Impl.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/backend_server.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/middle_server.cpp2
-rw-r--r--TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3674_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3674_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3676_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3676_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3683_Regression/Echo.idl2
-rw-r--r--TAO/tests/Bug_3683_Regression/Echo_i.cpp2
-rw-r--r--TAO/tests/Bug_3683_Regression/Simple_util.cpp2
-rw-r--r--TAO/tests/Bug_3683_Regression/server.cpp1
-rw-r--r--TAO/tests/Bug_3695_Regression/Bug_3695.cpp2
-rw-r--r--TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc1
-rw-r--r--TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3701_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3746_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3746_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3748_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3748_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3755_Ext_Regression/common.cpp2
-rw-r--r--TAO/tests/Bug_3755_Ext_Regression/common.h2
-rw-r--r--TAO/tests/Bug_3755_Ext_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3755_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3766_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_3766_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3766_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3790_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3790_Regression/server2.cpp2
-rw-r--r--TAO/tests/Bug_3790_Regression/simple_test.idl2
-rw-r--r--TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3821_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3821_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3826_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3827_Regression/Message.idl2
-rw-r--r--TAO/tests/Bug_3827_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3837_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3837_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3845_Regression/local_inarg.idl2
-rw-r--r--TAO/tests/Bug_3845_Regression/local_inoutarg.idl2
-rw-r--r--TAO/tests/Bug_3845_Regression/local_outarg.idl2
-rw-r--r--TAO/tests/Bug_3845_Regression/local_rettype.idl2
-rw-r--r--TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Bug_3853_Regression/Hello_i.cpp2
-rw-r--r--TAO/tests/Bug_3853_Regression/client.cpp1
-rw-r--r--TAO/tests/Bug_3853_Regression/client_interceptor.cpp2
-rw-r--r--TAO/tests/Bug_3853_Regression/server.cpp1
-rw-r--r--TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3896_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_3896_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3896_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3919_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_3919_Regression/Test2.idl2
-rw-r--r--TAO/tests/Bug_3919_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3919_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Bug_3926_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3926_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3941_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3941_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp1
-rw-r--r--TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc1
-rw-r--r--TAO/tests/Bug_3942_Regression/Foo.idl2
-rw-r--r--TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3953_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3953_Regression/client_i.cpp2
-rw-r--r--TAO/tests/Bug_3953_Regression/client_i.h2
-rw-r--r--TAO/tests/Bug_3953_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3953_Regression/server_i.cpp2
-rw-r--r--TAO/tests/Bug_3953_Regression/server_i.h2
-rw-r--r--TAO/tests/Bug_3953_Regression/test.idl1
-rw-r--r--TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3954_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_3954_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3954_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc2
-rw-r--r--TAO/tests/Bug_4010_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_4010_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_4010_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc2
-rw-r--r--TAO/tests/Bug_4059_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_4059_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_4059_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp1
-rw-r--r--TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl1
-rw-r--r--TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc1
-rw-r--r--TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp2
-rw-r--r--TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl2
-rw-r--r--TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc2
-rw-r--r--TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc2
-rw-r--r--TAO/tests/Bug_933_Regression/Messenger.idl2
-rw-r--r--TAO/tests/Bug_933_Regression/MessengerClient.cpp2
-rw-r--r--TAO/tests/Bug_933_Regression/MessengerServer.cpp2
-rw-r--r--TAO/tests/Bug_933_Regression/Messenger_i.cpp2
-rw-r--r--TAO/tests/Bug_933_Regression/Messenger_i.h2
-rw-r--r--TAO/tests/CDR/CDR.mpc2
-rw-r--r--TAO/tests/COIOP/COIOP_Tests.mpc2
-rw-r--r--TAO/tests/COIOP/Client_Task.cpp2
-rw-r--r--TAO/tests/COIOP/Hello.cpp2
-rw-r--r--TAO/tests/COIOP/Server_Task.cpp2
-rw-r--r--TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc2
-rw-r--r--TAO/tests/CORBA_e_Implicit_Activation/server.cpp2
-rw-r--r--TAO/tests/CSD_Collocation/CSD_Collocation.mpc2
-rw-r--r--TAO/tests/CSD_Collocation/Collocation.cpp2
-rw-r--r--TAO/tests/CSD_Collocation/Collocation_Tester.cpp2
-rw-r--r--TAO/tests/CSD_Collocation/Diamond.idl2
-rw-r--r--TAO/tests/CSD_Collocation/Diamond_i.cpp2
-rw-r--r--TAO/tests/CSD_Collocation/Diamond_i.h2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp1
-rw-r--r--TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc2
-rw-r--r--TAO/tests/Cache_Growth_Test/client.cpp2
-rw-r--r--TAO/tests/Cache_Growth_Test/server.cpp2
-rw-r--r--TAO/tests/CallbackTest/CallbackTest.mpc2
-rw-r--r--TAO/tests/CallbackTest/client.cpp2
-rw-r--r--TAO/tests/CallbackTest/server.cpp2
-rw-r--r--TAO/tests/ClientPortSpan/ClientPortSpan.mpc2
-rw-r--r--TAO/tests/ClientPortSpan/Hello.cpp1
-rw-r--r--TAO/tests/ClientPortSpan/client.cpp2
-rw-r--r--TAO/tests/ClientPortSpan/server.cpp2
-rw-r--r--TAO/tests/Client_Leaks/Client_Leaks.mpc2
-rw-r--r--TAO/tests/Client_Leaks/child.cpp2
-rw-r--r--TAO/tests/Client_Leaks/client.cpp2
-rw-r--r--TAO/tests/Client_Leaks/server.cpp2
-rw-r--r--TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc2
-rw-r--r--TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_export.h1
-rw-r--r--TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc2
-rw-r--r--TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp2
-rw-r--r--TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_export.h1
-rw-r--r--TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc2
-rw-r--r--TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h1
-rw-r--r--TAO/tests/CodeSets/simple/CodeSets_simple.mpc2
-rw-r--r--TAO/tests/CodeSets/simple/simple.idl2
-rw-r--r--TAO/tests/Codec/Codec.mpc2
-rw-r--r--TAO/tests/Codec/client.cpp2
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc2
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc2
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc2
-rw-r--r--TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc2
-rw-r--r--TAO/tests/Collocated_DerivedIF/Hello.cpp2
-rw-r--r--TAO/tests/Collocated_DerivedIF/Test.idl2
-rw-r--r--TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc2
-rw-r--r--TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h2
-rw-r--r--TAO/tests/Collocated_Forwarding/server.cpp2
-rw-r--r--TAO/tests/Collocated_Forwarding/test_i.cpp1
-rw-r--r--TAO/tests/Collocated_Forwarding/test_i.h2
-rw-r--r--TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc2
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc2
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc2
-rw-r--r--TAO/tests/Collocation/Collocation.cpp2
-rw-r--r--TAO/tests/Collocation/Collocation.mpc2
-rw-r--r--TAO/tests/Collocation/Collocation_Tester.cpp2
-rw-r--r--TAO/tests/Collocation/Diamond.idl2
-rw-r--r--TAO/tests/Collocation/Diamond_i.cpp2
-rw-r--r--TAO/tests/Collocation/Diamond_i.h2
-rw-r--r--TAO/tests/Collocation/diamond_export.h1
-rw-r--r--TAO/tests/Collocation/stub_export.h1
-rw-r--r--TAO/tests/CollocationLockup/AB.idl2
-rw-r--r--TAO/tests/CollocationLockup/CollocationLockup.cpp2
-rw-r--r--TAO/tests/CollocationLockup/CollocationLockup.mpc2
-rw-r--r--TAO/tests/CollocationLockup/SimpleNamingService.cpp2
-rw-r--r--TAO/tests/CollocationLockup/SimpleNamingService.idl2
-rw-r--r--TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc2
-rw-r--r--TAO/tests/Collocation_Exception_Test/Server_Task.cpp1
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc2
-rw-r--r--TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp2
-rw-r--r--TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc2
-rw-r--r--TAO/tests/Collocation_Tests/Collocation_Tests.mpc2
-rw-r--r--TAO/tests/Compression/Compression_Test.mpc2
-rw-r--r--TAO/tests/Compression/RLECompressorTest.cpp2
-rw-r--r--TAO/tests/Compression/bzip2server.cpp2
-rw-r--r--TAO/tests/Compression/lzoserver.cpp2
-rw-r--r--TAO/tests/Compression/zlibserver.cpp2
-rw-r--r--TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc2
-rw-r--r--TAO/tests/Connect_Strategy_Test/client.cpp2
-rw-r--r--TAO/tests/Connect_Strategy_Test/server.cpp2
-rw-r--r--TAO/tests/Connection_Failure/Connection_Failure.mpc2
-rw-r--r--TAO/tests/Connection_Failure/client.cpp2
-rw-r--r--TAO/tests/Connection_Purging/Connection_Purging.mpc2
-rw-r--r--TAO/tests/Connection_Purging/client.cpp2
-rw-r--r--TAO/tests/Connection_Purging/server.cpp2
-rw-r--r--TAO/tests/Connection_Purging/test.idl2
-rw-r--r--TAO/tests/Connection_Timeout/Connection_Timeout.mpc2
-rw-r--r--TAO/tests/Connection_Timeout/client.cpp2
-rw-r--r--TAO/tests/Crash_On_Write/Crash_On_Write.mpc2
-rw-r--r--TAO/tests/Crash_On_Write/client.cpp2
-rw-r--r--TAO/tests/Crash_On_Write/server.cpp2
-rw-r--r--TAO/tests/Crashed_Callback/Crashed_Callback.mpc2
-rw-r--r--TAO/tests/Crashed_Callback/client.cpp2
-rw-r--r--TAO/tests/Crashed_Callback/server.cpp2
-rw-r--r--TAO/tests/DII_AMI_Forward/server_interceptor.cpp2
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc2
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc2
-rw-r--r--TAO/tests/DIOP/Basic.mpc2
-rw-r--r--TAO/tests/DIOP/UDP.idl2
-rw-r--r--TAO/tests/DIOP/UDP_Client_i.cpp2
-rw-r--r--TAO/tests/DIOP/UDP_i.cpp2
-rw-r--r--TAO/tests/DLL_ORB/DLL_ORB.mpc2
-rw-r--r--TAO/tests/DLL_ORB/Test_Client_Module.cpp2
-rw-r--r--TAO/tests/DLL_ORB/Test_Client_Module_Export.h1
-rw-r--r--TAO/tests/DLL_ORB/Test_Server_Module.cpp2
-rw-r--r--TAO/tests/DLL_ORB/Test_Server_Module_Export.h1
-rw-r--r--TAO/tests/DLL_ORB/Test_i.cpp2
-rw-r--r--TAO/tests/DSI_AMH/DSI_AMH.mpc2
-rw-r--r--TAO/tests/DSI_AMH/client.cpp2
-rw-r--r--TAO/tests/DSI_AMH/server.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/client.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/gateway.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/server.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/test_dsi.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/test_dsi.inl2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/test_i.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/test_i.inl2
-rw-r--r--TAO/tests/DSI_Gateway/DSI_Gateway.mpc2
-rw-r--r--TAO/tests/DSI_Gateway/client.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/gateway.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/server.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/test_dsi.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/test_dsi.inl2
-rw-r--r--TAO/tests/DSI_Gateway/test_i.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/test_i.inl2
-rw-r--r--TAO/tests/DiffServ/client.cpp2
-rw-r--r--TAO/tests/DiffServ/diffserv.mpc2
-rw-r--r--TAO/tests/DiffServ/server.cpp2
-rw-r--r--TAO/tests/DynAny_Test/DynAny_Test.mpc2
-rw-r--r--TAO/tests/DynUnion_Test/DynUnionTest.cpp2
-rw-r--r--TAO/tests/DynUnion_Test/dynany.idl2
-rw-r--r--TAO/tests/DynUnion_Test/dynunion_test.mpc2
-rw-r--r--TAO/tests/DynValue_Test/Analyzer.cpp2
-rw-r--r--TAO/tests/DynValue_Test/Analyzer.h2
-rw-r--r--TAO/tests/DynValue_Test/DynValue_Test.idl2
-rw-r--r--TAO/tests/DynValue_Test/DynValue_Test.mpc2
-rw-r--r--TAO/tests/DynValue_Test/ValueTypes_impl.cpp2
-rw-r--r--TAO/tests/DynValue_Test/ValueTypes_impl.h2
-rw-r--r--TAO/tests/DynValue_Test/main.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/Config_Loader/Test.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Test.cpp2
-rw-r--r--TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc2
-rw-r--r--TAO/tests/Explicit_Event_Loop/time.idl2
-rw-r--r--TAO/tests/Exposed_Policies/Exposed_Policies.mpc2
-rw-r--r--TAO/tests/Exposed_Policies/Policy_Tester.cpp2
-rw-r--r--TAO/tests/Exposed_Policies/Policy_Verifier.cpp1
-rw-r--r--TAO/tests/Exposed_Policies/client.cpp2
-rw-r--r--TAO/tests/FL_Cube/FL_Cube.mpc2
-rw-r--r--TAO/tests/FL_Cube/client.cpp1
-rw-r--r--TAO/tests/FL_Cube/server.cpp2
-rw-r--r--TAO/tests/FL_Cube/test_i.cpp2
-rw-r--r--TAO/tests/Faults/Faults.mpc2
-rw-r--r--TAO/tests/Faults/client.cpp2
-rw-r--r--TAO/tests/Faults/middle.cpp2
-rw-r--r--TAO/tests/Faults/ping.cpp2
-rw-r--r--TAO/tests/Faults/ping.idl2
-rw-r--r--TAO/tests/Faults/ping_i.cpp2
-rw-r--r--TAO/tests/Faults/ping_i.inl2
-rw-r--r--TAO/tests/Faults/pong.cpp2
-rw-r--r--TAO/tests/Faults/server.cpp2
-rw-r--r--TAO/tests/Faults/test_i.cpp2
-rw-r--r--TAO/tests/Faults/test_i.inl2
-rw-r--r--TAO/tests/File_IO/File_IO.mpc2
-rw-r--r--TAO/tests/File_IO/server.cpp2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/client.cpp2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/server.cpp2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/test.idl2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/test_i.cpp2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/test_i.inl1
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/client.cpp2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/server.cpp2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/test.idl2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/test_i.cpp2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/test_i.inl2
-rw-r--r--TAO/tests/Forwarding/Forwarding.mpc2
-rw-r--r--TAO/tests/Forwarding/client.cpp2
-rw-r--r--TAO/tests/Forwarding/server.cpp2
-rw-r--r--TAO/tests/Forwarding/test.idl2
-rw-r--r--TAO/tests/Forwarding/test_i.cpp2
-rw-r--r--TAO/tests/Forwarding/test_i.inl2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp2
-rw-r--r--TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc2
-rw-r--r--TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp2
-rw-r--r--TAO/tests/HandleExhaustion/HandleExhaustion.mpc2
-rw-r--r--TAO/tests/HandleExhaustion/Test.idl2
-rw-r--r--TAO/tests/HandleExhaustion/client.cpp2
-rw-r--r--TAO/tests/HandleExhaustion/server.cpp2
-rw-r--r--TAO/tests/Hang_Shutdown/Hang.mpc2
-rw-r--r--TAO/tests/Hang_Shutdown/Test.idl2
-rw-r--r--TAO/tests/Hang_Shutdown/client.cpp2
-rw-r--r--TAO/tests/Hang_Shutdown/server.cpp2
-rw-r--r--TAO/tests/Hello/Hello.cpp1
-rw-r--r--TAO/tests/Hello/Hello.mpc2
-rw-r--r--TAO/tests/Hello/client.cpp2
-rw-r--r--TAO/tests/Hello/server.cpp2
-rw-r--r--TAO/tests/ICMG_Any_Bug/Hello.mpc2
-rw-r--r--TAO/tests/ICMG_Any_Bug/client.cpp2
-rw-r--r--TAO/tests/ICMG_Any_Bug/server.cpp2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/client.cpp2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/server.cpp2
-rw-r--r--TAO/tests/IDL_Test/Bug_2350_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2577_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2582_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2583_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2616_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2619_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_3243_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_3312_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_3819_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_3821_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/IDL_Test.mpc2
-rw-r--r--TAO/tests/IDL_Test/PEMNaming.idl2
-rw-r--r--TAO/tests/IDL_Test/attribute.idl2
-rw-r--r--TAO/tests/IDL_Test/loader_const.idl2
-rw-r--r--TAO/tests/IDL_Test/struct.idl1
-rw-r--r--TAO/tests/IDL_Test/typeprefix.idl2
-rw-r--r--TAO/tests/IORManipulation/IORManipulation.mpc2
-rw-r--r--TAO/tests/IORManipulation/IORTest.cpp2
-rw-r--r--TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc2
-rw-r--r--TAO/tests/IORManipulation/filter/Test.idl1
-rw-r--r--TAO/tests/IORManipulation/filter/server.cpp2
-rw-r--r--TAO/tests/IORTable_Locator/Test.mpc2
-rw-r--r--TAO/tests/IORTable_Locator/async_server.cpp2
-rw-r--r--TAO/tests/IORTable_Locator/client.cpp2
-rw-r--r--TAO/tests/IORTable_Locator/server.cpp2
-rw-r--r--TAO/tests/IORTable_Locator/simple_test.idl2
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp2
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp1
-rw-r--r--TAO/tests/IPV6/IPV6_Hello.mpc2
-rw-r--r--TAO/tests/IPV6/client.cpp2
-rw-r--r--TAO/tests/IPV6/server.cpp2
-rw-r--r--TAO/tests/InterOp-Naming/INS_i.cpp2
-rw-r--r--TAO/tests/InterOp-Naming/INS_test_client.cpp2
-rw-r--r--TAO/tests/InterOp-Naming/INS_test_server.cpp1
-rw-r--r--TAO/tests/InterOp-Naming/InterOp-Naming.mpc2
-rw-r--r--TAO/tests/Leader_Followers/Leader_Followers.mpc2
-rw-r--r--TAO/tests/Leader_Followers/server.cpp2
-rw-r--r--TAO/tests/Leader_Followers/test_i.cpp2
-rw-r--r--TAO/tests/LongDouble/Global.h1
-rw-r--r--TAO/tests/LongDouble/LongDoubleTest.cpp2
-rw-r--r--TAO/tests/LongDouble/LongDoubleTest.mpc2
-rw-r--r--TAO/tests/LongDouble/client.cpp2
-rw-r--r--TAO/tests/LongDouble/server.cpp2
-rw-r--r--TAO/tests/LongUpcalls/AMI_Manager.h2
-rw-r--r--TAO/tests/LongUpcalls/Controller.h2
-rw-r--r--TAO/tests/LongUpcalls/LongUpcalls.mpc2
-rw-r--r--TAO/tests/LongUpcalls/Test.idl2
-rw-r--r--TAO/tests/LongUpcalls/ami_client.cpp2
-rw-r--r--TAO/tests/LongUpcalls/ami_server.cpp2
-rw-r--r--TAO/tests/LongUpcalls/blocking_client.cpp2
-rw-r--r--TAO/tests/LongUpcalls/blocking_server.cpp2
-rw-r--r--TAO/tests/MProfile/MProfile.mpc2
-rw-r--r--TAO/tests/MProfile/client.cpp2
-rw-r--r--TAO/tests/MProfile/server.cpp2
-rw-r--r--TAO/tests/MProfile/test_i.cpp2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/client.cpp2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/server.cpp2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/test_i.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc2
-rw-r--r--TAO/tests/MProfile_Forwarding/client.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/server.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/test_i.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/test_i.inl2
-rw-r--r--TAO/tests/MT_BiDir/MT_BiDir.mpc2
-rw-r--r--TAO/tests/MT_BiDir/Sender_i.cpp2
-rw-r--r--TAO/tests/MT_BiDir/client.cpp2
-rw-r--r--TAO/tests/MT_BiDir/server.cpp2
-rw-r--r--TAO/tests/MT_Client/MT_Client.mpc2
-rw-r--r--TAO/tests/MT_Client/client.cpp2
-rw-r--r--TAO/tests/MT_Client/orb_creation.cpp2
-rw-r--r--TAO/tests/MT_Client/server.cpp2
-rw-r--r--TAO/tests/MT_Client/test_i.cpp2
-rw-r--r--TAO/tests/MT_Client/test_i.inl2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/chatter.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/client.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/police.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/police.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/server.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/worker.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/client.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/server.cpp2
-rw-r--r--TAO/tests/MT_Server/MT_Server.mpc2
-rw-r--r--TAO/tests/MT_Server/client.cpp2
-rw-r--r--TAO/tests/MT_Server/server.cpp2
-rw-r--r--TAO/tests/MT_Server/test_i.cpp2
-rw-r--r--TAO/tests/MT_Server/test_i.inl2
-rw-r--r--TAO/tests/MT_Timeout/MT_Timeout.mpc2
-rw-r--r--TAO/tests/MT_Timeout/client.cpp2
-rw-r--r--TAO/tests/MT_Timeout/server.cpp2
-rw-r--r--TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/client.cpp2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/server.cpp2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/test.idl2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/test_i.cpp2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/test_i.h2
-rw-r--r--TAO/tests/Multiple/Collocation_Tester.cpp2
-rw-r--r--TAO/tests/Multiple/Multiple.mpc2
-rw-r--r--TAO/tests/Multiple/client.cpp2
-rw-r--r--TAO/tests/Multiple/server.cpp2
-rw-r--r--TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl2
-rw-r--r--TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc2
-rw-r--r--TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h2
-rw-r--r--TAO/tests/Multiple_Inheritance/server.cpp2
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp1
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc2
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp2
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/client.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/server.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/test_i.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/test_i.inl2
-rw-r--r--TAO/tests/Muxing/Muxing.mpc2
-rw-r--r--TAO/tests/Muxing/client.cpp2
-rw-r--r--TAO/tests/Muxing/server.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/Native_Exceptions.mpc2
-rw-r--r--TAO/tests/Native_Exceptions/client.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/server.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/test_i.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/test_i.inl2
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc2
-rw-r--r--TAO/tests/NestedUpcall/Simple/Simple.mpc2
-rw-r--r--TAO/tests/NestedUpcall/Simple/client.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/client_i.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/client_i.h2
-rw-r--r--TAO/tests/NestedUpcall/Simple/server.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/server_i.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/server_i.h2
-rw-r--r--TAO/tests/NestedUpcall/Simple/simple-client.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/TT.mpc2
-rw-r--r--TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc2
-rw-r--r--TAO/tests/Nested_Event_Loop/client.cpp2
-rw-r--r--TAO/tests/Nested_Event_Loop/server.cpp2
-rw-r--r--TAO/tests/Nested_Event_Loop/test_i.cpp2
-rw-r--r--TAO/tests/Nested_Event_Loop/test_i.h2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/client.cpp2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/scavenger.cpp2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/server.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/client.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/server.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/test_i.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/test_i.h2
-rw-r--r--TAO/tests/OBV/Any/AnyS_impl.cpp2
-rw-r--r--TAO/tests/OBV/Any/OBV_Any.mpc2
-rw-r--r--TAO/tests/OBV/Any/client.cpp2
-rw-r--r--TAO/tests/OBV/Any/server.cpp2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/Test_impl.cpp2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/TreeBase.idl2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/TreeController.idl2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/TreeNode.idl2
-rw-r--r--TAO/tests/OBV/Factory/Factory.idl2
-rw-r--r--TAO/tests/OBV/Factory/FactoryC_impl.cpp2
-rw-r--r--TAO/tests/OBV/Factory/FactoryS_impl.cpp2
-rw-r--r--TAO/tests/OBV/Factory/OBV_Factory.mpc2
-rw-r--r--TAO/tests/OBV/Factory/client.cpp2
-rw-r--r--TAO/tests/OBV/Factory/server.cpp2
-rw-r--r--TAO/tests/OBV/Forward/OBV_Forward.mpc2
-rw-r--r--TAO/tests/OBV/Forward/Test_impl.cpp2
-rw-r--r--TAO/tests/OBV/Forward/TreeBase.idl2
-rw-r--r--TAO/tests/OBV/Forward/TreeController.idl2
-rw-r--r--TAO/tests/OBV/Forward/TreeNode.idl2
-rw-r--r--TAO/tests/OBV/Forward/client.cpp2
-rw-r--r--TAO/tests/OBV/Forward/server.cpp2
-rwxr-xr-xTAO/tests/OBV/Indirection/Factory.cpp1
-rwxr-xr-xTAO/tests/OBV/Indirection/Factory.h1
-rw-r--r--TAO/tests/OBV/Indirection/Indirection.mpc2
-rw-r--r--TAO/tests/OBV/Indirection/Messenger.idl2
-rw-r--r--TAO/tests/OBV/Indirection/MessengerClient.cpp2
-rw-r--r--TAO/tests/OBV/Indirection/MessengerServer.cpp2
-rw-r--r--TAO/tests/OBV/Indirection/Messenger_i.cpp2
-rw-r--r--TAO/tests/OBV/Indirection/Messenger_i.h2
-rw-r--r--TAO/tests/OBV/Simple/OBV.idl2
-rw-r--r--TAO/tests/OBV/Simple/OBV_Simple.mpc2
-rw-r--r--TAO/tests/OBV/Simple/OBV_impl.cpp2
-rw-r--r--TAO/tests/OBV/Simple/OBV_impl.h2
-rw-r--r--TAO/tests/OBV/Simple/Server_i.cpp2
-rw-r--r--TAO/tests/OBV/Simple/Simple_util.cpp2
-rw-r--r--TAO/tests/OBV/Simple/server.cpp1
-rw-r--r--TAO/tests/OBV/Supports/Supports_Test.idl2
-rw-r--r--TAO/tests/OBV/Supports/Supports_Test.mpc2
-rw-r--r--TAO/tests/OBV/Supports/Supports_Test_impl.cpp1
-rw-r--r--TAO/tests/OBV/Supports/Supports_Test_impl.h2
-rw-r--r--TAO/tests/OBV/Supports/client.cpp2
-rw-r--r--TAO/tests/OBV/Supports/server.cpp2
-rw-r--r--TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc2
-rw-r--r--TAO/tests/OBV/TC_Alignment/client.cpp2
-rw-r--r--TAO/tests/OBV/TC_Alignment/server.cpp2
-rw-r--r--TAO/tests/OBV/TC_Alignment/test_i.cpp2
-rw-r--r--TAO/tests/OBV/Truncatable/Extra.idl2
-rw-r--r--TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc2
-rw-r--r--TAO/tests/OBV/Truncatable/Truncatable.idl2
-rw-r--r--TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp2
-rw-r--r--TAO/tests/OBV/Truncatable/client.cpp2
-rw-r--r--TAO/tests/OBV/Truncatable/server.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/Test_impl.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/client.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/server.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/valuebox.idl2
-rw-r--r--TAO/tests/OBV/ValueBox/valuebox.mpc2
-rw-r--r--TAO/tests/OBV/ValueBox/vb_basic.idl2
-rw-r--r--TAO/tests/OBV/ValueBox/vb_struct.idl2
-rw-r--r--TAO/tests/OBV/ValueBox/vb_union.idl2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp1
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h1
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp1
-rw-r--r--TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Bunch/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Separation/Separation.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Separation/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h1
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Shared/Shared.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Shared/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Simple/Simple.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Simple/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h1
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h2
-rw-r--r--TAO/tests/ORB_destroy/ORB_destroy.mpc2
-rw-r--r--TAO/tests/ORB_init/ORB_init.cpp2
-rw-r--r--TAO/tests/ORB_init/ORB_init.mpc2
-rw-r--r--TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc2
-rw-r--r--TAO/tests/ORB_init/Portspan/server.cpp2
-rw-r--r--TAO/tests/ORB_init/Portspan/simple.idl2
-rw-r--r--TAO/tests/ORB_shutdown/Foo_Bar.cpp2
-rw-r--r--TAO/tests/ORB_shutdown/Foo_Bar.mpc2
-rw-r--r--TAO/tests/ORB_shutdown/server.cpp2
-rw-r--r--TAO/tests/ORT/ORT.mpc2
-rw-r--r--TAO/tests/ORT/ORT_test_IORInterceptor.cpp2
-rw-r--r--TAO/tests/ORT/ORT_test_i.cpp2
-rw-r--r--TAO/tests/ORT/ObjectReferenceFactory.cpp2
-rw-r--r--TAO/tests/ORT/ServerORBInitializer.cpp2
-rw-r--r--TAO/tests/ORT/ServerRequestInterceptor.cpp2
-rw-r--r--TAO/tests/ORT/client.cpp2
-rw-r--r--TAO/tests/ORT/server.cpp2
-rw-r--r--TAO/tests/Object_Loader/Loader.cpp2
-rw-r--r--TAO/tests/Object_Loader/OLT_Export.h1
-rw-r--r--TAO/tests/Object_Loader/Object_Loader.mpc2
-rw-r--r--TAO/tests/Object_Loader/Test.idl2
-rw-r--r--TAO/tests/Object_Loader/Test_i.cpp2
-rw-r--r--TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc2
-rw-r--r--TAO/tests/OctetSeq/OctetSeq.mpc2
-rw-r--r--TAO/tests/OctetSeq/client.cpp2
-rw-r--r--TAO/tests/OctetSeq/server.cpp2
-rw-r--r--TAO/tests/OctetSeq/test_i.cpp2
-rw-r--r--TAO/tests/OctetSeq/test_i.inl2
-rw-r--r--TAO/tests/Ondemand_Write/Hello.cpp2
-rw-r--r--TAO/tests/Ondemand_Write/Ondemand_Write.mpc2
-rw-r--r--TAO/tests/Ondemand_Write/client.cpp2
-rw-r--r--TAO/tests/Ondemand_Write/server.cpp2
-rw-r--r--TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc2
-rw-r--r--TAO/tests/Oneway_Buffering/admin.cpp2
-rw-r--r--TAO/tests/Oneway_Buffering/client.cpp2
-rw-r--r--TAO/tests/Oneway_Buffering/server.cpp2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Client.cpp2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Client.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Client_Task.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/ORB_Task.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Server.cpp2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Server.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Server_Task.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Test.idl2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Test_i.cpp2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Test_i.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/main.cpp2
-rw-r--r--TAO/tests/Oneway_Timeouts/Test.idl2
-rw-r--r--TAO/tests/Oneway_Timeouts/client.cpp2
-rw-r--r--TAO/tests/Oneway_Timeouts/server.cpp2
-rw-r--r--TAO/tests/Oneway_Timeouts/test.mpc2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/client.cpp2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/server.cpp2
-rw-r--r--TAO/tests/Optimized_Connection/Optimized_Connection.mpc2
-rw-r--r--TAO/tests/Optimized_Connection/oc_client.cpp2
-rw-r--r--TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/client.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/server.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/test_i.cpp2
-rw-r--r--TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc2
-rw-r--r--TAO/tests/POA/Bug_2511_Regression/test.idl2
-rw-r--r--TAO/tests/POA/Current/Current.mpc2
-rw-r--r--TAO/tests/POA/DSI/Database.idl2
-rw-r--r--TAO/tests/POA/DSI/Database_i.cpp2
-rw-r--r--TAO/tests/POA/DSI/Database_i.h2
-rw-r--r--TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc2
-rw-r--r--TAO/tests/POA/Deactivate_Object/server.cpp2
-rw-r--r--TAO/tests/POA/Default_Servant/Default_Servant.mpc2
-rw-r--r--TAO/tests/POA/Default_Servant/test.idl2
-rw-r--r--TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc2
-rw-r--r--TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc2
-rw-r--r--TAO/tests/POA/EndpointPolicy/client.cpp2
-rw-r--r--TAO/tests/POA/EndpointPolicy/server.cpp2
-rw-r--r--TAO/tests/POA/Etherealization/Etherealization.mpc2
-rw-r--r--TAO/tests/POA/Etherealization/test.idl2
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc2
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/test.idl2
-rw-r--r--TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc2
-rw-r--r--TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h2
-rw-r--r--TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp2
-rw-r--r--TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h2
-rw-r--r--TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc2
-rw-r--r--TAO/tests/POA/FindPOA/Adapter_Activator.cpp2
-rw-r--r--TAO/tests/POA/FindPOA/POA_FindPOA.mpc2
-rw-r--r--TAO/tests/POA/Forwarding/POA_Forwarding.mpc2
-rw-r--r--TAO/tests/POA/Forwarding/Servant_Activator.cpp2
-rw-r--r--TAO/tests/POA/Forwarding/test.idl2
-rw-r--r--TAO/tests/POA/Forwarding/test_i.cpp2
-rw-r--r--TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc1
-rw-r--r--TAO/tests/POA/Generic_Servant/client.cpp2
-rw-r--r--TAO/tests/POA/Generic_Servant/generic_servant_export.h1
-rw-r--r--TAO/tests/POA/Generic_Servant/test.idl2
-rw-r--r--TAO/tests/POA/Generic_Servant/test_i.cpp2
-rw-r--r--TAO/tests/POA/Identity/Identity.mpc2
-rw-r--r--TAO/tests/POA/Identity/test.idl2
-rw-r--r--TAO/tests/POA/Loader/POA_Loader.mpc1
-rw-r--r--TAO/tests/POA/Loader/Server_Manager.cpp2
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc2
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/test.idl2
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc2
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl2
-rw-r--r--TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc2
-rw-r--r--TAO/tests/POA/Non_Retain_System_Id/test.idl2
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc2
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/test.idl2
-rw-r--r--TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc2
-rw-r--r--TAO/tests/POA/Object_Reactivation/test.idl2
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp2
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc2
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl2
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp2
-rw-r--r--TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc2
-rw-r--r--TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc2
-rw-r--r--TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp2
-rw-r--r--TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc2
-rw-r--r--TAO/tests/POA/POA_BiDir/POA_BiDir.mpc2
-rw-r--r--TAO/tests/POA/POA_Destruction/POA_Destruction.mpc2
-rw-r--r--TAO/tests/POA/POA_Destruction/test.idl2
-rw-r--r--TAO/tests/POA/Persistent_ID/Persistent_ID.mpc2
-rw-r--r--TAO/tests/POA/Persistent_ID/test.idl2
-rw-r--r--TAO/tests/POA/Policies/Policies.mpc2
-rw-r--r--TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc2
-rw-r--r--TAO/tests/POA/Reference_Counting/Reference_Counting.mpc2
-rw-r--r--TAO/tests/POA/Reference_Counting/test.cpp2
-rw-r--r--TAO/tests/POA/RootPOA/RootPOA.mpc2
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc2
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/test.idl2
-rw-r--r--TAO/tests/POA/TIE/POA_TIE.mpc2
-rw-r--r--TAO/tests/POA/TIE/test.idl2
-rw-r--r--TAO/tests/POA/wait_for_completion/test.idl2
-rw-r--r--TAO/tests/POA/wait_for_completion/wait_for_completion.mpc2
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc2
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/client.cpp2
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/server.cpp2
-rw-r--r--TAO/tests/Param_Test/Param_Test.mpc2
-rw-r--r--TAO/tests/Permanent_Forward/Permanent_Forward.mpc2
-rw-r--r--TAO/tests/Permanent_Forward/StubTest.cpp2
-rw-r--r--TAO/tests/Policies/Manipulation.cpp2
-rw-r--r--TAO/tests/Policies/Policies.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc1
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc1
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc1
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/marker.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/marker.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2088/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h1
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Slot/driver.cpp2
-rw-r--r--TAO/tests/QtTests/QtTests.mpc2
-rw-r--r--TAO/tests/QtTests/client.cpp2
-rw-r--r--TAO/tests/QtTests/server.cpp2
-rw-r--r--TAO/tests/QtTests/test.idl2
-rw-r--r--TAO/tests/QtTests/test_i.cpp2
-rw-r--r--TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc2
-rw-r--r--TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc2
-rw-r--r--TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp2
-rw-r--r--TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl2
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc2
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc2
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc2
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Collocation/Collocation.cpp2
-rw-r--r--TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc2
-rw-r--r--TAO/tests/RTCORBA/Collocation/test.idl2
-rw-r--r--TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp2
-rw-r--r--TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp2
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc2
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/test.idl2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/ORB_init/ORB_init.cpp2
-rw-r--r--TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/test.idl2
-rw-r--r--TAO/tests/RTCORBA/Policies/Policies.mpc2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/test.idl2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp2
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc2
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl2
-rw-r--r--TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc2
-rw-r--r--TAO/tests/RTCORBA/RTMutex/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/test_i.cpp2
-rw-r--r--TAO/tests/RTCORBA/check_supported_priorities.cpp2
-rw-r--r--TAO/tests/RTCORBA/common_args.cpp2
-rw-r--r--TAO/tests/RTScheduling/Current/Current.mpc2
-rw-r--r--TAO/tests/RTScheduling/Current/Thread_Task.cpp2
-rw-r--r--TAO/tests/RTScheduling/Current/test.cpp2
-rw-r--r--TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc2
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc2
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc2
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp2
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/test.cpp2
-rw-r--r--TAO/tests/RTScheduling/VoidData/VoidData.mpc2
-rw-r--r--TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc2
-rw-r--r--TAO/tests/Reliable_Oneways/client.cpp2
-rw-r--r--TAO/tests/Reliable_Oneways/server.cpp2
-rw-r--r--TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc2
-rw-r--r--TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc2
-rw-r--r--TAO/tests/Sequence_Unit_Tests/test_macros.h2
-rw-r--r--TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc2
-rw-r--r--TAO/tests/Servant_To_Reference_Test/server.cpp2
-rw-r--r--TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc2
-rw-r--r--TAO/tests/Server_Connection_Purging/Test.idl2
-rw-r--r--TAO/tests/Server_Connection_Purging/client.cpp1
-rw-r--r--TAO/tests/Server_Connection_Purging/client2.cpp2
-rw-r--r--TAO/tests/Server_Connection_Purging/server.cpp2
-rw-r--r--TAO/tests/Server_Leaks/Server_Leaks.mpc2
-rw-r--r--TAO/tests/Server_Leaks/client.cpp2
-rw-r--r--TAO/tests/Server_Leaks/server.cpp2
-rw-r--r--TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc2
-rw-r--r--TAO/tests/Server_Port_Zero/server.cpp2
-rw-r--r--TAO/tests/Single_Read/Single_Read.mpc2
-rw-r--r--TAO/tests/Single_Read/client.cpp2
-rw-r--r--TAO/tests/Single_Read/server.cpp2
-rw-r--r--TAO/tests/Single_Read/test_i.cpp2
-rw-r--r--TAO/tests/Skeleton_Inheritance/client.cpp2
-rw-r--r--TAO/tests/Skeleton_Inheritance/interface_3_i.cpp1
-rw-r--r--TAO/tests/Skeleton_Inheritance/server.cpp2
-rw-r--r--TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/test.idl2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Diamond.idl2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Diamond_i.h2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h1
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/diamond_export.h1
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/main.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/stub_export.h1
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h2
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h2
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/test.idl2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/test.idl2
-rw-r--r--TAO/tests/Smart_Proxies/Smart_Proxies.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h2
-rw-r--r--TAO/tests/Smart_Proxies/test.idl2
-rw-r--r--TAO/tests/Stack_Recursion/Stack_Recursion.mpc2
-rw-r--r--TAO/tests/Stack_Recursion/client.cpp2
-rw-r--r--TAO/tests/Stack_Recursion/server.cpp2
-rw-r--r--TAO/tests/Storable/Savable.cpp2
-rw-r--r--TAO/tests/Storable/Savable.h2
-rw-r--r--TAO/tests/Storable/Storable.mpc2
-rw-r--r--TAO/tests/Storable/test.cpp2
-rw-r--r--TAO/tests/Strategies/Strategies.mpc2
-rw-r--r--TAO/tests/Strategies/client.cpp2
-rw-r--r--TAO/tests/Strategies/server.cpp2
-rw-r--r--TAO/tests/Strategies/simple_test_i.cpp2
-rw-r--r--TAO/tests/Strategies/simple_test_i.inl2
-rw-r--r--TAO/tests/Time_Policy/Time_Policy.mpc2
-rw-r--r--TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc2
-rw-r--r--TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp2
-rw-r--r--TAO/tests/Time_Policy_Custom/TPTest_Export.h1
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc2
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/server.cpp2
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/test_i.cpp2
-rw-r--r--TAO/tests/Timeout/Timeout.mpc2
-rw-r--r--TAO/tests/Timeout/client.cpp2
-rw-r--r--TAO/tests/Timeout/server.cpp2
-rw-r--r--TAO/tests/Timeout/test_i.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/Framework.mpc2
-rw-r--r--TAO/tests/TransportCurrent/Framework/Server_Main.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/Tester.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/client.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/server.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/simple.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP.mpc2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/client.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/server.cpp2
-rw-r--r--TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/TransportCurrent/lib/Current_Test_Export.h1
-rw-r--r--TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc2
-rw-r--r--TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp1
-rw-r--r--TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp2
-rw-r--r--TAO/tests/Transport_Cache_Manager/TCM.mpc2
-rw-r--r--TAO/tests/Transport_Cache_Manager/mock_ps.h2
-rw-r--r--TAO/tests/Transport_Cache_Manager/mock_tdi.h2
-rw-r--r--TAO/tests/Transport_Cache_Manager/mock_transport.h2
-rw-r--r--TAO/tests/Two_Objects/Second_i.cpp2
-rw-r--r--TAO/tests/Two_Objects/Two_Objects.mpc2
-rw-r--r--TAO/tests/Two_Objects/client.cpp2
-rw-r--r--TAO/tests/Two_Objects/server.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/client.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/server.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/test.idl2
-rw-r--r--TAO/tests/Typedef_String_Array/testImpl.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/testImpl.h2
-rw-r--r--TAO/tests/Typedef_String_Array/typedef_string_array.mpc2
-rw-r--r--TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc2
-rw-r--r--TAO/tests/UNKNOWN_Exception/client.cpp2
-rw-r--r--TAO/tests/UNKNOWN_Exception/server.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/Control.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc2
-rw-r--r--TAO/tests/Xt_Stopwatch/client.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/server.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/test.idl2
-rw-r--r--TAO/tests/Xt_Stopwatch/test_i.cpp2
-rw-r--r--TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp2
-rw-r--r--TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp2
-rw-r--r--TAO/tests/ZIOP/TestCompressor/TestCompressor_export.h1
-rw-r--r--TAO/tests/ZIOP/ZIOP.mpc2
-rw-r--r--TAO/tests/ZIOP/client.cpp2
-rw-r--r--TAO/tests/ZIOP/common.h2
-rw-r--r--TAO/tests/ZIOP/server.cpp2
-rw-r--r--TAO/tests/objref_comparison_test/foo.idl2
-rw-r--r--TAO/tests/objref_comparison_test/main.cpp2
-rw-r--r--TAO/tests/objref_comparison_test/objref_comparison_test.mpc2
1743 files changed, 0 insertions, 3304 deletions
diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
index c47777077d8..971dbd7566f 100644
--- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
+++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 1f6cb71e638..f76ad509140 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 7f724da1493..83afa65ba63 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_time.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
index 8b392a2d14d..03a195dc552 100644
--- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
+++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp
index e9106a3608e..29df8c17d1b 100644
--- a/TAO/tests/AMH_Oneway/client.cpp
+++ b/TAO/tests/AMH_Oneway/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "TestC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index f54fffa08c0..88512b95d35 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -1,6 +1,4 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_unistd.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc
index f46a22df694..bdee73f2b1c 100644
--- a/TAO/tests/AMI/AMI.mpc
+++ b/TAO/tests/AMI/AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
index 2d383c84e22..0ad6d72b136 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index 18b21e61445..8c449e083ee 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMI_Buffering_Admin.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 3e722e6dbb0..a323ba68d40 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Reply_Handler.h"
#include "Client_Task.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp
index ca15e6184ec..2c0186d3b12 100644
--- a/TAO/tests/AMI_Buffering/server.cpp
+++ b/TAO/tests/AMI_Buffering/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMI_Buffering.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
index e064d725fd2..42e1f0383ca 100644
--- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
+++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
timeout.idl
diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
index 38681100160..046d40dcfa0 100644
--- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
+++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
test.idl
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index f9ce8e86e83..c0de312983e 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp
index 5a825efcfce..43563246979 100644
--- a/TAO/tests/Abstract_Interface/server.cpp
+++ b/TAO/tests/Abstract_Interface/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Abstract_Interface/test.idl b/TAO/tests/Abstract_Interface/test.idl
index 6a5d9ec4a1c..5f70fbd6655 100644
--- a/TAO/tests/Abstract_Interface/test.idl
+++ b/TAO/tests/Abstract_Interface/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
exception BadInput
{
string message;
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index 57480795547..d194ca19ed1 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h
index 90fae856475..7c103c98c8e 100644
--- a/TAO/tests/Abstract_Interface/test_i.h
+++ b/TAO/tests/Abstract_Interface/test_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_TEST_I_H
#define TAO_TEST_I_H
diff --git a/TAO/tests/Alt_Mapping/alt_mapping.idl b/TAO/tests/Alt_Mapping/alt_mapping.idl
index bd70a846da0..7bd28328100 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping.idl
+++ b/TAO/tests/Alt_Mapping/alt_mapping.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Alt_Mapping
{
string test_unbounded_string (in string s1,
diff --git a/TAO/tests/Alt_Mapping/alt_mapping.mpc b/TAO/tests/Alt_Mapping/alt_mapping.mpc
index 44dd5ab336a..a6811c8b9fc 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping.mpc
+++ b/TAO/tests/Alt_Mapping/alt_mapping.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
idlflags -= -Sa -St
diff --git a/TAO/tests/Any/Indirected/client.cpp b/TAO/tests/Any/Indirected/client.cpp
index 46a7f8bd516..6adaee0394a 100644
--- a/TAO/tests/Any/Indirected/client.cpp
+++ b/TAO/tests/Any/Indirected/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Any/Recursive/Hello.cpp
+++ b/TAO/tests/Any/Recursive/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Any/Recursive/NonRecursive.idl b/TAO/tests/Any/Recursive/NonRecursive.idl
index 1ebde843dab..9ecf951bac7 100644
--- a/TAO/tests/Any/Recursive/NonRecursive.idl
+++ b/TAO/tests/Any/Recursive/NonRecursive.idl
@@ -1,4 +1,3 @@
-// $Id$
//
// Non-recursive types for compile-time testing.
diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index 6d99fc03c9f..ca2d84d4a23 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Any/Recursive/server.cpp
+++ b/TAO/tests/Any/Recursive/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc
index 976c59d6fe7..0f2070e7c64 100644
--- a/TAO/tests/BiDirectional/BiDirectional.mpc
+++ b/TAO/tests/BiDirectional/BiDirectional.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index b950587ff83..a1890184c8d 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index 73dc9849790..e1d785b61aa 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index 7f25ec3f471..0b3be60d958 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/BiDirectional/test_i.inl b/TAO/tests/BiDirectional/test_i.inl
index 799be9fdcbe..d29fbb9f970 100644
--- a/TAO/tests/BiDirectional/test_i.inl
+++ b/TAO/tests/BiDirectional/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
index 0e9687ea3bd..5f3978d952a 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
+++ b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
index 63e24ba38f8..b3766ba9bfc 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
index 1bea3072543..1e5a97f204f 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
index df7de9fe6bd..2d2ee11a346 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl b/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl
index afb7011812e..aba644cae6f 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb, Simple_Server_ptr srv)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
index 5b30ddc1b1c..3b0e0ea127f 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, anytypecode, bidir_giop, avoids_corba_e_micro {
exename = destroy
Source_Files {
diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
index a18b24db402..ddffb4b6df8 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
+++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 3e74cbe5dc4..9707e6bb829 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index 1bea3072543..1e5a97f204f 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index 91c174281c6..42390e1554a 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.inl b/TAO/tests/BiDirectional_NestedUpcall/test_i.inl
index 799be9fdcbe..d29fbb9f970 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.inl
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc
index 54e3268e74e..d82060317d2 100644
--- a/TAO/tests/Big_AMI/Big_AMI.mpc
+++ b/TAO/tests/Big_AMI/Big_AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc
index a38f314e5ca..ef6a8e7a6ca 100644
--- a/TAO/tests/Big_Oneways/Big_Oneways.mpc
+++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp
index 5902682fe98..f0520bcce14 100644
--- a/TAO/tests/Big_Oneways/client.cpp
+++ b/TAO/tests/Big_Oneways/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer.h"
#include "ace/Get_Opt.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 3d484feaa1a..ecec4f69944 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Coordinator.h"
#include "Session_Control.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc
index ca9b2157786..43dc563cd2f 100644
--- a/TAO/tests/Big_Reply/Big_Reply.mpc
+++ b/TAO/tests/Big_Reply/Big_Reply.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index f8e4d32b6d4..3ddf68ada38 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index 4db6e458dd1..b2a8aeeb46e 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Big_Reply_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
index 2e96131b1a6..4350f93a561 100644
--- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp
index cfc0343c2d4..b12c3d046bc 100644
--- a/TAO/tests/Big_Request_Muxing/client.cpp
+++ b/TAO/tests/Big_Request_Muxing/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index 073a01cec6e..40a9f862369 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Payload_Receiver.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc
index a38f314e5ca..ef6a8e7a6ca 100644
--- a/TAO/tests/Big_Twoways/Big_Twoways.mpc
+++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp
index 5902682fe98..f0520bcce14 100644
--- a/TAO/tests/Big_Twoways/client.cpp
+++ b/TAO/tests/Big_Twoways/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer.h"
#include "ace/Get_Opt.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index bad96d106f0..824a2427154 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Coordinator.h"
#include "Session_Control.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
index 655e5e0f012..841b71481ff 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 0936113493e..3d1285e6cf5 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp
index cc426f78414..6e345e14007 100644
--- a/TAO/tests/Blocking_Sync_None/server.cpp
+++ b/TAO/tests/Blocking_Sync_None/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Blocking_Sync_None.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
index 8679ec7077d..cf99d1e778d 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
+++ b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
index f2adcb00f22..743a534c959 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
Client_Task::Client_Task (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
index 038a43fa0e9..527465413b4 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
index 00225da7ceb..775f68a3c18 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "Server_Task.h"
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
index c1b36af884d..e8aae406238 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
Server_Task::Server_Task (Test::Echo_ptr echo,
diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
index a681243525b..35578720d25 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
index 5d2ccad9a2b..ca8b03ef5e5 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "tao/ORB_Core.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
index 445797b7b2a..e4ad0687b0e 100644
--- a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
+++ b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1020_Regression/Server_i.cpp b/TAO/tests/Bug_1020_Regression/Server_i.cpp
index 7ba4adf2e3e..4307c9dcf57 100644
--- a/TAO/tests/Bug_1020_Regression/Server_i.cpp
+++ b/TAO/tests/Bug_1020_Regression/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "Server_Task.h"
diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp
index 770c576efd9..b8e4a93e240 100644
--- a/TAO/tests/Bug_1020_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "ORB_Task.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp
index 98c44f068bb..c8e74a999a7 100644
--- a/TAO/tests/Bug_1020_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "ORB_Task.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
index 1a629aa8dcf..855a65659c8 100644
--- a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
+++ b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_1254_Regression/client.cpp b/TAO/tests/Bug_1254_Regression/client.cpp
index d658ef4b1ce..8f87a04bac8 100644
--- a/TAO/tests/Bug_1254_Regression/client.cpp
+++ b/TAO/tests/Bug_1254_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp
index 6b8406adf8d..ac4911a8e8c 100644
--- a/TAO/tests/Bug_1254_Regression/server.cpp
+++ b/TAO/tests/Bug_1254_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "BlobServer.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
index 766e26c6e94..9e327377827 100644
--- a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
+++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp
index 56ff66d4927..f24ba933291 100644
--- a/TAO/tests/Bug_1269_Regression/client.cpp
+++ b/TAO/tests/Bug_1269_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp
index 01bf0aa1ebe..a66c693dd37 100644
--- a/TAO/tests/Bug_1269_Regression/server.cpp
+++ b/TAO/tests/Bug_1269_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "tao/Messaging/Messaging.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp
index cf65eed282f..2048cbef6ec 100644
--- a/TAO/tests/Bug_1269_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
index e14b0303f42..e95cc529515 100644
--- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
+++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index 3dda8c71a5a..9d29b0e2d8b 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp
index e2641efd61d..e933927d62e 100644
--- a/TAO/tests/Bug_1270_Regression/server.cpp
+++ b/TAO/tests/Bug_1270_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "tao/Messaging/Messaging.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp
index f8b1987b6d0..98d3f3b5b4d 100644
--- a/TAO/tests/Bug_1270_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
index d4952cef96b..d0f85385e84 100644
--- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
+++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
index e50d4d3e003..5077727e055 100644
--- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index 083131a18b4..ac1615c8e5d 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Thread_Pool.h"
#include "TestC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
index 4962fc5ec7f..3a899d5e404 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Task_T.h"
#include "ace/Service_Config.h"
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index bd9b8da4374..f350bcb6e29 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "ORB_Task.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp
index 7ca77b344f3..04531c71660 100644
--- a/TAO/tests/Bug_1361_Regression/server.cpp
+++ b/TAO/tests/Bug_1361_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "tao/ORB_Core.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index a128eec709f..23e34e8cdb7 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc b/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc
index 7e6a55f76da..440b805bbd8 100644
--- a/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc
+++ b/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
callee.idl
diff --git a/TAO/tests/Bug_1383_Regression/Callee_i.cpp b/TAO/tests/Bug_1383_Regression/Callee_i.cpp
index 4391097bafd..395feea2a80 100644
--- a/TAO/tests/Bug_1383_Regression/Callee_i.cpp
+++ b/TAO/tests/Bug_1383_Regression/Callee_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callee_i.h"
void Callee_i::callback (const char * message)
diff --git a/TAO/tests/Bug_1383_Regression/Callee_i.h b/TAO/tests/Bug_1383_Regression/Callee_i.h
index 30fa0cfd1ac..928a3a3ed1f 100644
--- a/TAO/tests/Bug_1383_Regression/Callee_i.h
+++ b/TAO/tests/Bug_1383_Regression/Callee_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CALLEE_I_H
#define CALLEE_I_H
diff --git a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
index 4b9cc99d591..98ae89f398b 100644
--- a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
+++ b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "ace/OS_NS_unistd.h"
#include "ace/Thread.h"
diff --git a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
index 267a6685937..6508fddf239 100644
--- a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
+++ b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "tao/IORTable/IORTable.h"
#include "simple_i.h"
diff --git a/TAO/tests/Bug_1383_Regression/callee.idl b/TAO/tests/Bug_1383_Regression/callee.idl
index 3204a4444e6..17992673573 100644
--- a/TAO/tests/Bug_1383_Regression/callee.idl
+++ b/TAO/tests/Bug_1383_Regression/callee.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Callee {
void callback(in string message);
};
diff --git a/TAO/tests/Bug_1383_Regression/simple.idl b/TAO/tests/Bug_1383_Regression/simple.idl
index 0de9ac97255..c97396ec3b6 100644
--- a/TAO/tests/Bug_1383_Regression/simple.idl
+++ b/TAO/tests/Bug_1383_Regression/simple.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_IDL
#define SIMPLE_IDL
diff --git a/TAO/tests/Bug_1383_Regression/simple_i.cpp b/TAO/tests/Bug_1383_Regression/simple_i.cpp
index db619308dbc..f6a94dabbc0 100644
--- a/TAO/tests/Bug_1383_Regression/simple_i.cpp
+++ b/TAO/tests/Bug_1383_Regression/simple_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_i.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/TAO/tests/Bug_1383_Regression/simple_i.h b/TAO/tests/Bug_1383_Regression/simple_i.h
index 4b253d48b7c..642ef9fbdbe 100644
--- a/TAO/tests/Bug_1383_Regression/simple_i.h
+++ b/TAO/tests/Bug_1383_Regression/simple_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_I_H
#define SIMPLE_I_H
diff --git a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
index 5dc0408c587..c0dcabfedc5 100644
--- a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
+++ b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
index ae31215c43d..7960342ab5a 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
Sender_i::Sender_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp
index eb78e7d3824..0ceddb42d74 100644
--- a/TAO/tests/Bug_1476_Regression/client.cpp
+++ b/TAO/tests/Bug_1476_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp
index a62738e692f..225c932dd98 100644
--- a/TAO/tests/Bug_1476_Regression/server.cpp
+++ b/TAO/tests/Bug_1476_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
#include "Server_Task.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc b/TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc
index 68795270a87..5c42696baa0 100644
--- a/TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc
+++ b/TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoidldefaults, taoclient, messaging {
idlflags += -Sa -St
diff --git a/TAO/tests/Bug_1476_Test/client.cpp b/TAO/tests/Bug_1476_Test/client.cpp
index f803832567c..c34bfb0fc68 100644
--- a/TAO/tests/Bug_1476_Test/client.cpp
+++ b/TAO/tests/Bug_1476_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HelloC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
index 21caa76af8d..97f849245ea 100644
--- a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
+++ b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, amh, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index 74d01c679a9..77f8f79a96f 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Reply_Handler.h"
Reply_Handler::Reply_Handler (CORBA::ORB_ptr o)
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.h b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
index 3c9c25afd9b..b491aa754fe 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef REPLY_HANDLER_H
#define REPLY_HANDLER_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp
index 771eb400b34..379eaa4830a 100644
--- a/TAO/tests/Bug_1482_Regression/client.cpp
+++ b/TAO/tests/Bug_1482_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp
index 83582b0ecaa..2e968a42f69 100644
--- a/TAO/tests/Bug_1482_Regression/server.cpp
+++ b/TAO/tests/Bug_1482_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
index a1d2b35a529..fca7d1c653b 100644
--- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
+++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
index d1546f48035..404ff0d981b 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_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/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
index 059bfe983b0..4bc7c2cbc34 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
index 7e3683a231e..8a13ca2fcc9 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
index 0ed4112568a..7d630044c0f 100644
--- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
+++ b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(bug_1535_regression) : taoserver, utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = bug_1535_regression
Source_Files {
diff --git a/TAO/tests/Bug_1535_Regression/Test.idl b/TAO/tests/Bug_1535_Regression/Test.idl
index c3b752788a4..f8e700d10cb 100644
--- a/TAO/tests/Bug_1535_Regression/Test.idl
+++ b/TAO/tests/Bug_1535_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
void print_hello_world();
diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
index 9b31706698f..a0d3ff9494b 100644
--- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test.h"
#include "tao/Utils/ORB_Destroyer.h"
#include "tao/Utils/RIR_Narrow.h"
diff --git a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
index 22cdec6aa4c..dfdeb10874f 100644
--- a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
+++ b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.cpp b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
index 9582472460d..3c2f6013b86 100644
--- a/TAO/tests/Bug_1551_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
Client_Task::Client_Task (Test::Hello_ptr receiver,
diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp
index 55866f53bad..2885a6c62ff 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1551_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index fb626dd6af9..5da7ffbe20b 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Reply_Handler.h"
Reply_Handler::Reply_Handler (
diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp
index 40e406e3ece..69a1d3e7a49 100644
--- a/TAO/tests/Bug_1551_Regression/server.cpp
+++ b/TAO/tests/Bug_1551_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
index aad2d3ed710..15278346daf 100644
--- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
+++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
index 3dc626dd384..1d1b217d8fb 100644
--- a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
+++ b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc b/TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc
index b0bd1069df5..82c8e7d6468 100644
--- a/TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc
+++ b/TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Bug_1635_Client): taoclient {
Source_Files {
client.cpp
diff --git a/TAO/tests/Bug_1636_Regression/test.mpc b/TAO/tests/Bug_1636_Regression/test.mpc
index 79a8483b3d4..786ece68c7a 100644
--- a/TAO/tests/Bug_1636_Regression/test.mpc
+++ b/TAO/tests/Bug_1636_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = client
diff --git a/TAO/tests/Bug_1639_Regression/test.mpc b/TAO/tests/Bug_1639_Regression/test.mpc
index 883fc1c4bd0..1dbcabd4b61 100644
--- a/TAO/tests/Bug_1639_Regression/test.mpc
+++ b/TAO/tests/Bug_1639_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (Bug_1639_testclient) : taoserver, dynamicany {
exename = client
Source_Files {
diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
index 1fe63298c85..37709fb765a 100644
--- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
+++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
index e2fbcdc3d00..18b170dbc93 100644
--- a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
+++ b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index 9aafb92d591..f4f86e89b64 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_1676_Regression/server.cpp
+++ b/TAO/tests/Bug_1676_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc b/TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc
index 8c4e0b18f2f..aee9f5b85f5 100644
--- a/TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc
+++ b/TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, codecfactory {
Source_Files {
testC.cpp
diff --git a/TAO/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp
index 9a44fb1bbee..bde40aa87ad 100644
--- a/TAO/tests/Bug_1693_Test/client.cpp
+++ b/TAO/tests/Bug_1693_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CodecFactory/CodecFactory.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc
index 679a47c31c8..ffe19a68028 100644
--- a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc
+++ b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoserver {
Source_Files {
diff --git a/TAO/tests/Bug_1812_Regression/Test.idl b/TAO/tests/Bug_1812_Regression/Test.idl
index 176f713989b..4584d1e22c8 100644
--- a/TAO/tests/Bug_1812_Regression/Test.idl
+++ b/TAO/tests/Bug_1812_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <orb.idl>
local interface foo {
diff --git a/TAO/tests/Bug_1812_Regression/test.cpp b/TAO/tests/Bug_1812_Regression/test.cpp
index f3c85fbb228..3073c4356d9 100644
--- a/TAO/tests/Bug_1812_Regression/test.cpp
+++ b/TAO/tests/Bug_1812_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
/**
diff --git a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
index 679a47c31c8..ffe19a68028 100644
--- a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
+++ b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoserver {
Source_Files {
diff --git a/TAO/tests/Bug_1813_Regression/Test.idl b/TAO/tests/Bug_1813_Regression/Test.idl
index 2b47d41dd97..4f81d103bae 100644
--- a/TAO/tests/Bug_1813_Regression/Test.idl
+++ b/TAO/tests/Bug_1813_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <orb.idl>
interface foo {
diff --git a/TAO/tests/Bug_1813_Regression/test.cpp b/TAO/tests/Bug_1813_Regression/test.cpp
index f3c85fbb228..3073c4356d9 100644
--- a/TAO/tests/Bug_1813_Regression/test.cpp
+++ b/TAO/tests/Bug_1813_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
/**
diff --git a/TAO/tests/Bug_1869_Regression/AMI.idl b/TAO/tests/Bug_1869_Regression/AMI.idl
index d0c2a9eb238..c8baae20017 100644
--- a/TAO/tests/Bug_1869_Regression/AMI.idl
+++ b/TAO/tests/Bug_1869_Regression/AMI.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module AMI_test {
interface adder {
long add(in long a, in long b);
diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
index 43315056a45..a321a58bdb7 100644
--- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
+++ b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
AMI.idl
diff --git a/TAO/tests/Bug_1869_Regression/client.cpp b/TAO/tests/Bug_1869_Regression/client.cpp
index 746e70955d5..e3282dc75c7 100644
--- a/TAO/tests/Bug_1869_Regression/client.cpp
+++ b/TAO/tests/Bug_1869_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMIS.h"
#include "ace/Task.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1869_Regression/server.cpp b/TAO/tests/Bug_1869_Regression/server.cpp
index d62cba9c8ae..ec627ac1ee2 100644
--- a/TAO/tests/Bug_1869_Regression/server.cpp
+++ b/TAO/tests/Bug_1869_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMIS.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/tests/Bug_1904_Regression/test.cpp b/TAO/tests/Bug_1904_Regression/test.cpp
index baf2e177689..2b1315f4c33 100644
--- a/TAO/tests/Bug_1904_Regression/test.cpp
+++ b/TAO/tests/Bug_1904_Regression/test.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "testS.h"
class con_i : public virtual POA_con
diff --git a/TAO/tests/Bug_1904_Regression/test.idl b/TAO/tests/Bug_1904_Regression/test.idl
index 766591f6d84..a4f4b28ffe9 100644
--- a/TAO/tests/Bug_1904_Regression/test.idl
+++ b/TAO/tests/Bug_1904_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
interface con
{
};
diff --git a/TAO/tests/Bug_1904_Regression/test.mpc b/TAO/tests/Bug_1904_Regression/test.mpc
index 083ecf74e56..9e316812771 100644
--- a/TAO/tests/Bug_1904_Regression/test.mpc
+++ b/TAO/tests/Bug_1904_Regression/test.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project : taoserver {
exename = test
Source_Files {
diff --git a/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc b/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc
index b4263adaa64..4bc3a03d3f5 100644
--- a/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc
+++ b/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
exename = server
}
diff --git a/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp b/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp
index 2eae4fa635c..f3b953d440c 100644
--- a/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp
+++ b/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Task.h"
#include "ace/Auto_Event.h"
diff --git a/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc b/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc
index b49013039ad..835cf607a3b 100644
--- a/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc
+++ b/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoclient {
}
diff --git a/TAO/tests/Bug_2119_Regression/test.idl b/TAO/tests/Bug_2119_Regression/test.idl
index d0cd1a1d262..2e3f1074ea6 100644
--- a/TAO/tests/Bug_2119_Regression/test.idl
+++ b/TAO/tests/Bug_2119_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype MyValueType;
typedef sequence<MyValueType> MyValueType_Seq;
diff --git a/TAO/tests/Bug_2119_Regression/test.mpc b/TAO/tests/Bug_2119_Regression/test.mpc
index 71c143f42b5..c24d186b5bc 100644
--- a/TAO/tests/Bug_2119_Regression/test.mpc
+++ b/TAO/tests/Bug_2119_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (tao67_test) : taolib_with_idl, valuetype, portableserver {
}
diff --git a/TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc b/TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc
index 40b148c2a0d..2a9a1a294de 100644
--- a/TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc
+++ b/TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc b/TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc
index fa752d627cf..a9401f9075e 100644
--- a/TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc
+++ b/TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoserver {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc b/TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc
index c0a8257f23e..3d2e3894433 100644
--- a/TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc
+++ b/TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
index 7ade436bd07..daa36d6dfe2 100644
--- a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
+++ b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoserver, iortable, avoids_minimum_corba, messaging {
Source_Files {
Hello.cpp
diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp
index 6a7abe0399e..8ffa2778c9c 100644
--- a/TAO/tests/Bug_2134_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2134_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "tao/IORTable/IORTable.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_2134_Regression/Hello.idl b/TAO/tests/Bug_2134_Regression/Hello.idl
index 44f72bfbfbe..a2ea951b440 100644
--- a/TAO/tests/Bug_2134_Regression/Hello.idl
+++ b/TAO/tests/Bug_2134_Regression/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
interface Hello {
void say_hello();
diff --git a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc
index 3fcbdd9dee2..872b78f1085 100644
--- a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc
+++ b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Client) : taoclient, valuetype {
exename = test
Source_Files {
diff --git a/TAO/tests/Bug_2144_Regression/test.cpp b/TAO/tests/Bug_2144_Regression/test.cpp
index e5f0c76b516..7d1a19fb791 100644
--- a/TAO/tests/Bug_2144_Regression/test.cpp
+++ b/TAO/tests/Bug_2144_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
index 9a3a20707ae..af16a49e295 100644
--- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp
index 803612e4698..7503bf4a719 100644
--- a/TAO/tests/Bug_2174_Regression/client.cpp
+++ b/TAO/tests/Bug_2174_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp
index a3187bb35a1..6558436e9de 100644
--- a/TAO/tests/Bug_2174_Regression/server.cpp
+++ b/TAO/tests/Bug_2174_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp
index 99e084474fb..f2de8bdfec6 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2174_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
index 41d5b8dfa81..4c20cc8475c 100644
--- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
+++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp
index ff81b60ec4f..de57df0556f 100644
--- a/TAO/tests/Bug_2183_Regression/client.cpp
+++ b/TAO/tests/Bug_2183_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp
index c0439be73f2..16f14a203b8 100644
--- a/TAO/tests/Bug_2183_Regression/server.cpp
+++ b/TAO/tests/Bug_2183_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
index efde33e3d93..f496b9b1291 100644
--- a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
+++ b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp
index 8fcb5bc5025..c4a4c126fe1 100644
--- a/TAO/tests/Bug_2186_Regression/client.cpp
+++ b/TAO/tests/Bug_2186_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp
index 9fa6d7173b3..a4f6a40317d 100644
--- a/TAO/tests/Bug_2186_Regression/server.cpp
+++ b/TAO/tests/Bug_2186_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2188_Regression/broken.mpc b/TAO/tests/Bug_2188_Regression/broken.mpc
index d9d85d6c1b8..2faaa3b3355 100644
--- a/TAO/tests/Bug_2188_Regression/broken.mpc
+++ b/TAO/tests/Bug_2188_Regression/broken.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
broken.idl
diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp
index 69d6e0d8854..760e604f85c 100644
--- a/TAO/tests/Bug_2188_Regression/client.cpp
+++ b/TAO/tests/Bug_2188_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "brokenC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp
index 63ff34345e6..89110ffe8e5 100644
--- a/TAO/tests/Bug_2188_Regression/server.cpp
+++ b/TAO/tests/Bug_2188_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "broken_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc b/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc
index 9130c21b40a..27c799bcf30 100644
--- a/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc
+++ b/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test): taoclient {
exename = test
Source_Files {
diff --git a/TAO/tests/Bug_2201_Regression/TestData.idl b/TAO/tests/Bug_2201_Regression/TestData.idl
index 9c205e1df77..556e2442578 100644
--- a/TAO/tests/Bug_2201_Regression/TestData.idl
+++ b/TAO/tests/Bug_2201_Regression/TestData.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module SeqTest {
typedef sequence<long> LongSeq;
diff --git a/TAO/tests/Bug_2201_Regression/test.cpp b/TAO/tests/Bug_2201_Regression/test.cpp
index 1a11bb77036..f2b6a27116c 100644
--- a/TAO/tests/Bug_2201_Regression/test.cpp
+++ b/TAO/tests/Bug_2201_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "TestDataC.h"
diff --git a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc
index cff84ebf492..ea9ece7c33c 100644
--- a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc
+++ b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_2222_Regression/TestCase.idl b/TAO/tests/Bug_2222_Regression/TestCase.idl
index 119634fdc21..b96ecdff3de 100644
--- a/TAO/tests/Bug_2222_Regression/TestCase.idl
+++ b/TAO/tests/Bug_2222_Regression/TestCase.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestType.idl"
typedef Array_Typedef Typedef_Of_Imported_Array_Typedef;
diff --git a/TAO/tests/Bug_2222_Regression/TestType.idl b/TAO/tests/Bug_2222_Regression/TestType.idl
index 408e5cf6d97..e27a0ed01cf 100644
--- a/TAO/tests/Bug_2222_Regression/TestType.idl
+++ b/TAO/tests/Bug_2222_Regression/TestType.idl
@@ -1,3 +1 @@
-// $Id$
-
typedef octet Array_Typedef[1];
diff --git a/TAO/tests/Bug_2222_Regression/test.cpp b/TAO/tests/Bug_2222_Regression/test.cpp
index ee04b647ea8..a3e4da4a06c 100644
--- a/TAO/tests/Bug_2222_Regression/test.cpp
+++ b/TAO/tests/Bug_2222_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestCaseC.h"
/**
diff --git a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
index 447b7f6dd43..f44af041529 100644
--- a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
+++ b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults,anytypecode {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2234_Regression/Test.idl b/TAO/tests/Bug_2234_Regression/Test.idl
index 662cfb2e660..a6eab054a71 100644
--- a/TAO/tests/Bug_2234_Regression/Test.idl
+++ b/TAO/tests/Bug_2234_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
struct MyNonVarStruct {
diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp
index f95bc266be0..f9c3cab03c4 100644
--- a/TAO/tests/Bug_2234_Regression/client.cpp
+++ b/TAO/tests/Bug_2234_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Regression test Bug 2234
//
// The bug manifests itself in the server.
diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index fe3be5b95db..0fc3e0396fa 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Regression test Bug 2234
//
// The bug actually manifested itself in class AnInterceptor::receive_request()
diff --git a/TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc b/TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc
index 9a975cb5ea0..32363bece8e 100644
--- a/TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc
+++ b/TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Bug_2241_Regression): taoserver {
exename = Bug_2241_Regression
}
diff --git a/TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc b/TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc
index f8ccf13a7d1..84ec0c4562a 100644
--- a/TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc
+++ b/TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe {
exename = ORB_object_to_string
}
diff --git a/TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp b/TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp
index 36f3a07098e..f3ed3df0aac 100644
--- a/TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp
+++ b/TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Adapted by Jules Colding <colding@omesc.com>
#include "tao/ORB.h"
diff --git a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
index cf4dc3f81cb..efd048956a3 100644
--- a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
+++ b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Gp -Gd
IDL_Files {
diff --git a/TAO/tests/Bug_2289_Regression/Test.idl b/TAO/tests/Bug_2289_Regression/Test.idl
index 0a599c8fbd3..50b7b89c052 100644
--- a/TAO/tests/Bug_2289_Regression/Test.idl
+++ b/TAO/tests/Bug_2289_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
typedef string MyString;
interface MyInterface
diff --git a/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc b/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
index f362da7ae93..9301a9f3a21 100644
--- a/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
+++ b/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server) : taoserver, amh {
source_files {
server.cpp
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index bae965cb495..6cad968abdb 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -1,6 +1,4 @@
-// $Id$
-
#include "ace/Thread_Manager.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
index ccb8a89d9e4..56c23b5e96c 100644
--- a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
+++ b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2328_Regression/client.cpp b/TAO/tests/Bug_2328_Regression/client.cpp
index b27a1720817..725dc324134 100644
--- a/TAO/tests/Bug_2328_Regression/client.cpp
+++ b/TAO/tests/Bug_2328_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp
index 4aba483d812..563cd9dca61 100644
--- a/TAO/tests/Bug_2328_Regression/server.cpp
+++ b/TAO/tests/Bug_2328_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
index 1f4dbfe25ff..0235de3816b 100644
--- a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
+++ b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server) : taoserver, imr_client, avoids_corba_e_micro {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_2345_Regression/server.cpp b/TAO/tests/Bug_2345_Regression/server.cpp
index 5dd67aa2b89..adc4efac59f 100644
--- a/TAO/tests/Bug_2345_Regression/server.cpp
+++ b/TAO/tests/Bug_2345_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/PortableServer.h"
#include "tao/ImR_Client/ImR_Client.h"
diff --git a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
index 28055823491..75a3b397660 100644
--- a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
+++ b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
foo.idl
diff --git a/TAO/tests/Bug_2349_Regression/client.cpp b/TAO/tests/Bug_2349_Regression/client.cpp
index 90635aa9cbe..539d859a897 100644
--- a/TAO/tests/Bug_2349_Regression/client.cpp
+++ b/TAO/tests/Bug_2349_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "fooC.h"
#include "ace/Log_Msg.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2349_Regression/foo.idl b/TAO/tests/Bug_2349_Regression/foo.idl
index a31000cea9f..caa37232c75 100644
--- a/TAO/tests/Bug_2349_Regression/foo.idl
+++ b/TAO/tests/Bug_2349_Regression/foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface foo
{
oneway void destroy ();
diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp
index c55accbf497..6e3cfe0601c 100644
--- a/TAO/tests/Bug_2349_Regression/server.cpp
+++ b/TAO/tests/Bug_2349_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "fooS.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc b/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc
index d56407ee1e2..a6e900e25e6 100644
--- a/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc
+++ b/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
index d428b0fce50..40c359df4de 100644
--- a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
+++ b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project (*Test) : taoserver, valuetype {
exename = test
Source_Files {
diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp
index 18e51e6d539..c7a97c174ca 100644
--- a/TAO/tests/Bug_2375_Regression/test.cpp
+++ b/TAO/tests/Bug_2375_Regression/test.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "testC.h"
class MyTestValuetypeFactory : public TestValuetype_init {
public:
diff --git a/TAO/tests/Bug_2375_Regression/test.idl b/TAO/tests/Bug_2375_Regression/test.idl
index a6ee7413825..e62c9b1ab34 100644
--- a/TAO/tests/Bug_2375_Regression/test.idl
+++ b/TAO/tests/Bug_2375_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
valuetype TestValuetype {
factory create(in boolean b, in short s);
};
diff --git a/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc b/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
index 6397809c1be..a4dc937e8b4 100644
--- a/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
+++ b/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project (*Test) : taoserver {
exename = test
idlflags += -t ./mytmp
diff --git a/TAO/tests/Bug_2399_Regression/included.idl b/TAO/tests/Bug_2399_Regression/included.idl
index ed8e9a102a1..6cda4c9e4b6 100644
--- a/TAO/tests/Bug_2399_Regression/included.idl
+++ b/TAO/tests/Bug_2399_Regression/included.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Parent
{
};
diff --git a/TAO/tests/Bug_2399_Regression/mytmp/included.idl b/TAO/tests/Bug_2399_Regression/mytmp/included.idl
index df4a6fa7b06..fb71a2f27d8 100644
--- a/TAO/tests/Bug_2399_Regression/mytmp/included.idl
+++ b/TAO/tests/Bug_2399_Regression/mytmp/included.idl
@@ -1,3 +1 @@
-// $Id$
-
This file should not be compiled at all.
diff --git a/TAO/tests/Bug_2399_Regression/test.cpp b/TAO/tests/Bug_2399_Regression/test.cpp
index 4b120707c8e..546f2de72db 100644
--- a/TAO/tests/Bug_2399_Regression/test.cpp
+++ b/TAO/tests/Bug_2399_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
int
diff --git a/TAO/tests/Bug_2399_Regression/test.idl b/TAO/tests/Bug_2399_Regression/test.idl
index b0e1cbac672..72441bfb55a 100644
--- a/TAO/tests/Bug_2399_Regression/test.idl
+++ b/TAO/tests/Bug_2399_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "included.idl"
interface Child : Parent
diff --git a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
index 5d7caaa5af8..10f92238eb0 100644
--- a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
+++ b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
publisher.idl
diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp
index 03297e9cbb5..e1f24e78eb7 100644
--- a/TAO/tests/Bug_2417_Regression/client.cpp
+++ b/TAO/tests/Bug_2417_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "subscriber_impl.h"
#include "publisherC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2417_Regression/publisher.idl b/TAO/tests/Bug_2417_Regression/publisher.idl
index 094eead5519..cc69d1d1591 100644
--- a/TAO/tests/Bug_2417_Regression/publisher.idl
+++ b/TAO/tests/Bug_2417_Regression/publisher.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "subscriber.idl"
interface Publisher
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
index add59e02a0f..edfd9b3a5c0 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "publisher_impl.h"
#include "ace/OS_NS_sys_time.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.h b/TAO/tests/Bug_2417_Regression/publisher_impl.h
index e33169f5ad5..e13d41f0a32 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.h
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef EXPLOIT_PUBLISHER_IMPL_H
#define EXPLOIT_PUBLISHER_IMPL_H
diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
index 2bd02da8c78..31b7f25a20a 100644
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ b/TAO/tests/Bug_2417_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "publisher_impl.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_2417_Regression/subscriber.idl b/TAO/tests/Bug_2417_Regression/subscriber.idl
index 43da8cdcdc6..956a02c7213 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber.idl
+++ b/TAO/tests/Bug_2417_Regression/subscriber.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Subscriber
{
oneway void onData(in double value);
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
index 3f9d8c2101a..6d50931dbd6 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "subscriber_impl.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.h b/TAO/tests/Bug_2417_Regression/subscriber_impl.h
index 94ec063bcf4..80bb73f5a8d 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.h
+++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef EXPLOIT_PUBLISHER_IMPL_H
#define EXPLOIT_PUBLISHER_IMPL_H
diff --git a/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc b/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc
index 073f1f25679..0b02254e3b5 100644
--- a/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc
+++ b/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project (*Client) : taoserver, messaging {
exename = client
Source_Files {
diff --git a/TAO/tests/Bug_2419_Regression/abstract_parent.idl b/TAO/tests/Bug_2419_Regression/abstract_parent.idl
index 84e5521f296..35f60b41aca 100644
--- a/TAO/tests/Bug_2419_Regression/abstract_parent.idl
+++ b/TAO/tests/Bug_2419_Regression/abstract_parent.idl
@@ -1,5 +1,3 @@
-// $Id$
-
abstract interface abstract_parent
{
void method (in abstract_parent aParent);
diff --git a/TAO/tests/Bug_2419_Regression/client.cpp b/TAO/tests/Bug_2419_Regression/client.cpp
index 9f668c8851a..4339812542b 100644
--- a/TAO/tests/Bug_2419_Regression/client.cpp
+++ b/TAO/tests/Bug_2419_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "local_childS.h"
int ACE_TMAIN (int, ACE_TCHAR*[])
diff --git a/TAO/tests/Bug_2419_Regression/local_child.idl b/TAO/tests/Bug_2419_Regression/local_child.idl
index f993399b138..1cbf65b629c 100644
--- a/TAO/tests/Bug_2419_Regression/local_child.idl
+++ b/TAO/tests/Bug_2419_Regression/local_child.idl
@@ -1,4 +1,3 @@
-// $Id$
#include "abstract_parent.idl"
local interface local_child : abstract_parent
diff --git a/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc b/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc
index 72053dc671f..ab9275fd8da 100644
--- a/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc
+++ b/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project (*Client) : taoserver {
exename = client
Source_Files {
diff --git a/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl b/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl
index 0e5d486d864..35cc3efd768 100644
--- a/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl
+++ b/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl
@@ -1,2 +1 @@
-// $Id$
/** * CORBA Common Object Services: Naming Service. * <p> * The detailed specification is available from the * <a href="http://www.omg.org">Object Management Group</a>. * * @author OMG * @version Version 00-11-01 */ module CosNaming { typedef string Istring; struct NameComponent { Istring id; Istring kind; }; typedef sequence <NameComponent> Name; enum BindingType { nobject, ncontext }; struct Binding { Name binding_name; BindingType binding_type; }; typedef sequence <Binding> BindingList; interface BindingIterator; /** * The NamingContext interface provides operations which support the following: * <ul> * <li> binding objects * <li> name resolution * <li> unbinding * <li> creating naming contexts * <li> deleting contexts * <li> listing a naming context * </ul> */ interface NamingContext { enum NotFoundReason { missing_node, not_context, not_object }; /** * Indicates the name does not identify a binding. */ exception NotFound { NotFoundReason why; Name rest_of_name; }; /** * Indicates that the implementation has given up for some reason. The * client, however, may be able to continue the operation at the returned * naming context. */ exception CannotProceed { NamingContext cxt; Name rest_of_name; }; /** * Indicates the name is invalid. (A name of length 0 is invalid; * implementations may place other restrictions on names.) */ exception InvalidName {}; /** * Indicates an object is already bound to the specified name. Only one * object can be bound to a particular name in a context. */ exception AlreadyBound {}; /** * Indicates that a naming context has bindings. */ exception NotEmpty {}; /** * Creates a binding of a name and an object in the naming * context. Naming contexts that are bound using bind do not * participate in name resolution when compound names are passed to be * resolved. A bind operation that is passed a compound name is * defined as follows: * * <pre> * ctx->bind(< c1 ; c2 ; ... ; cn >, obj) := * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->bind(< cn >, obj) * </pre> * * @parm n - binding name. * @parm obj - object to bind. * @raises AlreadyBound - if the name is bound in the context. */ void bind (in Name n, in Object obj) raises (NotFound, CannotProceed, InvalidName, AlreadyBound); /** * Creates a binding of a name and an object in the naming context * even if the name is already bound in the context. Naming contexts * that are bound using rebind do not participate in name resolution * when compound names are passed to be resolved. * * @parm n - binding name. * @parm obj - object to bind. */ void rebind (in Name n, in Object obj) raises (NotFound, CannotProceed, InvalidName); /** * Names an object that is a naming context. Naming contexts that are * bound using bind_context() participate in name resolution when * compound names are passed to be resolved. A bind_context operation * that is passed a compound name is defined as follows: * <pre> * ctx->bind_context(< c1 ; c2 ; ... ; cn >, nc) := * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->bind_context(< cn >, nc) * </pre> * * @parm n - binding name. * @parm nc - naming context to bind. * @raises AlreadyBound - if the name is bound in the context. */ void bind_context (in Name n, in NamingContext nc) raises (NotFound, CannotProceed, InvalidName, AlreadyBound); /** * Creates a binding of a name and a naming context in the naming * context even if the name is already bound in the context. Naming * contexts that are bound using rebind_context() participate in name * resolution when compound names are passed to be resolved. * * @parm n - binding name. * @parm nc - naming context to bind. */ void rebind_context (in Name n, in NamingContext nc) raises (NotFound, CannotProceed, InvalidName); /** * The resolve operation is the process of retrieving an object bound * to a name in a given context. The given name must exactly match the * bound name. The naming service does not return the type of the * object. Clients are responsible for "narrowing" the object to the * appropriate type. That is, clients typically cast the returned * object from Object to a more specialized interface. Names can have * multiple components; therefore, name resolution can traverse * multiple contexts. * A compound resolve is defined as follows: * <pre> * ctx->resolve(< c1 ; c2 ; ... ; cn >) := * ctx->resolve(< c1 ; c2 ; ... ; cn-1 >)->resolve(< cn >) * </pre> * * @parm n - binding name. * @returns bound object. */ Object resolve (in Name n) raises (NotFound, CannotProceed, InvalidName); /** * The unbind operation removes a name binding from a context. * A unbind operation that is passed a compound name is defined as follows: * <pre> * ctx->unbind(< c1 ; c2 ; ... ; cn >) := * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->unbind(< cn >) * </pre> * * @parm n - binding name. */ void unbind (in Name n) raises (NotFound, CannotProceed, InvalidName); /** * This operation returns a naming context implemented by the same * naming server as the context on which the operation was * invoked. The new context is not bound to any name. * * @returns new binding context. */ NamingContext new_context (); /** * This operation creates a new context and binds it to the name * supplied as an argument. The newly-created context is implemented * by the same naming server as the context in which it was bound * (that is, the naming server that implements the context denoted by * the name argument excluding the last component). A bind_new_context * that is passed a compound name is defined as follows: * * <pre> * ctx->bind_new_context(< c1 ; c2 ; ... ; cn >) := * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->bind_new_context(< cn >) * </pre> * * @parm n - binding name. * @returns new binding context. * @raises AlreadyBound - if the name is bound in the context. */ NamingContext bind_new_context (in Name n) raises (NotFound, CannotProceed, InvalidName, AlreadyBound); /** * The destroy operation deletes a naming context. The list operation * allows a client to iterate through a set of bindings in a naming * context. * * @raises NotEmpty - if the naming context contains bindings. */ void destroy () raises (NotEmpty); /** * The list operation returns at most the requested number of bindings in * BindingList bl. * <ul> * <li> If the naming context contains additional bindings, the list * operation returns a BindingIterator with the additional bindings. * <li> If the naming context does not contain additional bindings, the * binding iterator is a nil object reference. * </ul> * * @parm how_many - maximum number of binding to return in bl. * @parm bl - list of bindings. * @parm bi - iterator over remaining bindings. */ void list (in unsigned long how_many, out BindingList bl, out BindingIterator bi); }; /** * The BindingIterator interface allows a client to iterate through the * bindings using the next_one or next_n operations. */ interface BindingIterator { /** * This operation returns the next binding. If there are no more * bindings, false is returned. * * @parm b - next binding. */ boolean next_one (out Binding b); /** * This operation returns at most the requested number of bindings. * * @parm how_many - maximum number of binding to return in bl. * @parm bl - list of bindings. */ boolean next_n (in unsigned long how_many, out BindingList bl); /** * This operation destroys the iterator. */ void destroy (); }; /** * The NamingContextExt Interface provides the extensions to the * NamingContext Interface as proposed by the Interoperable * Naming Service Extension. */ interface NamingContextExt: NamingContext { typedef string StringName; typedef string Address; typedef string URLString; /** * This operation accepts a Name and returns a stringified Name. * * @param n - Name (a sequence of NameComponents) * @raises InvalidName - if the Name is invalid. */ StringName to_string (in Name n) raises (InvalidName); /** * This operation accepts a StringifiedName and returns a Name. * * @param n - a StringifiedName * @raises InvalidName - if the Name is invalid. */ Name to_name (in StringName sn) raises (InvalidName); /** * Indicates a syntactically invalid address component. */ exception InvalidAddress {}; /** * This operation accepts a URL address component and a stringified * name and returns a URL string. * * @param n - a Stringified name. * @raises addr - URL address component. */ URLString to_url (in Address addr, in StringName sn) raises (InvalidAddress, InvalidName); /** * This is a convenience operation that performs a resolve in the same * manner as NamingContext::resolve. * * @param n - a Stringified name. * @raises NotFound, CannotProceed, InvalidName */ Object resolve_str (in StringName n) raises (NotFound, CannotProceed, InvalidName); }; };
diff --git a/TAO/tests/Bug_2424_Regression/client.cpp b/TAO/tests/Bug_2424_Regression/client.cpp
index 10eebeb1eb9..dbe7118adda 100644
--- a/TAO/tests/Bug_2424_Regression/client.cpp
+++ b/TAO/tests/Bug_2424_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "OneLineCosNamingC.h"
int ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
index fcc7a879916..27c6a44f57c 100644
--- a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
+++ b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -GC
diff --git a/TAO/tests/Bug_2429_Regression/Child.idl b/TAO/tests/Bug_2429_Regression/Child.idl
index 166b36367ce..2a88b204f66 100644
--- a/TAO/tests/Bug_2429_Regression/Child.idl
+++ b/TAO/tests/Bug_2429_Regression/Child.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Parent.idl"
interface Child : Parent
diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.cpp b/TAO/tests/Bug_2429_Regression/ChildServant.cpp
index 9f81ba41932..79dfb73892a 100644
--- a/TAO/tests/Bug_2429_Regression/ChildServant.cpp
+++ b/TAO/tests/Bug_2429_Regression/ChildServant.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ChildServant.h"
ChildServant::ChildServant(CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.h b/TAO/tests/Bug_2429_Regression/ChildServant.h
index cb342276e15..f2d715469c2 100644
--- a/TAO/tests/Bug_2429_Regression/ChildServant.h
+++ b/TAO/tests/Bug_2429_Regression/ChildServant.h
@@ -1,8 +1,6 @@
#ifndef CHILDSERVANT_H
#define CHILDSERVANT_H
-// $Id$
-
#include "ChildS.h"
class ChildServant
diff --git a/TAO/tests/Bug_2429_Regression/Parent.idl b/TAO/tests/Bug_2429_Regression/Parent.idl
index b142f1939e3..5858f4f4b6a 100644
--- a/TAO/tests/Bug_2429_Regression/Parent.idl
+++ b/TAO/tests/Bug_2429_Regression/Parent.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Parent
{
void parentMethod ();
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
index 7f321c20ad3..7614508edcf 100644
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ b/TAO/tests/Bug_2429_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/Messaging/Messaging.h"
#include "ChildS.h"
diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp
index 458a4d71d89..6e11d72ad09 100644
--- a/TAO/tests/Bug_2429_Regression/server.cpp
+++ b/TAO/tests/Bug_2429_Regression/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ChildServant.h"
diff --git a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
index a4f043c20bb..aeed3e795f6 100644
--- a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
+++ b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -St
IDL_Files {
diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp
index daa8567c012..31ee3c945c9 100644
--- a/TAO/tests/Bug_2494_Regression/client.cpp
+++ b/TAO/tests/Bug_2494_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp
index 025249e75ce..6f7b23da911 100644
--- a/TAO/tests/Bug_2494_Regression/server.cpp
+++ b/TAO/tests/Bug_2494_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_2494_Regression/test_i.cpp b/TAO/tests/Bug_2494_Regression/test_i.cpp
index c370bf97cf4..ce913dc160a 100644
--- a/TAO/tests/Bug_2494_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2494_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2494_Regression/test_i.h b/TAO/tests/Bug_2494_Regression/test_i.h
index 8eb1d8efcf6..6bce3d1b74e 100644
--- a/TAO/tests/Bug_2494_Regression/test_i.h
+++ b/TAO/tests/Bug_2494_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BUG_2494_REGRESSION_TEST_I_H
#define TAO_BUG_2494_REGRESSION_TEST_I_H
diff --git a/TAO/tests/Bug_2494_Regression/test_i.inl b/TAO/tests/Bug_2494_Regression/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/Bug_2494_Regression/test_i.inl
+++ b/TAO/tests/Bug_2494_Regression/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
index 1ad7419dbfd..172e1fcc66f 100644
--- a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
+++ b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2503_Regression/Test.idl b/TAO/tests/Bug_2503_Regression/Test.idl
index f1988af976b..7af43ccd617 100644
--- a/TAO/tests/Bug_2503_Regression/Test.idl
+++ b/TAO/tests/Bug_2503_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
void the_operation(out long x);
diff --git a/TAO/tests/Bug_2503_Regression/client.cpp b/TAO/tests/Bug_2503_Regression/client.cpp
index 7d5423d2d45..ffddfc6886a 100644
--- a/TAO/tests/Bug_2503_Regression/client.cpp
+++ b/TAO/tests/Bug_2503_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "common.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2503_Regression/common.cpp b/TAO/tests/Bug_2503_Regression/common.cpp
index dba8d69b2c8..feb71ac0c42 100644
--- a/TAO/tests/Bug_2503_Regression/common.cpp
+++ b/TAO/tests/Bug_2503_Regression/common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tests/Bug_2503_Regression/common.h b/TAO/tests/Bug_2503_Regression/common.h
index 923e7825b38..f1d22098419 100644
--- a/TAO/tests/Bug_2503_Regression/common.h
+++ b/TAO/tests/Bug_2503_Regression/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef common_h
#define common_h
diff --git a/TAO/tests/Bug_2503_Regression/server.cpp b/TAO/tests/Bug_2503_Regression/server.cpp
index b9e0a86cdf3..81c8557b8d6 100644
--- a/TAO/tests/Bug_2503_Regression/server.cpp
+++ b/TAO/tests/Bug_2503_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "common.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2503_Regression/test_i.cpp b/TAO/tests/Bug_2503_Regression/test_i.cpp
index 945fd5c627d..bcfdff9816f 100644
--- a/TAO/tests/Bug_2503_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2503_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::
diff --git a/TAO/tests/Bug_2503_Regression/test_i.h b/TAO/tests/Bug_2503_Regression/test_i.h
index 9d5efcf6562..d4d4131ed76 100644
--- a/TAO/tests/Bug_2503_Regression/test_i.h
+++ b/TAO/tests/Bug_2503_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef test_i_h
#define test_i_h
diff --git a/TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc b/TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc
index 5c0d4c58398..2ccc243f4f6 100644
--- a/TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc
+++ b/TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoclient, anytypecode, codecfactory, valuetype {
Source_Files {
bug_2542_regression.cpp
diff --git a/TAO/tests/Bug_2542_Regression/Test.idl b/TAO/tests/Bug_2542_Regression/Test.idl
index fbb96883a37..209514f3740 100644
--- a/TAO/tests/Bug_2542_Regression/Test.idl
+++ b/TAO/tests/Bug_2542_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype LongValue long;
valuetype Value
diff --git a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
index d2fcbfe587b..7ade799ab81 100644
--- a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
+++ b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/CodecFactory/CodecFactory.h"
diff --git a/TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc b/TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc
index be2c40753b0..99c6402ef8d 100644
--- a/TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc
+++ b/TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoclient, anytypecode, codecfactory, valuetype {
Source_Files {
bug_2543_regression.cpp
diff --git a/TAO/tests/Bug_2543_Regression/Test.idl b/TAO/tests/Bug_2543_Regression/Test.idl
index ac8ac65cbcf..3a15374208e 100644
--- a/TAO/tests/Bug_2543_Regression/Test.idl
+++ b/TAO/tests/Bug_2543_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Base
{
public long l;
diff --git a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
index d72aecd3ac8..c2535b1c46d 100644
--- a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
+++ b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/CodecFactory/CodecFactory.h"
diff --git a/TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc b/TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc
index 29aca4c4f5d..ff4b9d5bc98 100644
--- a/TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc
+++ b/TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver, messaging, rtcorba, objreftemplate, rtscheduling, rtportableserver {
exename = test
diff --git a/TAO/tests/Bug_2549_Regression/test.cpp b/TAO/tests/Bug_2549_Regression/test.cpp
index 759c2d5edc9..8b471079b63 100644
--- a/TAO/tests/Bug_2549_Regression/test.cpp
+++ b/TAO/tests/Bug_2549_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
int ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/TAO/tests/Bug_2549_Regression/test.idl b/TAO/tests/Bug_2549_Regression/test.idl
index f727112c408..7d9e96c8004 100644
--- a/TAO/tests/Bug_2549_Regression/test.idl
+++ b/TAO/tests/Bug_2549_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/PortableServer_include.pidl"
#include "tao/CodecFactory/IOP_Codec_include.pidl"
#include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
diff --git a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc
index 31a88d65d5e..7021cc11b9c 100644
--- a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc
+++ b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Quoter.idl
diff --git a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
index 8b35bf371a2..5d1204a53f8 100644
--- a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
+++ b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2593_Regression/client.cpp b/TAO/tests/Bug_2593_Regression/client.cpp
index abaed430dc8..144fb6910b1 100644
--- a/TAO/tests/Bug_2593_Regression/client.cpp
+++ b/TAO/tests/Bug_2593_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp
index f2dc09ae2f2..ec51b6fbc2f 100644
--- a/TAO/tests/Bug_2593_Regression/server.cpp
+++ b/TAO/tests/Bug_2593_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
index 2e4131f6280..fc2a86b7fe3 100644
--- a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
+++ b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2595_Regression/client.cpp b/TAO/tests/Bug_2595_Regression/client.cpp
index 0d2a3e9e825..1ed1cca0704 100644
--- a/TAO/tests/Bug_2595_Regression/client.cpp
+++ b/TAO/tests/Bug_2595_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_2595_Regression/server.cpp
+++ b/TAO/tests/Bug_2595_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
index a5f7eea18ad..cf26f465d0a 100644
--- a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
+++ b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Hello.idl
diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp
index 8416cdb76c7..a60a9b3d8fd 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2654_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h
index 2efb6c22796..d71aff730df 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.h
+++ b/TAO/tests/Bug_2654_Regression/Hello.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_H
#define HELLO_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Bug_2654_Regression/Hello.idl b/TAO/tests/Bug_2654_Regression/Hello.idl
index 6bd78c2cf25..10b5c220923 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.idl
+++ b/TAO/tests/Bug_2654_Regression/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index 4897496b35f..b01a90b4eee 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HelloS.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp
index 8f6f117b63a..ea5b34d568f 100644
--- a/TAO/tests/Bug_2654_Regression/server.cpp
+++ b/TAO/tests/Bug_2654_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc b/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc
index 0cafec5b7d4..3ad0cfdb476 100644
--- a/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc
+++ b/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver, messaging, ami {
exename = client
diff --git a/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc b/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc
index 52c83ae040b..766ce29f849 100644
--- a/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc
+++ b/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*server): taoserver {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.cpp b/TAO/tests/Bug_2677_Regression/DllORB.cpp
index 776222e727c..af994858e84 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.cpp
+++ b/TAO/tests/Bug_2677_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Arg_Shifter.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h
index 5ced914b6ff..d72946c0d96 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.h
+++ b/TAO/tests/Bug_2677_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h b/TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h
index bf76590f113..d159c0e4055 100644
--- a/TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h
+++ b/TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug_2677_regression
// ------------------------------
diff --git a/TAO/tests/Bug_2677_Regression/server.cpp b/TAO/tests/Bug_2677_Regression/server.cpp
index b2554023954..5d1d275fcf1 100644
--- a/TAO/tests/Bug_2677_Regression/server.cpp
+++ b/TAO/tests/Bug_2677_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc b/TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc
index 45826f5e7cc..51cb7e747b5 100644
--- a/TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc
+++ b/TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags -= -Sa -St
IDL_Files {
diff --git a/TAO/tests/Bug_2678_Regression/client.cpp b/TAO/tests/Bug_2678_Regression/client.cpp
index 679f5bf277b..6e054852575 100644
--- a/TAO/tests/Bug_2678_Regression/client.cpp
+++ b/TAO/tests/Bug_2678_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp
index 7ed73de53f4..831a0c643b5 100644
--- a/TAO/tests/Bug_2678_Regression/server.cpp
+++ b/TAO/tests/Bug_2678_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
diff --git a/TAO/tests/Bug_2678_Regression/test.idl b/TAO/tests/Bug_2678_Regression/test.idl
index a77a7bcdcce..4113885f698 100644
--- a/TAO/tests/Bug_2678_Regression/test.idl
+++ b/TAO/tests/Bug_2678_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
typedef sequence<any> AnySeq;
struct Container
diff --git a/TAO/tests/Bug_2683_Regression/IORTable.mpc b/TAO/tests/Bug_2683_Regression/IORTable.mpc
index bd207aa6449..4cc2d1a60b6 100644
--- a/TAO/tests/Bug_2683_Regression/IORTable.mpc
+++ b/TAO/tests/Bug_2683_Regression/IORTable.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index eb79402810e..f14e73c7679 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp
index 0a8c9f27da5..a6104342c1c 100644
--- a/TAO/tests/Bug_2683_Regression/server.cpp
+++ b/TAO/tests/Bug_2683_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/OS_NS_strings.h"
diff --git a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc b/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
index 2bf8fe9f8e2..b85af0f2652 100644
--- a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
+++ b/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -GA
IDL_Files {
diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp
index fc2e03c93f0..a25657527a3 100644
--- a/TAO/tests/Bug_2702_Regression/client.cpp
+++ b/TAO/tests/Bug_2702_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc b/TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc
index 0c95ddf25e6..99ff723e7e1 100644
--- a/TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc
+++ b/TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_2734_Regression/client.cpp b/TAO/tests/Bug_2734_Regression/client.cpp
index 22c22bab1d5..bbcf55171e2 100644
--- a/TAO/tests/Bug_2734_Regression/client.cpp
+++ b/TAO/tests/Bug_2734_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_2734_Regression/server.cpp b/TAO/tests/Bug_2734_Regression/server.cpp
index 1e66973cff6..b592a4416c9 100644
--- a/TAO/tests/Bug_2734_Regression/server.cpp
+++ b/TAO/tests/Bug_2734_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2734_Regression/test_i.cpp b/TAO/tests/Bug_2734_Regression/test_i.cpp
index 4dec77755fe..829ad2298e3 100644
--- a/TAO/tests/Bug_2734_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2734_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc b/TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc
index 85905a99a88..72052a8815c 100644
--- a/TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc
+++ b/TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver {
}
diff --git a/TAO/tests/Bug_2735_Regression/server.cpp b/TAO/tests/Bug_2735_Regression/server.cpp
index 4aa36e4d73c..d0b5d1c4b26 100644
--- a/TAO/tests/Bug_2735_Regression/server.cpp
+++ b/TAO/tests/Bug_2735_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
#include "ace/Service_Config.h"
diff --git a/TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc b/TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc
index a1ccf1cb049..18422a19b48 100644
--- a/TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc
+++ b/TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
index 2c827e18cb6..ba5ee68a0d4 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.h b/TAO/tests/Bug_2768_Regression/Messenger_i.h
index 1178f378987..de582704c66 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __MESSENGER_I_H__
#define __MESSENGER_I_H__
diff --git a/TAO/tests/Bug_2768_Regression/client.cpp b/TAO/tests/Bug_2768_Regression/client.cpp
index 759923e4f4b..52f86afe50f 100644
--- a/TAO/tests/Bug_2768_Regression/client.cpp
+++ b/TAO/tests/Bug_2768_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2768_Regression/server.cpp b/TAO/tests/Bug_2768_Regression/server.cpp
index eaed5c2e0f1..abb88e86bc9 100644
--- a/TAO/tests/Bug_2768_Regression/server.cpp
+++ b/TAO/tests/Bug_2768_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/IORTable/IORTable.h"
#include "Messenger_i.h"
diff --git a/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc b/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc
index bb05329bc43..8e9365f5eb3 100755
--- a/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc
+++ b/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*client) : taoclient, valuetype {
diff --git a/TAO/tests/Bug_2791_Regression/Message.idl b/TAO/tests/Bug_2791_Regression/Message.idl
index 0afd8fb1f25..9333b79c3f4 100755
--- a/TAO/tests/Bug_2791_Regression/Message.idl
+++ b/TAO/tests/Bug_2791_Regression/Message.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Message
{
private string user_;
diff --git a/TAO/tests/Bug_2791_Regression/MessageFactory.cpp b/TAO/tests/Bug_2791_Regression/MessageFactory.cpp
index 742028a19f9..6ad81e07eef 100755
--- a/TAO/tests/Bug_2791_Regression/MessageFactory.cpp
+++ b/TAO/tests/Bug_2791_Regression/MessageFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessageFactory.h"
diff --git a/TAO/tests/Bug_2791_Regression/MessageFactory.h b/TAO/tests/Bug_2791_Regression/MessageFactory.h
index 5b4b9ceeb3a..f2d862c99eb 100755
--- a/TAO/tests/Bug_2791_Regression/MessageFactory.h
+++ b/TAO/tests/Bug_2791_Regression/MessageFactory.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Valuetype/ValueFactory.h"
#include "Message_i.h"
diff --git a/TAO/tests/Bug_2791_Regression/Message_i.cpp b/TAO/tests/Bug_2791_Regression/Message_i.cpp
index cfd2c57b632..2a1af32e41a 100755
--- a/TAO/tests/Bug_2791_Regression/Message_i.cpp
+++ b/TAO/tests/Bug_2791_Regression/Message_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Message_i.h"
MessageImpl::MessageImpl ()
diff --git a/TAO/tests/Bug_2791_Regression/Message_i.h b/TAO/tests/Bug_2791_Regression/Message_i.h
index 6b4c1b744e7..ecf5ed5958b 100755
--- a/TAO/tests/Bug_2791_Regression/Message_i.h
+++ b/TAO/tests/Bug_2791_Regression/Message_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessageC.h"
#include "tao/corba.h"
diff --git a/TAO/tests/Bug_2791_Regression/client.cpp b/TAO/tests/Bug_2791_Regression/client.cpp
index 147a13a7eb8..016f71f13d1 100755
--- a/TAO/tests/Bug_2791_Regression/client.cpp
+++ b/TAO/tests/Bug_2791_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessageFactory.h"
#include "MessageC.h"
diff --git a/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc b/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc
index 8336a76d8bf..7b48d34571e 100644
--- a/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc
+++ b/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
Source_Files {
diff --git a/TAO/tests/Bug_2792_Regression/client.cpp b/TAO/tests/Bug_2792_Regression/client.cpp
index 087c31ecc6d..d57175ee309 100644
--- a/TAO/tests/Bug_2792_Regression/client.cpp
+++ b/TAO/tests/Bug_2792_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc b/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc
index 8336a76d8bf..7b48d34571e 100644
--- a/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc
+++ b/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
Source_Files {
diff --git a/TAO/tests/Bug_2795_Regression/client.cpp b/TAO/tests/Bug_2795_Regression/client.cpp
index 3a76a108054..d7dd902e7b9 100644
--- a/TAO/tests/Bug_2795_Regression/client.cpp
+++ b/TAO/tests/Bug_2795_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/Bug_2804_Regression/Hello.cpp b/TAO/tests/Bug_2804_Regression/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Bug_2804_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2804_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2804_Regression/client.cpp b/TAO/tests/Bug_2804_Regression/client.cpp
index 1fbc7867687..17bfc4b33e1 100644
--- a/TAO/tests/Bug_2804_Regression/client.cpp
+++ b/TAO/tests/Bug_2804_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Bug_2804_Regression/server.cpp b/TAO/tests/Bug_2804_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_2804_Regression/server.cpp
+++ b/TAO/tests/Bug_2804_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc b/TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc
index f83271a8973..977092b1202 100644
--- a/TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc
+++ b/TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc b/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc
index bddd65f8a15..0333fd15a9d 100644
--- a/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc
+++ b/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_2809_Regression/server.cpp b/TAO/tests/Bug_2809_Regression/server.cpp
index a7f56b9b742..dd58630657d 100644
--- a/TAO/tests/Bug_2809_Regression/server.cpp
+++ b/TAO/tests/Bug_2809_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc b/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc
index 7343f17d4f5..cf13b69869f 100644
--- a/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc
+++ b/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = server
Source_Files {
diff --git a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
index 05d902509df..4d2a19ed788 100644
--- a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
+++ b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/PortableServer/PortableServer.h"
#include "fooS.h"
diff --git a/TAO/tests/Bug_2826_Regression/foo.idl b/TAO/tests/Bug_2826_Regression/foo.idl
index 7ad6dd968c5..1b939b3f223 100644
--- a/TAO/tests/Bug_2826_Regression/foo.idl
+++ b/TAO/tests/Bug_2826_Regression/foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface foo
{
void check();
diff --git a/TAO/tests/Bug_2844_Regression/Hello.cpp b/TAO/tests/Bug_2844_Regression/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Bug_2844_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2844_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2844_Regression/client.cpp b/TAO/tests/Bug_2844_Regression/client.cpp
index a3e741e3c9e..831bf9b524c 100644
--- a/TAO/tests/Bug_2844_Regression/client.cpp
+++ b/TAO/tests/Bug_2844_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Bug_2844_Regression/server.cpp b/TAO/tests/Bug_2844_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_2844_Regression/server.cpp
+++ b/TAO/tests/Bug_2844_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc b/TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc
index e9fa8a23ed9..843dce03b63 100644
--- a/TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc
+++ b/TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
Source_Files {
client.cpp
diff --git a/TAO/tests/Bug_2869_Regression/client.cpp b/TAO/tests/Bug_2869_Regression/client.cpp
index 290592ff2d7..a9d1a287987 100644
--- a/TAO/tests/Bug_2869_Regression/client.cpp
+++ b/TAO/tests/Bug_2869_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc b/TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc
index f83271a8973..977092b1202 100644
--- a/TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc
+++ b/TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_2918_Regression/Hello.cpp b/TAO/tests/Bug_2918_Regression/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Bug_2918_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2918_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2918_Regression/Test.idl b/TAO/tests/Bug_2918_Regression/Test.idl
index c5c14ed184f..c0c84fc0ab1 100644
--- a/TAO/tests/Bug_2918_Regression/Test.idl
+++ b/TAO/tests/Bug_2918_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
typedef long FooType;
diff --git a/TAO/tests/Bug_2918_Regression/client.cpp b/TAO/tests/Bug_2918_Regression/client.cpp
index cc5dc2a72dd..537634be028 100644
--- a/TAO/tests/Bug_2918_Regression/client.cpp
+++ b/TAO/tests/Bug_2918_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Bug_2918_Regression/server.cpp b/TAO/tests/Bug_2918_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_2918_Regression/server.cpp
+++ b/TAO/tests/Bug_2918_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc b/TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc
index 7bd12e6a2ef..73998a14a95 100644
--- a/TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc
+++ b/TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
ThreeTier.idl
diff --git a/TAO/tests/Bug_2935_Regression/ThreeTier.idl b/TAO/tests/Bug_2935_Regression/ThreeTier.idl
index 1bb4cf44f78..f7d2c19f453 100644
--- a/TAO/tests/Bug_2935_Regression/ThreeTier.idl
+++ b/TAO/tests/Bug_2935_Regression/ThreeTier.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface ThreeTier
{
/// record the occurrence of a tick
diff --git a/TAO/tests/Bug_2935_Regression/middle.cpp b/TAO/tests/Bug_2935_Regression/middle.cpp
index 24e47f8f98a..0ca31fd3a57 100644
--- a/TAO/tests/Bug_2935_Regression/middle.cpp
+++ b/TAO/tests/Bug_2935_Regression/middle.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "middle_i.h"
const ACE_TCHAR * ior_output_file = 0;
diff --git a/TAO/tests/Bug_2935_Regression/middle_i.cpp b/TAO/tests/Bug_2935_Regression/middle_i.cpp
index 64e42e26d61..ee83ce76838 100644
--- a/TAO/tests/Bug_2935_Regression/middle_i.cpp
+++ b/TAO/tests/Bug_2935_Regression/middle_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "middle_i.h"
#include "ace/OS_NS_time.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Bug_2935_Regression/sink.cpp b/TAO/tests/Bug_2935_Regression/sink.cpp
index 769d91eeb79..fa13971ef3f 100644
--- a/TAO/tests/Bug_2935_Regression/sink.cpp
+++ b/TAO/tests/Bug_2935_Regression/sink.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "sink_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2935_Regression/sink_i.cpp b/TAO/tests/Bug_2935_Regression/sink_i.cpp
index 02411772fb6..d55143af170 100644
--- a/TAO/tests/Bug_2935_Regression/sink_i.cpp
+++ b/TAO/tests/Bug_2935_Regression/sink_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sink_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2936_Regression/DllORB.cpp b/TAO/tests/Bug_2936_Regression/DllORB.cpp
index 4abd4b6e9ca..156b5869e53 100644
--- a/TAO/tests/Bug_2936_Regression/DllORB.cpp
+++ b/TAO/tests/Bug_2936_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/tests/Bug_2936_Regression/DllORB.h b/TAO/tests/Bug_2936_Regression/DllORB.h
index 94bace9f3c1..9b3ae488bfb 100644
--- a/TAO/tests/Bug_2936_Regression/DllORB.h
+++ b/TAO/tests/Bug_2936_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.h b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
index 36a85c50435..239a115680c 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.h
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PersistentPoa_h
#define PersistentPoa_h
diff --git a/TAO/tests/Bug_2936_Regression/bug2936.cpp b/TAO/tests/Bug_2936_Regression/bug2936.cpp
index bd982c6a498..1223e7c0876 100644
--- a/TAO/tests/Bug_2936_Regression/bug2936.cpp
+++ b/TAO/tests/Bug_2936_Regression/bug2936.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2936_Regression/bug2936.mpc b/TAO/tests/Bug_2936_Regression/bug2936.mpc
index 7af13ef60af..0c2ea8f86b6 100644
--- a/TAO/tests/Bug_2936_Regression/bug2936.mpc
+++ b/TAO/tests/Bug_2936_Regression/bug2936.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (bug2936-exe): aceexe {
exename=server
Source_Files {
diff --git a/TAO/tests/Bug_2936_Regression/bug2936_export.h b/TAO/tests/Bug_2936_Regression/bug2936_export.h
index 10581a4e587..4cb8b2e2463 100644
--- a/TAO/tests/Bug_2936_Regression/bug2936_export.h
+++ b/TAO/tests/Bug_2936_Regression/bug2936_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug2936
// ------------------------------
diff --git a/TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc b/TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc
index 947ec4347ba..705c461b44c 100644
--- a/TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc
+++ b/TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2953_Regression/client.cpp b/TAO/tests/Bug_2953_Regression/client.cpp
index 191196967d4..97767d80a2a 100644
--- a/TAO/tests/Bug_2953_Regression/client.cpp
+++ b/TAO/tests/Bug_2953_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Bug_2953_Regression/server.cpp b/TAO/tests/Bug_2953_Regression/server.cpp
index 92e3b2d1ee7..0c7ac2eb322 100644
--- a/TAO/tests/Bug_2953_Regression/server.cpp
+++ b/TAO/tests/Bug_2953_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc b/TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc
index 67b7539e43c..de4381c7b1e 100644
--- a/TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc
+++ b/TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, dynamicinterface, avoids_minimum_corba {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2966_Regression/Hello.cpp b/TAO/tests/Bug_2966_Regression/Hello.cpp
index ec53524c2f8..2c55eb798a9 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2966_Regression/Hello.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2966_Regression/client.cpp b/TAO/tests/Bug_2966_Regression/client.cpp
index 4327c459b67..fb97109232c 100644
--- a/TAO/tests/Bug_2966_Regression/client.cpp
+++ b/TAO/tests/Bug_2966_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicInterface/Request.h"
#include "tao/DynamicInterface/DII_CORBA_methods.h"
#include "TestC.h"
diff --git a/TAO/tests/Bug_2966_Regression/server.cpp b/TAO/tests/Bug_2966_Regression/server.cpp
index 4f70fadd052..4f2e61f69b7 100644
--- a/TAO/tests/Bug_2966_Regression/server.cpp
+++ b/TAO/tests/Bug_2966_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc b/TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc
index 2bd74f5ef3a..29dfafe71c2 100644
--- a/TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc
+++ b/TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_3000_Regression/client.cpp b/TAO/tests/Bug_3000_Regression/client.cpp
index 1ae58f54545..27d150fe725 100644
--- a/TAO/tests/Bug_3000_Regression/client.cpp
+++ b/TAO/tests/Bug_3000_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_3000_Regression/server.cpp b/TAO/tests/Bug_3000_Regression/server.cpp
index 173ceb780e0..ae8f1ce7f4f 100644
--- a/TAO/tests/Bug_3000_Regression/server.cpp
+++ b/TAO/tests/Bug_3000_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Service.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc b/TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc
index aa31e54e848..5d63c9b2bfd 100644
--- a/TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc
+++ b/TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
}
diff --git a/TAO/tests/Bug_3042_Regression/client.cpp b/TAO/tests/Bug_3042_Regression/client.cpp
index 857ee60a427..dd7872e3077 100644
--- a/TAO/tests/Bug_3042_Regression/client.cpp
+++ b/TAO/tests/Bug_3042_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc b/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc
index 98bf591d37f..12e909a54c5 100644
--- a/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc
+++ b/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Server): taoserver, messaging, bidir_giop, threads {
Source_Files {
test_i.cpp
diff --git a/TAO/tests/Bug_3068_Regression/client.cpp b/TAO/tests/Bug_3068_Regression/client.cpp
index a00540167de..b0d9694d276 100644
--- a/TAO/tests/Bug_3068_Regression/client.cpp
+++ b/TAO/tests/Bug_3068_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/Bug_3068_Regression/server.cpp b/TAO/tests/Bug_3068_Regression/server.cpp
index 7ece9eb1aef..d4a2360714f 100644
--- a/TAO/tests/Bug_3068_Regression/server.cpp
+++ b/TAO/tests/Bug_3068_Regression/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/tests/Bug_3068_Regression/test_i.cpp b/TAO/tests/Bug_3068_Regression/test_i.cpp
index 896f63ff15a..a493c19223a 100644
--- a/TAO/tests/Bug_3068_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3068_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_3068_Regression/test_i.inl b/TAO/tests/Bug_3068_Regression/test_i.inl
index c53124309f7..99c25e480f0 100644
--- a/TAO/tests/Bug_3068_Regression/test_i.inl
+++ b/TAO/tests/Bug_3068_Regression/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc b/TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc
index 5182de85749..0be06a7f217 100644
--- a/TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc
+++ b/TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3108_Regression/client.cpp b/TAO/tests/Bug_3108_Regression/client.cpp
index 51c34104576..259e7b0df70 100644
--- a/TAO/tests/Bug_3108_Regression/client.cpp
+++ b/TAO/tests/Bug_3108_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3108_Regression/server.cpp b/TAO/tests/Bug_3108_Regression/server.cpp
index 05b6a2fd0bb..1e735fe9441 100644
--- a/TAO/tests/Bug_3108_Regression/server.cpp
+++ b/TAO/tests/Bug_3108_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3108_Regression/test.idl b/TAO/tests/Bug_3108_Regression/test.idl
index 963e0c8a6a8..16420dedae1 100644
--- a/TAO/tests/Bug_3108_Regression/test.idl
+++ b/TAO/tests/Bug_3108_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
long test_method();
diff --git a/TAO/tests/Bug_3108_Regression/test_i.cpp b/TAO/tests/Bug_3108_Regression/test_i.cpp
index bfe7394f5ab..c6a8e7bc541 100644
--- a/TAO/tests/Bug_3108_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3108_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3108_Regression/test_i.h b/TAO/tests/Bug_3108_Regression/test_i.h
index 8191f1adbcc..a81166bf3e3 100644
--- a/TAO/tests/Bug_3108_Regression/test_i.h
+++ b/TAO/tests/Bug_3108_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_I_HH
#define TEST_I_HH
#include "testS.h"
diff --git a/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl b/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
index 7d051f9e877..ec1a43547ca 100644
--- a/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
+++ b/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CosNotification.idl
*
diff --git a/TAO/tests/Bug_3154_Regression/test.idl b/TAO/tests/Bug_3154_Regression/test.idl
index 6534517b2cd..184d66052bb 100644
--- a/TAO/tests/Bug_3154_Regression/test.idl
+++ b/TAO/tests/Bug_3154_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// The next include is TAO specific.
#include "orbsvcs/FT_CORBA_ORB.idl"
diff --git a/TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc b/TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc
index 6b3e52a0182..264845400f8 100644
--- a/TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc
+++ b/TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3163_Regression/client.cpp b/TAO/tests/Bug_3163_Regression/client.cpp
index 86471b52f52..8e9f4f0d3b9 100644
--- a/TAO/tests/Bug_3163_Regression/client.cpp
+++ b/TAO/tests/Bug_3163_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3163_Regression/server.cpp b/TAO/tests/Bug_3163_Regression/server.cpp
index e3f2f63cbbb..12a05b1cff3 100644
--- a/TAO/tests/Bug_3163_Regression/server.cpp
+++ b/TAO/tests/Bug_3163_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "tao/PortableServer/PortableServer.h"
#include "testS.h"
diff --git a/TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc b/TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc
index ae45ad8aea9..718777ce03e 100644
--- a/TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc
+++ b/TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, valuetype, messaging, utils, threads {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp
index 39bbbf250ac..de783b96f62 100644
--- a/TAO/tests/Bug_3171_Regression/server.cpp
+++ b/TAO/tests/Bug_3171_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "tao/corba.h"
diff --git a/TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc b/TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc
index 8f8341be456..e2ff19e1d9e 100644
--- a/TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc
+++ b/TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoclient, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
Source_Files {
bug_3198_regression.cpp
diff --git a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
index 5579022048c..b4c93c1b20b 100644
--- a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
+++ b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/SystemException.h"
#include "tao/PolicyC.h"
diff --git a/TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc b/TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc
index 7a3e773781c..d25ece3d615 100644
--- a/TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc
+++ b/TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*server) : taoserver, threads {
after += *lib
Source_Files {
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
index b21f30a9b7b..3b52249e2b1 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DllOrb.h"
#include "ace/Arg_Shifter.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h
index f8fe24bfba8..a9541c0f930 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef bug_3251_DllORB_h
#define bug_3251_DllORB_h
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
index 4e12af4d05e..fa78847117a 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Arg_Shifter.h"
#include "tao/PortableServer/POAManager.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.h b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
index 0935d037b3a..964b95fc886 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.h
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef bug_3251_PersistentPoa_h
#define bug_3251_PersistentPoa_h
diff --git a/TAO/tests/Bug_3251_Regression/bug_3251_export.h b/TAO/tests/Bug_3251_Regression/bug_3251_export.h
index 55e3d892fab..3ae2ec6fa1a 100644
--- a/TAO/tests/Bug_3251_Regression/bug_3251_export.h
+++ b/TAO/tests/Bug_3251_Regression/bug_3251_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug_3251
// ------------------------------
diff --git a/TAO/tests/Bug_3251_Regression/server.cpp b/TAO/tests/Bug_3251_Regression/server.cpp
index 42e582784a2..e8fc3c46a43 100644
--- a/TAO/tests/Bug_3251_Regression/server.cpp
+++ b/TAO/tests/Bug_3251_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ARGV.h"
#include "ace/Reactor.h"
#include "ace/Signal.h"
diff --git a/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc b/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
index 92565612bf4..d592ca7078b 100644
--- a/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
+++ b/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp b/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp
index 697deb9ea8f..3b498551758 100644
--- a/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp
+++ b/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Servant_Locator.h"
#include "ace/Log_Msg.h"
#include "testC.h"
diff --git a/TAO/tests/Bug_3276_Regression/Servant_Locator.h b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
index 9884f406281..dfd12fc855f 100644
--- a/TAO/tests/Bug_3276_Regression/Servant_Locator.h
+++ b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SERVANT_LOCATOR_H_
#define _SERVANT_LOCATOR_H_
diff --git a/TAO/tests/Bug_3276_Regression/client.cpp b/TAO/tests/Bug_3276_Regression/client.cpp
index 53ff00e0127..59412b4da37 100644
--- a/TAO/tests/Bug_3276_Regression/client.cpp
+++ b/TAO/tests/Bug_3276_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/SString.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3276_Regression/test_i.cpp b/TAO/tests/Bug_3276_Regression/test_i.cpp
index adfc0cca40e..0783dca44a9 100644
--- a/TAO/tests/Bug_3276_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3276_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3276_Regression/test_i.h b/TAO/tests/Bug_3276_Regression/test_i.h
index b301f1f6945..9632f4da048 100644
--- a/TAO/tests/Bug_3276_Regression/test_i.h
+++ b/TAO/tests/Bug_3276_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_I_H_
#define _TEST_I_H_
diff --git a/TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc b/TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc
index 0b23fc42f14..90b09e158c0 100644
--- a/TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc
+++ b/TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3299_Regression/Hello.cpp b/TAO/tests/Bug_3299_Regression/Hello.cpp
index 737e84edc88..08a66f4eb2b 100644
--- a/TAO/tests/Bug_3299_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3299_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3299_Regression/client.cpp b/TAO/tests/Bug_3299_Regression/client.cpp
index 3ddc90434e9..0f6d624f981 100644
--- a/TAO/tests/Bug_3299_Regression/client.cpp
+++ b/TAO/tests/Bug_3299_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3299_Regression/server.cpp b/TAO/tests/Bug_3299_Regression/server.cpp
index 5ff6ccea575..a29e11b9700 100644
--- a/TAO/tests/Bug_3299_Regression/server.cpp
+++ b/TAO/tests/Bug_3299_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc b/TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc
index bfe0e4b0ca1..2436f7d766a 100644
--- a/TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc
+++ b/TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver {
exename = test
diff --git a/TAO/tests/Bug_3311_Regression/test.cpp b/TAO/tests/Bug_3311_Regression/test.cpp
index 759c2d5edc9..8b471079b63 100644
--- a/TAO/tests/Bug_3311_Regression/test.cpp
+++ b/TAO/tests/Bug_3311_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
int ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/TAO/tests/Bug_3311_Regression/test.idl b/TAO/tests/Bug_3311_Regression/test.idl
index fed69c82366..e18898dc400 100644
--- a/TAO/tests/Bug_3311_Regression/test.idl
+++ b/TAO/tests/Bug_3311_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Oh ho, oh ho, what are we gonna do?
union CityBlue
switch (unsigned long long)
diff --git a/TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc b/TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc
index ca50c7cc600..25c5b58f71c 100644
--- a/TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc
+++ b/TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc
@@ -1,4 +1,2 @@
-// $Id$
-
project : taoserver, threads {
}
diff --git a/TAO/tests/Bug_3315_Regression/main.cpp b/TAO/tests/Bug_3315_Regression/main.cpp
index dc73933c08b..472ac65e3bf 100644
--- a/TAO/tests/Bug_3315_Regression/main.cpp
+++ b/TAO/tests/Bug_3315_Regression/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "ace/Log_Msg.h"
#include "ace/Thread.h"
diff --git a/TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc b/TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc
index ca50c7cc600..25c5b58f71c 100644
--- a/TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc
+++ b/TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc
@@ -1,4 +1,2 @@
-// $Id$
-
project : taoserver, threads {
}
diff --git a/TAO/tests/Bug_3321_Regression/main.cpp b/TAO/tests/Bug_3321_Regression/main.cpp
index 9b3d04f14a5..125ea313226 100644
--- a/TAO/tests/Bug_3321_Regression/main.cpp
+++ b/TAO/tests/Bug_3321_Regression/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "ace/Log_Msg.h"
#include "ace/Thread.h"
diff --git a/TAO/tests/Bug_3333_Regression/Bug3333.mpc b/TAO/tests/Bug_3333_Regression/Bug3333.mpc
index cf6897ad73f..0237d394884 100644
--- a/TAO/tests/Bug_3333_Regression/Bug3333.mpc
+++ b/TAO/tests/Bug_3333_Regression/Bug3333.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3333_Regression/client.cpp b/TAO/tests/Bug_3333_Regression/client.cpp
index 3e93f3fa15e..67f73bf3665 100644
--- a/TAO/tests/Bug_3333_Regression/client.cpp
+++ b/TAO/tests/Bug_3333_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_3333_Regression/server.cpp b/TAO/tests/Bug_3333_Regression/server.cpp
index dd7521c191d..04db89bf0cb 100644
--- a/TAO/tests/Bug_3333_Regression/server.cpp
+++ b/TAO/tests/Bug_3333_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3384_Regression/Client_i.cpp b/TAO/tests/Bug_3384_Regression/Client_i.cpp
index 02cc611be0d..9c421896d23 100644
--- a/TAO/tests/Bug_3384_Regression/Client_i.cpp
+++ b/TAO/tests/Bug_3384_Regression/Client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_i.h"
Client::~Client () {}
diff --git a/TAO/tests/Bug_3384_Regression/Client_i.h b/TAO/tests/Bug_3384_Regression/Client_i.h
index c9e63137ff0..ef594f641b5 100644
--- a/TAO/tests/Bug_3384_Regression/Client_i.h
+++ b/TAO/tests/Bug_3384_Regression/Client_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
class Client : public POA_Test::Client
diff --git a/TAO/tests/Bug_3384_Regression/Server_i.cpp b/TAO/tests/Bug_3384_Regression/Server_i.cpp
index 7535a7ba5b8..8f25dbaffc7 100644
--- a/TAO/tests/Bug_3384_Regression/Server_i.cpp
+++ b/TAO/tests/Bug_3384_Regression/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
Server::~Server () {}
diff --git a/TAO/tests/Bug_3384_Regression/Server_i.h b/TAO/tests/Bug_3384_Regression/Server_i.h
index a86ce789ee4..c801fc07d8b 100644
--- a/TAO/tests/Bug_3384_Regression/Server_i.h
+++ b/TAO/tests/Bug_3384_Regression/Server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
class Server : public POA_Test::Server
diff --git a/TAO/tests/Bug_3384_Regression/Test.idl b/TAO/tests/Bug_3384_Regression/Test.idl
index 26e3211af05..552dda3f4a4 100644
--- a/TAO/tests/Bug_3384_Regression/Test.idl
+++ b/TAO/tests/Bug_3384_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
interface Client
diff --git a/TAO/tests/Bug_3384_Regression/client.cpp b/TAO/tests/Bug_3384_Regression/client.cpp
index c62f3924f2b..ea37462912c 100644
--- a/TAO/tests/Bug_3384_Regression/client.cpp
+++ b/TAO/tests/Bug_3384_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_i.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_3384_Regression/server.cpp b/TAO/tests/Bug_3384_Regression/server.cpp
index 41b9ef0b2d6..2c3909bbd65 100644
--- a/TAO/tests/Bug_3384_Regression/server.cpp
+++ b/TAO/tests/Bug_3384_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_3384_Regression/test.mpc b/TAO/tests/Bug_3384_Regression/test.mpc
index 6799573d8b1..c6e78f74dc0 100644
--- a/TAO/tests/Bug_3384_Regression/test.mpc
+++ b/TAO/tests/Bug_3384_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Bug_3384_Regression_idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc b/TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc
+++ b/TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3430_Regression/client.cpp b/TAO/tests/Bug_3430_Regression/client.cpp
index de34e78578e..2230f992228 100644
--- a/TAO/tests/Bug_3430_Regression/client.cpp
+++ b/TAO/tests/Bug_3430_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3430_Regression/server.cpp b/TAO/tests/Bug_3430_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3430_Regression/server.cpp
+++ b/TAO/tests/Bug_3430_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc b/TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc
index a654565c830..f18c8e1ed2d 100644
--- a/TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc
+++ b/TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc b/TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc
+++ b/TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3471_Regression/client.cpp b/TAO/tests/Bug_3471_Regression/client.cpp
index a5e47f38199..ba3af53f487 100644
--- a/TAO/tests/Bug_3471_Regression/client.cpp
+++ b/TAO/tests/Bug_3471_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3471_Regression/server.cpp b/TAO/tests/Bug_3471_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3471_Regression/server.cpp
+++ b/TAO/tests/Bug_3471_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc b/TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc
+++ b/TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3479_Regression/client.cpp b/TAO/tests/Bug_3479_Regression/client.cpp
index 7ca9221946d..7f22d1da75c 100644
--- a/TAO/tests/Bug_3479_Regression/client.cpp
+++ b/TAO/tests/Bug_3479_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/Bug_3479_Regression/server.cpp b/TAO/tests/Bug_3479_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3479_Regression/server.cpp
+++ b/TAO/tests/Bug_3479_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp b/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp
index d2191dbb0a9..826e461b0cb 100644
--- a/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp
+++ b/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FooC.h"
struct Foo_i : Foo
diff --git a/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc b/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc
index 5f8e4466364..c16b37fca44 100644
--- a/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc
+++ b/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe {
}
diff --git a/TAO/tests/Bug_3481_Regression/Foo.idl b/TAO/tests/Bug_3481_Regression/Foo.idl
index 5f6d273baa1..1e5081e173e 100644
--- a/TAO/tests/Bug_3481_Regression/Foo.idl
+++ b/TAO/tests/Bug_3481_Regression/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
//
local interface Foo {
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
index 6b4299cf74b..6b98c90e75b 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DLL_Service.h"
ACE_DLL_Service::ACE_DLL_Service (void)
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.h b/TAO/tests/Bug_3499_Regression/DLL_Service.h
index 09489a70dac..0d4d77d40de 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _DLL_SERVICE_H_
#define _DLL_SERVICE_H_
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.mpc b/TAO/tests/Bug_3499_Regression/DLL_Service.mpc
index 3475913c0d2..3842272cc0f 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.mpc
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Bug_3499_Regression) : aceexe {
exename = Bug_3499_Regression
Source_Files {
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
index 3bbdb0f0d4a..52ea597f868 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DLL_Service.h"
#include "ace/DLL.h"
#include "ace/Service_Gestalt.h"
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service_export.h b/TAO/tests/Bug_3499_Regression/DLL_Service_export.h
index 76950d32e1f..3af8b3e369c 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service_export.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl ACE_DLL_SERVICE
// ------------------------------
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
index 783153c7f76..e6283b5bb5e 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DLL_TAO_Service.h"
ACE_DLL_SERVICE_IMPL (ACE_DLL_TAO_Service, _make_ACE_DLL_TAO_Service)
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
index 2b4f4d6e04c..0571daa891c 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _ACE_DLL_TAO_SERVICE_H_
#define _ACE_DLL_TAO_SERVICE_H_
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h
index e8db40b989a..b77273ed2e4 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl ACE_DLL_TAO_SERVICE
// ------------------------------
diff --git a/TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc b/TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc
index 754ee00f43a..be11f71251c 100644
--- a/TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc
+++ b/TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
IF_EXE_M_R_Enums.idl
diff --git a/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl b/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl
index 7d59af3b347..5a6f6819b3d 100644
--- a/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl
+++ b/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __IF_EXE_M_R_ENUMS_DEFINED
#define __IF_EXE_M_R_ENUMS_DEFINED
diff --git a/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl b/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl
index 0ffd3873a94..e7081ff5363 100644
--- a/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl
+++ b/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __IF_EXE_M_R_STRUCTS_DEFINED
#define __IF_EXE_M_R_STRUCTS_DEFINED
diff --git a/TAO/tests/Bug_3506_Regression/client.cpp b/TAO/tests/Bug_3506_Regression/client.cpp
index fdf9f73ddf7..3367db61380 100644
--- a/TAO/tests/Bug_3506_Regression/client.cpp
+++ b/TAO/tests/Bug_3506_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IF_EXE_M_R_StructsC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Bug_3506_Regression/server.cpp b/TAO/tests/Bug_3506_Regression/server.cpp
index fe0f9a657e3..7dc4dff44c9 100644
--- a/TAO/tests/Bug_3506_Regression/server.cpp
+++ b/TAO/tests/Bug_3506_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IF_EXE_M_R_StructsS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc b/TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc
index 680ed44993f..9db6a33c76d 100644
--- a/TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc
+++ b/TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver, messaging, rtcorba, objreftemplate, rtscheduling, rtportableserver, ziop, tao_monitor {
exename = test
diff --git a/TAO/tests/Bug_3513_Regression/test.cpp b/TAO/tests/Bug_3513_Regression/test.cpp
index ca1b5553155..c1aef5a916d 100644
--- a/TAO/tests/Bug_3513_Regression/test.cpp
+++ b/TAO/tests/Bug_3513_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
int
diff --git a/TAO/tests/Bug_3513_Regression/test.idl b/TAO/tests/Bug_3513_Regression/test.idl
index ae55732a3e3..0d78d196cad 100644
--- a/TAO/tests/Bug_3513_Regression/test.idl
+++ b/TAO/tests/Bug_3513_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/*
We've added a comment to the effect that this file does not contain the following
directives:
diff --git a/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc b/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc
index bfe0e4b0ca1..2436f7d766a 100644
--- a/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc
+++ b/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver {
exename = test
diff --git a/TAO/tests/Bug_3514_Regression/test.cpp b/TAO/tests/Bug_3514_Regression/test.cpp
index 551a2224cb3..ea69484a5a0 100644
--- a/TAO/tests/Bug_3514_Regression/test.cpp
+++ b/TAO/tests/Bug_3514_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
int
diff --git a/TAO/tests/Bug_3514_Regression/test.idl b/TAO/tests/Bug_3514_Regression/test.idl
index 5a884db1d07..fdffe85e46a 100644
--- a/TAO/tests/Bug_3514_Regression/test.idl
+++ b/TAO/tests/Bug_3514_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <orb.idl>
interface Foo : CORBA::Policy
diff --git a/TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc b/TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc
index 2ea82e52ee9..c65d2f5035b 100644
--- a/TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc
+++ b/TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3524_Regression/client.cpp b/TAO/tests/Bug_3524_Regression/client.cpp
index 3ea509ada8d..25fba9db7f7 100644
--- a/TAO/tests/Bug_3524_Regression/client.cpp
+++ b/TAO/tests/Bug_3524_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Synch.h"
#include "testC.h"
diff --git a/TAO/tests/Bug_3524_Regression/server.cpp b/TAO/tests/Bug_3524_Regression/server.cpp
index 97ae58abd85..5f7bebdef93 100644
--- a/TAO/tests/Bug_3524_Regression/server.cpp
+++ b/TAO/tests/Bug_3524_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/tests/Bug_3524_Regression/test_i.cpp b/TAO/tests/Bug_3524_Regression/test_i.cpp
index 9b781340732..7491fe3ac95 100644
--- a/TAO/tests/Bug_3524_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3524_Regression/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc b/TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc
index 43f358a6893..9db1bc2a969 100644
--- a/TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc
+++ b/TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -GC
IDL_Files {
diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp
index 46730754841..966d2157fb8 100644
--- a/TAO/tests/Bug_3531_Regression/client.cpp
+++ b/TAO/tests/Bug_3531_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "testS.h"
diff --git a/TAO/tests/Bug_3531_Regression/server.cpp b/TAO/tests/Bug_3531_Regression/server.cpp
index 56909faf54b..f21c3a1c74f 100644
--- a/TAO/tests/Bug_3531_Regression/server.cpp
+++ b/TAO/tests/Bug_3531_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_3531_Regression/test_i.cpp b/TAO/tests/Bug_3531_Regression/test_i.cpp
index fba6b1837aa..dd1e997fcc5 100644
--- a/TAO/tests/Bug_3531_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3531_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_3531_Regression/test_i.h b/TAO/tests/Bug_3531_Regression/test_i.h
index b4900377b9e..9a9caf09eff 100644
--- a/TAO/tests/Bug_3531_Regression/test_i.h
+++ b/TAO/tests/Bug_3531_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BUG_2494_REGRESSION_TEST_I_H
#define TAO_BUG_2494_REGRESSION_TEST_I_H
diff --git a/TAO/tests/Bug_3531_Regression/test_i.inl b/TAO/tests/Bug_3531_Regression/test_i.inl
index 7660ba1707e..77862680d26 100644
--- a/TAO/tests/Bug_3531_Regression/test_i.inl
+++ b/TAO/tests/Bug_3531_Regression/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc b/TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc
index fb15d15dda0..9af9b204ac3 100644
--- a/TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc
+++ b/TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Server): taoserver {
after += *idl
Source_Files {
diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp
index 2d577b1291b..c687e3b5735 100644
--- a/TAO/tests/Bug_3531b_Regression/server.cpp
+++ b/TAO/tests/Bug_3531b_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Global_Macros.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_3542_Regression/Bug_3542.mpc b/TAO/tests/Bug_3542_Regression/Bug_3542.mpc
index efbc4ea397e..9dd010bb92e 100644
--- a/TAO/tests/Bug_3542_Regression/Bug_3542.mpc
+++ b/TAO/tests/Bug_3542_Regression/Bug_3542.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server) : taoserver, threads {
after += *lib
Source_Files {
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
index 3db4aeac4d4..6f155b5eb33 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DllOrb.h"
#include "ace/Arg_Shifter.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h
index 14f1418702c..616821e97cd 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef bug_3542_DllORB_h
#define bug_3542_DllORB_h
diff --git a/TAO/tests/Bug_3542_Regression/bug_3542_export.h b/TAO/tests/Bug_3542_Regression/bug_3542_export.h
index f10eb966097..35044704367 100644
--- a/TAO/tests/Bug_3542_Regression/bug_3542_export.h
+++ b/TAO/tests/Bug_3542_Regression/bug_3542_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug_3542
// ------------------------------
diff --git a/TAO/tests/Bug_3542_Regression/server.cpp b/TAO/tests/Bug_3542_Regression/server.cpp
index 88ec7288fe0..fbae206be4e 100644
--- a/TAO/tests/Bug_3542_Regression/server.cpp
+++ b/TAO/tests/Bug_3542_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ARGV.h"
#include "ace/Reactor.h"
#include "ace/Signal.h"
diff --git a/TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc b/TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc
index 2963b96b98f..98df862c8d7 100644
--- a/TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc
+++ b/TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3543_Regression/master.cpp b/TAO/tests/Bug_3543_Regression/master.cpp
index 41fbd1e74ce..97d4d2f25b7 100644
--- a/TAO/tests/Bug_3543_Regression/master.cpp
+++ b/TAO/tests/Bug_3543_Regression/master.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Synch.h"
#include "ace/Task.h"
#include "masterS.h"
diff --git a/TAO/tests/Bug_3543_Regression/master.idl b/TAO/tests/Bug_3543_Regression/master.idl
index f5a320d9cd5..a1a413080fb 100644
--- a/TAO/tests/Bug_3543_Regression/master.idl
+++ b/TAO/tests/Bug_3543_Regression/master.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __MASTERCLIENT_IDL_DEFINED_
#define __MASTERCLIENT_IDL_DEFINED_
diff --git a/TAO/tests/Bug_3543_Regression/server.cpp b/TAO/tests/Bug_3543_Regression/server.cpp
index 48407d00ea6..e6365206e2e 100644
--- a/TAO/tests/Bug_3543_Regression/server.cpp
+++ b/TAO/tests/Bug_3543_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "masterS.h"
#include "ace/Get_Opt.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc b/TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc
index 1f2d6e26874..b3ca0561a5b 100644
--- a/TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc
+++ b/TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter.idl b/TAO/tests/Bug_3547_Regression/Stock_Quoter.idl
index acdc5c7fc8a..ff497c4e11c 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter.idl
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef Stock_Quoter_idl
#define Stock_Quoter_idl
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
index ee743895467..069664b64c3 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/advanced_resource.h"
// Stock Quoter Stub
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp
index 1bd630bdd7c..83cc4f8df4d 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Stock Quoter includes
#include "Stock_Quoter_i.h"
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl
index 4db2955928b..a9383c7dfb0 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef Stock_Quoter_Types_idl
#define Stock_Quoter_Types_idl
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
index 3b8307fb1ab..751a23b473b 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Stock_Quoter_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
index 76b19672d68..554f6985a87 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef Stock_Quoter_i_h
#define Stock_Quoter_i_h
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest.idl b/TAO/tests/Bug_3547_Regression/UDPTest.idl
index 574225d21ea..5ca1b3e2688 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest.idl
+++ b/TAO/tests/Bug_3547_Regression/UDPTest.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _COMMON_UDPTEST_IDL_
#define _COMMON_UDPTEST_IDL_
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp b/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
index b11fd700251..e318f1ecfae 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
+++ b/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "UDPTest_i.h"
#include <ace/Log_Msg.h>
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest_i.h b/TAO/tests/Bug_3547_Regression/UDPTest_i.h
index 86ed78f064e..3ecdc41eed6 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest_i.h
+++ b/TAO/tests/Bug_3547_Regression/UDPTest_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef UDPTest_i_h
#define UDPTest_i_h
diff --git a/TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc b/TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc
index b8e2f931536..5fdd570c2c2 100644
--- a/TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc
+++ b/TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3548_Regression/client.cpp b/TAO/tests/Bug_3548_Regression/client.cpp
index 55e78601833..94b05e0b766 100644
--- a/TAO/tests/Bug_3548_Regression/client.cpp
+++ b/TAO/tests/Bug_3548_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//---------------------------------------------------------------------------
#include "memeaterC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3548_Regression/memeater.idl b/TAO/tests/Bug_3548_Regression/memeater.idl
index e670286e883..b53c79c5889 100644
--- a/TAO/tests/Bug_3548_Regression/memeater.idl
+++ b/TAO/tests/Bug_3548_Regression/memeater.idl
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/StringSeq.pidl"
module MEMEATER
diff --git a/TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc b/TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc
index c8c06c6c537..22184482a90 100644
--- a/TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc
+++ b/TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
idlflags += -SS
IDL_Files {
diff --git a/TAO/tests/Bug_3552_Regression/check.cpp b/TAO/tests/Bug_3552_Regression/check.cpp
index 457f54f2b52..2dbd38dfdb8 100644
--- a/TAO/tests/Bug_3552_Regression/check.cpp
+++ b/TAO/tests/Bug_3552_Regression/check.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CodecFactory/CodecFactory.h"
#include "structC.h"
diff --git a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc
index 5d39f6ca5f6..41172b79b34 100644
--- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc
+++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
index 1067653093e..7c5e513ae16 100644
--- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
+++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/Policy_Current.h"
diff --git a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
index 29f7a7e345f..eece267d31f 100644
--- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
+++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc b/TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc
+++ b/TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3558_Regression/client.cpp b/TAO/tests/Bug_3558_Regression/client.cpp
index 5ab6c0afd0c..8cca2b9be34 100644
--- a/TAO/tests/Bug_3558_Regression/client.cpp
+++ b/TAO/tests/Bug_3558_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_3558_Regression/server.cpp b/TAO/tests/Bug_3558_Regression/server.cpp
index 77c03392be7..4e60c24483f 100644
--- a/TAO/tests/Bug_3558_Regression/server.cpp
+++ b/TAO/tests/Bug_3558_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
index 039c71fbbbf..bacd17277fc 100644
--- a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
+++ b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc
index 7398d598257..25dc60c71ef 100644
--- a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc
+++ b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Bug_3559_Regression_Test.cpp
diff --git a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
index 377812a55bc..53c4d5e2b6e 100644
--- a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
+++ b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/ORB_Core.h"
#include "tao/Client_Strategy_Factory.h"
diff --git a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc
index 42bb75be132..92efbd4f782 100644
--- a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc
+++ b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Bug_3565_Regression_Test.cpp
diff --git a/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp b/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp
index dec2418d9c2..6a2afc315a4 100644
--- a/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp
+++ b/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/ORB_Core.h"
#include "tao/Client_Strategy_Factory.h"
diff --git a/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc b/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc
index 6b8b7e96bb3..dad324fc326 100644
--- a/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc
+++ b/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Bug_3566_Regression_Test.cpp
diff --git a/TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc b/TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc
index fad2c5ec8c6..98bb92bb8cc 100644
--- a/TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc
+++ b/TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc b/TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc
index 9635718fe6c..aec77065cb7 100644
--- a/TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc
+++ b/TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_3574_Regression/test.cpp b/TAO/tests/Bug_3574_Regression/test.cpp
index dfc84f9946a..ef1115f6233 100644
--- a/TAO/tests/Bug_3574_Regression/test.cpp
+++ b/TAO/tests/Bug_3574_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/StringSeqC.h"
#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x680)
diff --git a/TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc b/TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc
index 9635718fe6c..aec77065cb7 100644
--- a/TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc
+++ b/TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_3575_Regression/test.cpp b/TAO/tests/Bug_3575_Regression/test.cpp
index c461eb6431b..0a4558404a3 100644
--- a/TAO/tests/Bug_3575_Regression/test.cpp
+++ b/TAO/tests/Bug_3575_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/StringSeqC.h"
int
diff --git a/TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc b/TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc
index bddd65f8a15..0333fd15a9d 100644
--- a/TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc
+++ b/TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_3597_Regression/server.cpp b/TAO/tests/Bug_3597_Regression/server.cpp
index 81e60283d0b..30d0588d9c4 100644
--- a/TAO/tests/Bug_3597_Regression/server.cpp
+++ b/TAO/tests/Bug_3597_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "ace/Log_Msg.h"
#include "ace/Log_Msg_Backend.h"
diff --git a/TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc b/TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc
index 0e883f6f7b0..17f9a2615f2 100644
--- a/TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc
+++ b/TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
index 080ed0555b6..520d8bb3495 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
+++ b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequest_Interceptor.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/tests/Bug_3598a_Regression/client.cpp b/TAO/tests/Bug_3598a_Regression/client.cpp
index 206874fade3..cd707ae672f 100644
--- a/TAO/tests/Bug_3598a_Regression/client.cpp
+++ b/TAO/tests/Bug_3598a_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/PortableInterceptorC.h"
diff --git a/TAO/tests/Bug_3598a_Regression/server.cpp b/TAO/tests/Bug_3598a_Regression/server.cpp
index 196100dbb5a..f951982118f 100644
--- a/TAO/tests/Bug_3598a_Regression/server.cpp
+++ b/TAO/tests/Bug_3598a_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc b/TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc
index bddd65f8a15..0333fd15a9d 100644
--- a/TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc
+++ b/TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_3630_Regression/server.cpp b/TAO/tests/Bug_3630_Regression/server.cpp
index 99119586e4a..db7398f97c6 100644
--- a/TAO/tests/Bug_3630_Regression/server.cpp
+++ b/TAO/tests/Bug_3630_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc b/TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc
index 9729ceb7f7d..141123e7452 100644
--- a/TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc
+++ b/TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3632_Regression/test.cpp b/TAO/tests/Bug_3632_Regression/test.cpp
index fd5f1ade0d9..3cba4b38457 100644
--- a/TAO/tests/Bug_3632_Regression/test.cpp
+++ b/TAO/tests/Bug_3632_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
int
diff --git a/TAO/tests/Bug_3632_Regression/test.idl b/TAO/tests/Bug_3632_Regression/test.idl
index 7f95d1147e2..d971c4d0ad6 100644
--- a/TAO/tests/Bug_3632_Regression/test.idl
+++ b/TAO/tests/Bug_3632_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
typedef sequence <string, 10> bounded_string_seq;
diff --git a/TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc b/TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc
+++ b/TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3636_Regression/client.cpp b/TAO/tests/Bug_3636_Regression/client.cpp
index 07255c9e341..3711c9c4431 100644
--- a/TAO/tests/Bug_3636_Regression/client.cpp
+++ b/TAO/tests/Bug_3636_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3636_Regression/server.cpp b/TAO/tests/Bug_3636_Regression/server.cpp
index 1b45c1db07a..cb9bc5bfc2b 100644
--- a/TAO/tests/Bug_3636_Regression/server.cpp
+++ b/TAO/tests/Bug_3636_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
index 9bbd6a5fc6d..496ebdac06c 100644
--- a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Backend_Impl.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc b/TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc
index 35be833411b..772d9b613f3 100644
--- a/TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc
+++ b/TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
index 1caa26c9e72..c5904345484 100644
--- a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Middle_Impl.h"
Bug_3647_Regression::Middle_Impl::
diff --git a/TAO/tests/Bug_3647_Regression/backend_server.cpp b/TAO/tests/Bug_3647_Regression/backend_server.cpp
index fa06b75a0a3..a2b8acf6003 100644
--- a/TAO/tests/Bug_3647_Regression/backend_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/backend_server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Backend_Impl.h"
#include "tao/Strategies/advanced_resource.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3647_Regression/client.cpp b/TAO/tests/Bug_3647_Regression/client.cpp
index 373bd1f36d7..2098f1ebec4 100644
--- a/TAO/tests/Bug_3647_Regression/client.cpp
+++ b/TAO/tests/Bug_3647_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "TestC.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/Utils/PolicyList_Destroyer.h"
diff --git a/TAO/tests/Bug_3647_Regression/middle_server.cpp b/TAO/tests/Bug_3647_Regression/middle_server.cpp
index 23f29e825db..64f66ec17a1 100644
--- a/TAO/tests/Bug_3647_Regression/middle_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/middle_server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Middle_Impl.h"
#include "tao/Utils/PolicyList_Destroyer.h"
diff --git a/TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc b/TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc
index fad2c5ec8c6..98bb92bb8cc 100644
--- a/TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc
+++ b/TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc b/TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc
index ac2bd7dc889..ff55121d7b3 100644
--- a/TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc
+++ b/TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoserver, pi_server, iorinterceptor {
requires += interceptors
diff --git a/TAO/tests/Bug_3674_Regression/test.cpp b/TAO/tests/Bug_3674_Regression/test.cpp
index 20d27ee5858..4ef25e55b91 100644
--- a/TAO/tests/Bug_3674_Regression/test.cpp
+++ b/TAO/tests/Bug_3674_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/ORBInitializer_Registry.h"
#include "tao/PI/PI.h"
diff --git a/TAO/tests/Bug_3674_Regression/test.idl b/TAO/tests/Bug_3674_Regression/test.idl
index 09e9fd73d76..20bd0642290 100644
--- a/TAO/tests/Bug_3674_Regression/test.idl
+++ b/TAO/tests/Bug_3674_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface testInterface
{
void firstCalling ();
diff --git a/TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc b/TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc
index f024b91def8..e9839f9cad5 100644
--- a/TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc
+++ b/TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3676_Regression/client.cpp b/TAO/tests/Bug_3676_Regression/client.cpp
index cb20eaaf8d4..61ced830087 100644
--- a/TAO/tests/Bug_3676_Regression/client.cpp
+++ b/TAO/tests/Bug_3676_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Profile_Transport_Resolver.h"
#include "tao/Transport.h"
diff --git a/TAO/tests/Bug_3676_Regression/server.cpp b/TAO/tests/Bug_3676_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3676_Regression/server.cpp
+++ b/TAO/tests/Bug_3676_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc b/TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc
index 9a3c4a1c7b3..59ab97918d4 100644
--- a/TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc
+++ b/TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Echo.idl
diff --git a/TAO/tests/Bug_3683_Regression/Echo.idl b/TAO/tests/Bug_3683_Regression/Echo.idl
index 993d08612bd..ffc69e77ab6 100644
--- a/TAO/tests/Bug_3683_Regression/Echo.idl
+++ b/TAO/tests/Bug_3683_Regression/Echo.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#if !defined (_ECHO_IDL)
#define _ECHO_IDL
diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
index f3e45069e40..c96b220634c 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_i.cpp
+++ b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_i.h"
// Constructor.
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.cpp b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
index 392f20221cb..85475c11224 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.cpp
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_UTIL_C
#define SIMPLE_UTIL_C
diff --git a/TAO/tests/Bug_3683_Regression/server.cpp b/TAO/tests/Bug_3683_Regression/server.cpp
index 18eaefc297e..5358c916c87 100644
--- a/TAO/tests/Bug_3683_Regression/server.cpp
+++ b/TAO/tests/Bug_3683_Regression/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Simple_util.h"
#include "Echo_i.h"
diff --git a/TAO/tests/Bug_3695_Regression/Bug_3695.cpp b/TAO/tests/Bug_3695_Regression/Bug_3695.cpp
index 3d1ee4218f5..86381fa1184 100644
--- a/TAO/tests/Bug_3695_Regression/Bug_3695.cpp
+++ b/TAO/tests/Bug_3695_Regression/Bug_3695.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP == 0)
#include "ace/OS_main.h"
diff --git a/TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc b/TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc
index f4f5bc2a5e2..3d6edfdcc86 100644
--- a/TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc
+++ b/TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: taoclient {
exename = *
}
diff --git a/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc b/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc
index e9fa8a23ed9..843dce03b63 100644
--- a/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc
+++ b/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
Source_Files {
client.cpp
diff --git a/TAO/tests/Bug_3701_Regression/client.cpp b/TAO/tests/Bug_3701_Regression/client.cpp
index a3cea619961..3672ccaee44 100644
--- a/TAO/tests/Bug_3701_Regression/client.cpp
+++ b/TAO/tests/Bug_3701_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/SystemException.h"
int
diff --git a/TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc b/TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc
index d6323251520..17a187ea935 100644
--- a/TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc
+++ b/TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3746_Regression/client.cpp b/TAO/tests/Bug_3746_Regression/client.cpp
index 75df0ef04eb..10215aab92b 100644
--- a/TAO/tests/Bug_3746_Regression/client.cpp
+++ b/TAO/tests/Bug_3746_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3746_Regression/server.cpp b/TAO/tests/Bug_3746_Regression/server.cpp
index 3d1d8ef00f8..4386d4f89a2 100644
--- a/TAO/tests/Bug_3746_Regression/server.cpp
+++ b/TAO/tests/Bug_3746_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc b/TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc
index 324361185ce..a4d0f6259d9 100644
--- a/TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc
+++ b/TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3748_Regression/client.cpp b/TAO/tests/Bug_3748_Regression/client.cpp
index 1742dd08168..08a76ad8e13 100644
--- a/TAO/tests/Bug_3748_Regression/client.cpp
+++ b/TAO/tests/Bug_3748_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3748_Regression/server.cpp b/TAO/tests/Bug_3748_Regression/server.cpp
index 45229e6a070..77e3721d623 100644
--- a/TAO/tests/Bug_3748_Regression/server.cpp
+++ b/TAO/tests/Bug_3748_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "Server_ORBInitializer.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc b/TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc
index 1ecceb08eb8..cb4e9bb8f1f 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc
+++ b/TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server) : taoexe {
exename=server
diff --git a/TAO/tests/Bug_3755_Ext_Regression/common.cpp b/TAO/tests/Bug_3755_Ext_Regression/common.cpp
index 1d4f5d60fb5..eca6a8dd8c0 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/common.cpp
+++ b/TAO/tests/Bug_3755_Ext_Regression/common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3755_Ext_Regression/common.h b/TAO/tests/Bug_3755_Ext_Regression/common.h
index b289652ad3b..023c2784466 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/common.h
+++ b/TAO/tests/Bug_3755_Ext_Regression/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ace_wchar.h"
#define FIRST_ORB_NAME "first_orb"
diff --git a/TAO/tests/Bug_3755_Ext_Regression/server.cpp b/TAO/tests/Bug_3755_Ext_Regression/server.cpp
index 1fc73c84bc9..3472cde21c1 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/server.cpp
+++ b/TAO/tests/Bug_3755_Ext_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "ace/OS_main.h"
diff --git a/TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc b/TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc
index e56827334f8..791c649006b 100644
--- a/TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc
+++ b/TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server) : rt_server {
exename=server
diff --git a/TAO/tests/Bug_3755_Regression/server.cpp b/TAO/tests/Bug_3755_Regression/server.cpp
index b0c61046df8..24ba8277b20 100644
--- a/TAO/tests/Bug_3755_Regression/server.cpp
+++ b/TAO/tests/Bug_3755_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/ARGV.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc b/TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc
index 4575ede6262..8eb31c220cb 100644
--- a/TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc
+++ b/TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_3766_Regression/Test.idl b/TAO/tests/Bug_3766_Regression/Test.idl
index ae6bc0d1a95..e21baea0179 100644
--- a/TAO/tests/Bug_3766_Regression/Test.idl
+++ b/TAO/tests/Bug_3766_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IDL_
#define TEST_IDL_
diff --git a/TAO/tests/Bug_3766_Regression/client.cpp b/TAO/tests/Bug_3766_Regression/client.cpp
index 0999ff151a5..ef7380fcb27 100644
--- a/TAO/tests/Bug_3766_Regression/client.cpp
+++ b/TAO/tests/Bug_3766_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3766_Regression/server.cpp b/TAO/tests/Bug_3766_Regression/server.cpp
index aaeece0c1f0..a0785ac0311 100644
--- a/TAO/tests/Bug_3766_Regression/server.cpp
+++ b/TAO/tests/Bug_3766_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestI.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc b/TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc
index 14376c453f7..cff7fb39873 100644
--- a/TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc
+++ b/TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3790_Regression/server.cpp b/TAO/tests/Bug_3790_Regression/server.cpp
index 321f89d50de..80f2e8df786 100644
--- a/TAO/tests/Bug_3790_Regression/server.cpp
+++ b/TAO/tests/Bug_3790_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3790_Regression/server2.cpp b/TAO/tests/Bug_3790_Regression/server2.cpp
index c5aa3b8fd39..dc3b6a55cc6 100644
--- a/TAO/tests/Bug_3790_Regression/server2.cpp
+++ b/TAO/tests/Bug_3790_Regression/server2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_testC.h"
#include "tao/ORB_Core.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/tests/Bug_3790_Regression/simple_test.idl b/TAO/tests/Bug_3790_Regression/simple_test.idl
index 308e9420436..11cce4bbd8f 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test.idl
+++ b/TAO/tests/Bug_3790_Regression/simple_test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SIMPLE_TEST_
#define _SIMPLE_TEST_
diff --git a/TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc b/TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc
index 8f06935f63e..b51d1214a97 100644
--- a/TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc
+++ b/TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc b/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc
index a38353822bc..b9203d83349 100644
--- a/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc
+++ b/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -SS
diff --git a/TAO/tests/Bug_3821_Regression/test.cpp b/TAO/tests/Bug_3821_Regression/test.cpp
index fb63782b2cc..b25544377c1 100644
--- a/TAO/tests/Bug_3821_Regression/test.cpp
+++ b/TAO/tests/Bug_3821_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/CDR.h"
diff --git a/TAO/tests/Bug_3821_Regression/test.idl b/TAO/tests/Bug_3821_Regression/test.idl
index fb1fd5a0f07..bd10ab38ec2 100644
--- a/TAO/tests/Bug_3821_Regression/test.idl
+++ b/TAO/tests/Bug_3821_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module test {
enum Enumeration {
Enum1,
diff --git a/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc b/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc
index ab00104856d..ae1fabfc6e9 100644
--- a/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc
+++ b/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server) : taoexe {
exename=server
diff --git a/TAO/tests/Bug_3826_Regression/server.cpp b/TAO/tests/Bug_3826_Regression/server.cpp
index ffd0e3ce029..efb2cee071b 100644
--- a/TAO/tests/Bug_3826_Regression/server.cpp
+++ b/TAO/tests/Bug_3826_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/ARGV.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc b/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc
index e289841bc90..3c9395e3bf1 100644
--- a/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc
+++ b/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
Message.idl
diff --git a/TAO/tests/Bug_3827_Regression/Message.idl b/TAO/tests/Bug_3827_Regression/Message.idl
index 848d48e50a4..b726e81fe48 100644
--- a/TAO/tests/Bug_3827_Regression/Message.idl
+++ b/TAO/tests/Bug_3827_Regression/Message.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Message
{
public string user;
diff --git a/TAO/tests/Bug_3827_Regression/test.cpp b/TAO/tests/Bug_3827_Regression/test.cpp
index 22259070653..1a8ebec6c85 100644
--- a/TAO/tests/Bug_3827_Regression/test.cpp
+++ b/TAO/tests/Bug_3827_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessageC.h"
#include "ace/Task.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc b/TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc
index 075f60c2d48..213b5c67c8b 100644
--- a/TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc
+++ b/TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3837_Regression/client.cpp b/TAO/tests/Bug_3837_Regression/client.cpp
index 21984fb845a..d262dd875dd 100644
--- a/TAO/tests/Bug_3837_Regression/client.cpp
+++ b/TAO/tests/Bug_3837_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3837_Regression/server.cpp b/TAO/tests/Bug_3837_Regression/server.cpp
index beb88556a6c..2959b24a3cc 100644
--- a/TAO/tests/Bug_3837_Regression/server.cpp
+++ b/TAO/tests/Bug_3837_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3845_Regression/local_inarg.idl b/TAO/tests/Bug_3845_Regression/local_inarg.idl
index 9da93b559f0..c20a2c5fccd 100644
--- a/TAO/tests/Bug_3845_Regression/local_inarg.idl
+++ b/TAO/tests/Bug_3845_Regression/local_inarg.idl
@@ -1,5 +1,3 @@
-// $Id$
-
local interface foo
{
};
diff --git a/TAO/tests/Bug_3845_Regression/local_inoutarg.idl b/TAO/tests/Bug_3845_Regression/local_inoutarg.idl
index 9fb031150ef..aa2d98b7219 100644
--- a/TAO/tests/Bug_3845_Regression/local_inoutarg.idl
+++ b/TAO/tests/Bug_3845_Regression/local_inoutarg.idl
@@ -1,5 +1,3 @@
-// $Id$
-
local interface foo
{
};
diff --git a/TAO/tests/Bug_3845_Regression/local_outarg.idl b/TAO/tests/Bug_3845_Regression/local_outarg.idl
index a0c7e219183..2d18d523bca 100644
--- a/TAO/tests/Bug_3845_Regression/local_outarg.idl
+++ b/TAO/tests/Bug_3845_Regression/local_outarg.idl
@@ -1,5 +1,3 @@
-// $Id$
-
local interface foo
{
};
diff --git a/TAO/tests/Bug_3845_Regression/local_rettype.idl b/TAO/tests/Bug_3845_Regression/local_rettype.idl
index ec9f10b51eb..a684da60c8f 100644
--- a/TAO/tests/Bug_3845_Regression/local_rettype.idl
+++ b/TAO/tests/Bug_3845_Regression/local_rettype.idl
@@ -1,5 +1,3 @@
-// $Id$
-
local interface foo
{
};
diff --git a/TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc b/TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc
index 006aedecaa7..4104c4f6f9d 100644
--- a/TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc
+++ b/TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Hello.idl
diff --git a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
index 1c7d6c0cfe8..b41b6229938 100644
--- a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "client_interceptor.h"
diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.cpp b/TAO/tests/Bug_3853_Regression/Hello_i.cpp
index 4e768a2cb8e..1dfc25c5da6 100644
--- a/TAO/tests/Bug_3853_Regression/Hello_i.cpp
+++ b/TAO/tests/Bug_3853_Regression/Hello_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3853_Regression/client.cpp b/TAO/tests/Bug_3853_Regression/client.cpp
index 765f8677cfd..7428570eb11 100644
--- a/TAO/tests/Bug_3853_Regression/client.cpp
+++ b/TAO/tests/Bug_3853_Regression/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello_i.h"
#include "HelloC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
index 27d67cdddad..0c0313eee35 100644
--- a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "HelloC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_3853_Regression/server.cpp b/TAO/tests/Bug_3853_Regression/server.cpp
index 8067030c910..4d8dbec41a1 100644
--- a/TAO/tests/Bug_3853_Regression/server.cpp
+++ b/TAO/tests/Bug_3853_Regression/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello_i.h"
#include "HelloC.h"
diff --git a/TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc b/TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc
index 75e2eb600fa..06bb23c8c68 100644
--- a/TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc
+++ b/TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3896_Regression/Hello.cpp b/TAO/tests/Bug_3896_Regression/Hello.cpp
index a43d2445314..ee3b10eac8d 100644
--- a/TAO/tests/Bug_3896_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3896_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3896_Regression/client.cpp b/TAO/tests/Bug_3896_Regression/client.cpp
index 0df5f4ce769..89330ba57a9 100644
--- a/TAO/tests/Bug_3896_Regression/client.cpp
+++ b/TAO/tests/Bug_3896_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task_T.h"
diff --git a/TAO/tests/Bug_3896_Regression/server.cpp b/TAO/tests/Bug_3896_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3896_Regression/server.cpp
+++ b/TAO/tests/Bug_3896_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3919_Regression/Hello.cpp b/TAO/tests/Bug_3919_Regression/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Bug_3919_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3919_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3919_Regression/Test2.idl b/TAO/tests/Bug_3919_Regression/Test2.idl
index d66a82bc32c..4bc2e2f6892 100644
--- a/TAO/tests/Bug_3919_Regression/Test2.idl
+++ b/TAO/tests/Bug_3919_Regression/Test2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test.idl"
module Test2
diff --git a/TAO/tests/Bug_3919_Regression/client.cpp b/TAO/tests/Bug_3919_Regression/client.cpp
index a1aa68d5292..2fe749eea90 100644
--- a/TAO/tests/Bug_3919_Regression/client.cpp
+++ b/TAO/tests/Bug_3919_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test2C.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Bug_3919_Regression/server.cpp b/TAO/tests/Bug_3919_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_3919_Regression/server.cpp
+++ b/TAO/tests/Bug_3919_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc b/TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc
index 342e78b964b..ce8d1f50c08 100644
--- a/TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc
+++ b/TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp
index bc817f79d96..bdbaa9f53a2 100644
--- a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h
index 65f0a38924b..7e908d06d22 100644
--- a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
index 86e2837dc17..bb010e4f324 100644
--- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
index 0328ecbeb55..eca718ce32a 100644
--- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
+++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Bug_3926_Regression/client.cpp b/TAO/tests/Bug_3926_Regression/client.cpp
index e56deca7d19..5c16c0ca9ff 100644
--- a/TAO/tests/Bug_3926_Regression/client.cpp
+++ b/TAO/tests/Bug_3926_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Bug_3926_Regression/server.cpp b/TAO/tests/Bug_3926_Regression/server.cpp
index 99a2277b57c..14719cd5a44 100644
--- a/TAO/tests/Bug_3926_Regression/server.cpp
+++ b/TAO/tests/Bug_3926_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3926_Regression/test.idl b/TAO/tests/Bug_3926_Regression/test.idl
index 3c60aba7dd8..8e6a75c217f 100644
--- a/TAO/tests/Bug_3926_Regression/test.idl
+++ b/TAO/tests/Bug_3926_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module hello {
interface GoodDay {
short number ();
diff --git a/TAO/tests/Bug_3926_Regression/test_i.cpp b/TAO/tests/Bug_3926_Regression/test_i.cpp
index bbaee56dd3e..f0afd143e1c 100644
--- a/TAO/tests/Bug_3926_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3926_Regression/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc b/TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc
index da3efeb647e..c5186092bb2 100644
--- a/TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc
+++ b/TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3941_Regression/test.cpp b/TAO/tests/Bug_3941_Regression/test.cpp
index 93813ed2bcb..cd183759598 100644
--- a/TAO/tests/Bug_3941_Regression/test.cpp
+++ b/TAO/tests/Bug_3941_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
int
diff --git a/TAO/tests/Bug_3941_Regression/test.idl b/TAO/tests/Bug_3941_Regression/test.idl
index 6bb4c5056be..a6b184c1c75 100644
--- a/TAO/tests/Bug_3941_Regression/test.idl
+++ b/TAO/tests/Bug_3941_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module test {
abstract valuetype EventBase { };
diff --git a/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp b/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp
index 2efbc1589ae..b32ae1e6d27 100644
--- a/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp
+++ b/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "FooS.h"
#include "tao/LocalObject.h"
#include "tao/Version.h"
diff --git a/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc b/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc
index 2d2ba812208..a90bf4aa21b 100644
--- a/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc
+++ b/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: taoexe {
macros += LOCAL
idlflags += -DLOCAL
diff --git a/TAO/tests/Bug_3942_Regression/Foo.idl b/TAO/tests/Bug_3942_Regression/Foo.idl
index a3d1a343e9b..68cf58a5056 100644
--- a/TAO/tests/Bug_3942_Regression/Foo.idl
+++ b/TAO/tests/Bug_3942_Regression/Foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifdef LOCAL
local
#endif
diff --git a/TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc b/TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc
index ad221b73797..e6d6a6815f2 100644
--- a/TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc
+++ b/TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*_Idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3953_Regression/client.cpp b/TAO/tests/Bug_3953_Regression/client.cpp
index e750f653289..d28e168eedf 100644
--- a/TAO/tests/Bug_3953_Regression/client.cpp
+++ b/TAO/tests/Bug_3953_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_3953_Regression/client_i.cpp b/TAO/tests/Bug_3953_Regression/client_i.cpp
index 7525ef2160c..c25ba3f761f 100644
--- a/TAO/tests/Bug_3953_Regression/client_i.cpp
+++ b/TAO/tests/Bug_3953_Regression/client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
client_i::client_i (int quiet,
diff --git a/TAO/tests/Bug_3953_Regression/client_i.h b/TAO/tests/Bug_3953_Regression/client_i.h
index b0d308f04b8..a257039dab6 100644
--- a/TAO/tests/Bug_3953_Regression/client_i.h
+++ b/TAO/tests/Bug_3953_Regression/client_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class client_i : public POA_client
diff --git a/TAO/tests/Bug_3953_Regression/server.cpp b/TAO/tests/Bug_3953_Regression/server.cpp
index 2a1c46c05f4..3480610622f 100644
--- a/TAO/tests/Bug_3953_Regression/server.cpp
+++ b/TAO/tests/Bug_3953_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3953_Regression/server_i.cpp b/TAO/tests/Bug_3953_Regression/server_i.cpp
index d0a374dc038..2fb5b3cd48c 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.cpp
+++ b/TAO/tests/Bug_3953_Regression/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
server_i::server_i (int quiet,
diff --git a/TAO/tests/Bug_3953_Regression/server_i.h b/TAO/tests/Bug_3953_Regression/server_i.h
index a60c9f8876d..c8605f01478 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.h
+++ b/TAO/tests/Bug_3953_Regression/server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class server_i : public POA_server
diff --git a/TAO/tests/Bug_3953_Regression/test.idl b/TAO/tests/Bug_3953_Regression/test.idl
index 45664cfb035..5c32f4d0456 100644
--- a/TAO/tests/Bug_3953_Regression/test.idl
+++ b/TAO/tests/Bug_3953_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc b/TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc
+++ b/TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3954_Regression/Hello.cpp b/TAO/tests/Bug_3954_Regression/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/Bug_3954_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3954_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3954_Regression/client.cpp b/TAO/tests/Bug_3954_Regression/client.cpp
index 1bb3e718137..db10fc575b3 100644
--- a/TAO/tests/Bug_3954_Regression/client.cpp
+++ b/TAO/tests/Bug_3954_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3954_Regression/server.cpp b/TAO/tests/Bug_3954_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3954_Regression/server.cpp
+++ b/TAO/tests/Bug_3954_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc b/TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc
+++ b/TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_4010_Regression/Hello.cpp b/TAO/tests/Bug_4010_Regression/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/Bug_4010_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4010_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_4010_Regression/client.cpp b/TAO/tests/Bug_4010_Regression/client.cpp
index 9e5ab1f44da..d54634333dd 100644
--- a/TAO/tests/Bug_4010_Regression/client.cpp
+++ b/TAO/tests/Bug_4010_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_4010_Regression/server.cpp b/TAO/tests/Bug_4010_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_4010_Regression/server.cpp
+++ b/TAO/tests/Bug_4010_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc b/TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc
index 6f150f6058b..2cbd595fcd2 100644
--- a/TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc
+++ b/TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_4059_Regression/Hello.cpp b/TAO/tests/Bug_4059_Regression/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/Bug_4059_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4059_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_4059_Regression/client.cpp b/TAO/tests/Bug_4059_Regression/client.cpp
index 1d9cbe489c2..774de214a0d 100644
--- a/TAO/tests/Bug_4059_Regression/client.cpp
+++ b/TAO/tests/Bug_4059_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/Policy_ManagerC.h"
diff --git a/TAO/tests/Bug_4059_Regression/server.cpp b/TAO/tests/Bug_4059_Regression/server.cpp
index 5d5f0b3ed04..51d27ad8557 100644
--- a/TAO/tests/Bug_4059_Regression/server.cpp
+++ b/TAO/tests/Bug_4059_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp
index 3e8425915dd..6a5cacc2654 100644
--- a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp
+++ b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Bug_4082_RegressionC.h"
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl
index 2eaf7daadc4..7861fa74b28 100644
--- a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl
+++ b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/LongSeq.pidl"
typedef sequence<long> MyLongSeq;
diff --git a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc
index 9e239111671..09594c2588a 100644
--- a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc
+++ b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc
@@ -1,3 +1,2 @@
-// $Id$
project: taoclient, anytypecode {
}
diff --git a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp
index 81440cf3aea..579feca98c7 100644
--- a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp
+++ b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Bug_4097_RegressionS.h"
#include "tao/corba.h"
diff --git a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl
index 7fe7a9e7dab..669e6a3f475 100644
--- a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl
+++ b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
union MultiLabelUnion switch (long) {
case 0:
case 1:
diff --git a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc
index 516a0bbe2d3..b8f8c67b00b 100644
--- a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc
+++ b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): taoserver, messaging, gen_ostream {
custom_only=1
IDL_Files {
diff --git a/TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc b/TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc
index 261c70d9856..5eaf287b304 100644
--- a/TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc
+++ b/TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/tests/Bug_933_Regression/Messenger.idl b/TAO/tests/Bug_933_Regression/Messenger.idl
index 8e58fb36240..869e639b27b 100644
--- a/TAO/tests/Bug_933_Regression/Messenger.idl
+++ b/TAO/tests/Bug_933_Regression/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orb.idl"
interface Messenger
diff --git a/TAO/tests/Bug_933_Regression/MessengerClient.cpp b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
index d21be49dd53..3905d3e4f05 100644
--- a/TAO/tests/Bug_933_Regression/MessengerClient.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "tao/CodecFactory/CodecFactory.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_933_Regression/MessengerServer.cpp b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
index 37959ffa361..af48c1b83ce 100644
--- a/TAO/tests/Bug_933_Regression/MessengerServer.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.cpp b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
index 3bd849e1337..bbc91d00fed 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.cpp
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "tao/CodecFactory/CodecFactory.h"
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.h b/TAO/tests/Bug_933_Regression/Messenger_i.h
index 486c2e3ee67..3736ecb672e 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H_
#define MESSENGER_I_H_
diff --git a/TAO/tests/CDR/CDR.mpc b/TAO/tests/CDR/CDR.mpc
index cfbc027a2b2..9451bd04e75 100644
--- a/TAO/tests/CDR/CDR.mpc
+++ b/TAO/tests/CDR/CDR.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Alignment) : taoexe {
exename = alignment
diff --git a/TAO/tests/COIOP/COIOP_Tests.mpc b/TAO/tests/COIOP/COIOP_Tests.mpc
index 0e20ade2b85..bb2ded41b0e 100644
--- a/TAO/tests/COIOP/COIOP_Tests.mpc
+++ b/TAO/tests/COIOP/COIOP_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp
index 4618639b2b0..37c5c9a9a99 100644
--- a/TAO/tests/COIOP/Client_Task.cpp
+++ b/TAO/tests/COIOP/Client_Task.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Task.h"
#include "tao/ORB_Core.h"
#include "TestC.h"
diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp
index 71272b4add1..78d9023ccef 100644
--- a/TAO/tests/COIOP/Hello.cpp
+++ b/TAO/tests/COIOP/Hello.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp
index f7bf8b30613..04abb027a27 100644
--- a/TAO/tests/COIOP/Server_Task.cpp
+++ b/TAO/tests/COIOP/Server_Task.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc b/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc
index 85905a99a88..72052a8815c 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc
+++ b/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver {
}
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/server.cpp b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
index 9062a8c7220..d8d1b94047d 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
+++ b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/CSD_Collocation/CSD_Collocation.mpc b/TAO/tests/CSD_Collocation/CSD_Collocation.mpc
index 1d841625924..c01002514e5 100644
--- a/TAO/tests/CSD_Collocation/CSD_Collocation.mpc
+++ b/TAO/tests/CSD_Collocation/CSD_Collocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoserver, taoidldefaults, strategies, csd_threadpool, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
idlflags += -Gd -St -Sa
exename = Collocation
diff --git a/TAO/tests/CSD_Collocation/Collocation.cpp b/TAO/tests/CSD_Collocation/Collocation.cpp
index 1daaff56119..0a2b05d4b8a 100644
--- a/TAO/tests/CSD_Collocation/Collocation.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Collocation_Tester.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/CSD_Framework/CSD_ORBInitializer.h"
diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
index b5df2c741b5..0b85fcbe51b 100644
--- a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================================
//
// =FILENAME
diff --git a/TAO/tests/CSD_Collocation/Diamond.idl b/TAO/tests/CSD_Collocation/Diamond.idl
index 0e60b25c52c..8b0072e4a90 100644
--- a/TAO/tests/CSD_Collocation/Diamond.idl
+++ b/TAO/tests/CSD_Collocation/Diamond.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Diamond
{
interface Top
diff --git a/TAO/tests/CSD_Collocation/Diamond_i.cpp b/TAO/tests/CSD_Collocation/Diamond_i.cpp
index 8db13a90689..cede8ba100c 100644
--- a/TAO/tests/CSD_Collocation/Diamond_i.cpp
+++ b/TAO/tests/CSD_Collocation/Diamond_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Diamond_i.h"
Top_i::Top_i ()
diff --git a/TAO/tests/CSD_Collocation/Diamond_i.h b/TAO/tests/CSD_Collocation/Diamond_i.h
index f8b04710830..9c40c7fe247 100644
--- a/TAO/tests/CSD_Collocation/Diamond_i.h
+++ b/TAO/tests/CSD_Collocation/Diamond_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (TAO_DIAMOND_I_H)
#define TAO_DIAMOND_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc b/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
index 016caef75ef..c8949cca955 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_b {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index f1bfd44f74a..b9ae2cb7e37 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
index f319293d3ed..fa005fdda5c 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index 4ca2dc82800..ea45b56328d 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
index 50d125e8193..3141df7fde7 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
index f1979e1a13d..084647b1edd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "AppHelper.h"
void
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
index 1799f1032f3..27aaab8a148 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef APPHELPER_H
#define APPHELPER_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
index cfb13da0cd9..676e4ae79f2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "AppShutdown.h"
#include "TestAppExceptionC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
index 097249686ee..a8307ab45b4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef APP_SHUTDOWN_H
#define APP_SHUTDOWN_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
index 9ebd7dc8f34..d2cadef5379 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Test
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
index 8f9afcf68de..379a8ce41d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CANCELAPPXCEPTION_IDL
#define CANCELAPPXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
index 361bb3cd465..221781e1b9e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
index dbc71737f99..5f8ac3afd29 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientTask.h"
#include "ClientEngine.h"
#include "AppShutdown.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
index 794900c41ce..e5ad609a19e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CUSTOMEXCEPTION_IDL
#define CUSTOMEXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
index 4f76953e24c..330914baa72 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOOEXCEPTION_IDL
#define FOOEXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
index 812495cc732..4284e163ee8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "OrbRunner.h"
#include "OrbTask.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
index 8e3f8138239..36fff3dd607 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef ORB_RUNNER_H
#define ORB_RUNNER_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
index 738af1ea9df..48663b6fc01 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServantList_T.h"
#include "AppHelper.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
index 43e639c9beb..20607775fd3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVANTLIST_T_H
#define SERVANTLIST_T_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
index 8e39e223b45..46fabc593e8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "StatisticsHelper.h"
// swap function for integers
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
index 16ed9c88eef..ae95c226bf7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_HELPER_H
#define STATISTICS_HELPER_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
index faa872c6e87..eb6905eb2e3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestAppBase.h"
TestAppBase::TestAppBase(const char* name)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
index 3d52871e907..0fb4aaaaa9f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPBASE_H
#define TESTAPPBASE_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
index 2ac53939b77..f4cf0a8d88c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPXCEPTION_IDL
#define TESTAPPXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
index bcbdb6e9e6b..a5e08322381 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPMAIN_H
#define TESTAPPMAIN_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
index 9b855c486d8..ca907778452 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Foo_A
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
index e9f3b0345f8..86c7b7e96d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_A_IDL
#define FOO_A_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
index 94e0a9d13d8..6b776551fd7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_A_ClientEngine.h"
#include "Foo_A_Statistics.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
index 82cb6b65221..c98bd78c21b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_A_Statistics.h"
#include "Foo_A_ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
index b9301b915bf..f2b979cea57 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_A_H
#define STATISTICS_A_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
index a7ca8835ecc..c6b4504db22 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_A_i.h"
#include "AppShutdown.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
index 16a53f60ddf..8f5bde6d947 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_A_I_H
#define FOO_A_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
index c6e2f4cd967..dd19470fae6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Foo_B
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
index 717d74adea5..5a57daa64f1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_IDL
#define CALLBACK_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
index 31b0d120dae..2a43feb4f6d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Callback_i.h"
Callback_i::Callback_i()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
index cb9b851c68e..04b2d94c5d2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
index 949f08397ad..e5ee97f163e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_B_IDL
#define FOO_B_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
index 9d497df00c9..6592f5b0720 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_B_ClientEngine.h"
#include "Callback_i.h"
#include "Foo_B_Statistics.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
index 0c41b14b0bc..b6d215e0a94 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_B_SimpleClientEngine.h"
#include "Callback_i.h"
#include "Foo_B_Statistics.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
index 2db50ba7eb8..79cdd00ed9b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_B_Statistics.h"
#include "Foo_B_ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
index e8d9569a2d5..6dadbe4d564 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_B_H
#define STATISTICS_B_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 5e90582eff3..151dda93167 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Foo_B_i.h"
#include "AppShutdown.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
index 1a0367a27e7..6ad53b221ff 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_B_I_H
#define FOO_B_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
index ef1996b0a26..8e8044b90e7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Foo_C
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
index b7eeea96f33..6315c0beae8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_C_IDL
#define FOO_C_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
index b84640b56e0..3b66b5e29c9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_ClientEngine.h"
#include "AppHelper.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
index 260bf44b3e9..8d717ec510d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_Custom_ClientEngine.h"
#include "CustomExceptionC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
index acd49fa4665..b33c12bfa71 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_Custom_Proxy.h"
#include "Foo_C_cust_op1.h"
#include "Foo_C_cust_op2.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
index b6155743e3b..6f314f493a4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_Statistics.h"
#include "Foo_C_ClientEngine.h"
#include "Foo_C_Custom_ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
index f115ddc2b1f..79de17967ee 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_C_H
#define STATISTICS_C_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
index 36734cadf2b..7d20b104616 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op1.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
index 40ffbf190f9..7a6933c5dfd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op2.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
index 7e009e52230..33d68371a87 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op3.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
index f4acb9c02d8..34164cc5149 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op4.h"
#include "Foo_C_i.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
index 9a165fe984c..134cf755d07 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op5.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
index d9e11bfad32..144f2027738 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_i.h"
#include "AppShutdown.h"
#include "CustomExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
index 6262bce85dd..cd858e9c49f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_C_I_H
#define FOO_C_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
index 02cac4dc7da..b87548082df 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_a {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
index 50a4510a73b..f7d3362010c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "Foo_A_ClientEngine.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
index 413b57bb450..eeddb17762a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
index 3524f4f98cc..b94c0b06e9c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_A_i.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
index b5910996e11..b0056a179c3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
index ae98ca0f6ac..b798f83431d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
index 02cac4dc7da..b87548082df 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_a {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index 21b94144ddd..abde30b72f6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
index 3ed51561d1d..1afc33c0b6e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index 1cd428ddf23..a9331abcc0a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
index 1e1dc4811d0..32f98b91403 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
index 0be257accae..f756a6920fc 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
index 016caef75ef..c8949cca955 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_b {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index a9b8b14ed5e..96b4f181f3e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
index 02d78238a8c..e4b0a709066 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 87d51f92e3b..9d43cef70aa 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
index 0246da44cf8..1be5ea37097 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
index ca9f92ac607..99ba4b4b33f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_c {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index d2b3b5b90a8..6c37f9ed293 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
index a9dad6ccc1b..f89df26d866 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 93b84ad02dd..25383409b9e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
index a61522a1372..8628996fce9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
index 116a9142daa..9472aca3ec4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
index abaed430dc8..144fb6910b1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
index 5d2ca8262dc..f403566be8e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
index afd9e5d8e68..f9d7d6f9d66 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_a {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
index b2facabbb25..55a40bae54e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "Foo_A_ClientEngine.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
index 413b57bb450..eeddb17762a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
index 3e235a78124..00076b5953a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_A_i.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
index db7bd534377..4c2cf169f29 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
index ae98ca0f6ac..b798f83431d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
index 899a542fef2..944cc8de6d6 100644
--- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
+++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp
index f441e3de509..20650ac0a36 100644
--- a/TAO/tests/Cache_Growth_Test/client.cpp
+++ b/TAO/tests/Cache_Growth_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp
index 428a7c13ff9..61d29a4267f 100644
--- a/TAO/tests/Cache_Growth_Test/server.cpp
+++ b/TAO/tests/Cache_Growth_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc
index 2bd74f5ef3a..29dfafe71c2 100644
--- a/TAO/tests/CallbackTest/CallbackTest.mpc
+++ b/TAO/tests/CallbackTest/CallbackTest.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp
index 8a291889707..23cb32f14c8 100644
--- a/TAO/tests/CallbackTest/client.cpp
+++ b/TAO/tests/CallbackTest/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp
index 001a9741513..f22b679fb08 100644
--- a/TAO/tests/CallbackTest/server.cpp
+++ b/TAO/tests/CallbackTest/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Service.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/ClientPortSpan/ClientPortSpan.mpc b/TAO/tests/ClientPortSpan/ClientPortSpan.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/ClientPortSpan/ClientPortSpan.mpc
+++ b/TAO/tests/ClientPortSpan/ClientPortSpan.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/ClientPortSpan/Hello.cpp b/TAO/tests/ClientPortSpan/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/ClientPortSpan/Hello.cpp
+++ b/TAO/tests/ClientPortSpan/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/ClientPortSpan/client.cpp b/TAO/tests/ClientPortSpan/client.cpp
index 9947b25b910..c132a448177 100644
--- a/TAO/tests/ClientPortSpan/client.cpp
+++ b/TAO/tests/ClientPortSpan/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/ClientPortSpan/server.cpp b/TAO/tests/ClientPortSpan/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/ClientPortSpan/server.cpp
+++ b/TAO/tests/ClientPortSpan/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc
index b261a907e44..d1672e74ace 100644
--- a/TAO/tests/Client_Leaks/Client_Leaks.mpc
+++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index e2585d5704e..77152ee162e 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Process.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index c968b21002a..87665d4fbc5 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp
index b748d79f4bb..18006da3b87 100644
--- a/TAO/tests/Client_Leaks/server.cpp
+++ b/TAO/tests/Client_Leaks/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Process_Factory.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc
index feaa8c5ddea..0c453b29354 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taolib, codeset {
sharedname = IBM1047_ISO8859
dynamicflags += IBM1047_ISO8859_BUILD_DLL
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_export.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_export.h
index 5a31c9c23b9..0b297054ce2 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_export.h
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_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/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc b/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc
index c3b0ca24fc1..c64af74a125 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taolib, codeset {
sharedname = UCS4_UTF16
dynamicflags += UCS4_UTF16_BUILD_DLL
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
index fa625d9c229..570a3667621 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "WUCS4_UTF16_Factory.h"
ACE_STATIC_SVC_DEFINE (WUCS4_UTF16_Factory,
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_export.h b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_export.h
index d668942ef44..54469836705 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_export.h
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_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/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc
index 4cf0aa5b954..fb5399bd717 100644
--- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc
+++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taolib, codeset {
sharedname = UTF16_UCS2
dynamicflags += UTF16_UCS2_BUILD_DLL
diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h
index cfb9738322b..abcd4280f7d 100644
--- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h
+++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s UTF16_UCS2
// ------------------------------
diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
index 41daa57f1be..90e1980fcaf 100644
--- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
+++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
simple.idl
diff --git a/TAO/tests/CodeSets/simple/simple.idl b/TAO/tests/CodeSets/simple/simple.idl
index 9f58cc8869f..248c9701375 100644
--- a/TAO/tests/CodeSets/simple/simple.idl
+++ b/TAO/tests/CodeSets/simple/simple.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface simple
{
string op1 (in string name,
diff --git a/TAO/tests/Codec/Codec.mpc b/TAO/tests/Codec/Codec.mpc
index aea55d91e36..3cb10743126 100644
--- a/TAO/tests/Codec/Codec.mpc
+++ b/TAO/tests/Codec/Codec.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, codecfactory, codeset {
Source_Files {
testC.cpp
diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index a884ba63952..c675031b0c2 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CodecFactory/CodecFactory.h"
#include "tao/Codeset/Codeset.h"
#include "testC.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc
index 2521cb67dda..c94e2b9b5ea 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Enable DIRECT Collocation, disable Thru_Poa
project(Collocated_Best_Direct): taoserver {
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc
index 9604c0aff49..8bf60bbdad7 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Disable Thru_Pu and don't enable Direct
project(Collocated_Best_NoColl): taoserver {
exename = Collocated_Best_NoColl
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc
index 1d2e67eccdc..ca598f30bfc 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Thru_Poa default enabled, Direct default disabled
project(Collocated_Best_ThruP): taoserver {
exename = Collocated_Best_ThruP
diff --git a/TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc b/TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc
index 7fab7ae785c..65cb408f039 100644
--- a/TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc
+++ b/TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Thru_Pu is disabled, enable direct
project(Collocated_DIF): taoserver {
exename = Collocated_DerivedIF
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.cpp b/TAO/tests/Collocated_DerivedIF/Hello.cpp
index ad2dff673c9..400c6b2a709 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocated_DerivedIF/Test.idl b/TAO/tests/Collocated_DerivedIF/Test.idl
index b0eef86c20b..76d36162f6c 100644
--- a/TAO/tests/Collocated_DerivedIF/Test.idl
+++ b/TAO/tests/Collocated_DerivedIF/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc b/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc
index 55cd8c54a5a..55fbb4f1066 100644
--- a/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc
+++ b/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
idlflags += -Gd -Sorb
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
index ea9486a45f6..2bc503b80c1 100644
--- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
index b6aaa094286..082deef36ee 100644
--- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
index 784f8b14f8b..548f1027c09 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "tao/PI_Server/PI_Server.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
index 8d40f494b20..78116481ce8 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef SERVER_REQUEST_INTERCEPTOR_H
#define SERVER_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Collocated_Forwarding/server.cpp b/TAO/tests/Collocated_Forwarding/server.cpp
index 0fbf6222830..5947960f668 100644
--- a/TAO/tests/Collocated_Forwarding/server.cpp
+++ b/TAO/tests/Collocated_Forwarding/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Collocated_Forwarding/test_i.cpp b/TAO/tests/Collocated_Forwarding/test_i.cpp
index fb70256f103..a2f0451bd10 100644
--- a/TAO/tests/Collocated_Forwarding/test_i.cpp
+++ b/TAO/tests/Collocated_Forwarding/test_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
// -*- C++ -*-
#include "test_i.h"
diff --git a/TAO/tests/Collocated_Forwarding/test_i.h b/TAO/tests/Collocated_Forwarding/test_i.h
index e261a71ef2f..847217953d8 100644
--- a/TAO/tests/Collocated_Forwarding/test_i.h
+++ b/TAO/tests/Collocated_Forwarding/test_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc b/TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc
index 8edb4eea37c..c4af8832797 100644
--- a/TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc
+++ b/TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Thru_Pu is default enabled
project(Collocated_NoColl): taoserver {
exename = Collocated_NoColl
diff --git a/TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc b/TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc
index 86c10ace774..524cf6cc9b4 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc
+++ b/TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Disable THRU_POA Collocation
project(Collocated_ThruP_Sp): taoserver {
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc b/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc
index a5b5b6fdf8e..7a3400701d4 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Disable THRU_POA Collocation, enable Direct Collocation
project(Coll_ThruP_Sp-Gd): taoserver {
diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp
index 8c5a05ae53f..0859f15b87c 100644
--- a/TAO/tests/Collocation/Collocation.cpp
+++ b/TAO/tests/Collocation/Collocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Collocation_Tester.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc
index 989197459ec..6ef4abe76e8 100644
--- a/TAO/tests/Collocation/Collocation.mpc
+++ b/TAO/tests/Collocation/Collocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Wb,skel_export_macro=Diamond_Export \
-Wb,stub_export_macro=MY_Stub_Export \
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 8d831127fc2..fd7e27de07d 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================================
//
// =FILENAME
diff --git a/TAO/tests/Collocation/Diamond.idl b/TAO/tests/Collocation/Diamond.idl
index 0e60b25c52c..8b0072e4a90 100644
--- a/TAO/tests/Collocation/Diamond.idl
+++ b/TAO/tests/Collocation/Diamond.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Diamond
{
interface Top
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
index 0200835d0a8..76500e00431 100644
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Collocation/Diamond_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Diamond_i.h"
Top_i::Top_i ()
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index d8801332823..2b81c1c5906 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (TAO_DIAMOND_I_H)
#define TAO_DIAMOND_I_H
diff --git a/TAO/tests/Collocation/diamond_export.h b/TAO/tests/Collocation/diamond_export.h
index fff24d8a0e5..78ba933286c 100644
--- a/TAO/tests/Collocation/diamond_export.h
+++ b/TAO/tests/Collocation/diamond_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/tests/Collocation/stub_export.h b/TAO/tests/Collocation/stub_export.h
index 2242f4a184e..ca0093d192c 100644
--- a/TAO/tests/Collocation/stub_export.h
+++ b/TAO/tests/Collocation/stub_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/tests/CollocationLockup/AB.idl b/TAO/tests/CollocationLockup/AB.idl
index fe65905edb6..c4d2df0c040 100644
--- a/TAO/tests/CollocationLockup/AB.idl
+++ b/TAO/tests/CollocationLockup/AB.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface A {
};
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index f3095a294db..b71122bc23b 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* CollocationLockup.cpp
* This is regression test against bug #2130.
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.mpc b/TAO/tests/CollocationLockup/CollocationLockup.mpc
index a5b1b48cfd6..aa84216fdc7 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.mpc
+++ b/TAO/tests/CollocationLockup/CollocationLockup.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
AB.idl
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
index aab58a55d1e..97aab729a41 100644
--- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp
+++ b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* SimpleNamingService.cpp
* This is part of the regression test against bug #2130.
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.idl b/TAO/tests/CollocationLockup/SimpleNamingService.idl
index e76b077308f..78ebf9b82b8 100644
--- a/TAO/tests/CollocationLockup/SimpleNamingService.idl
+++ b/TAO/tests/CollocationLockup/SimpleNamingService.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/// This is a degenerate Naming Service that only binds one object
interface SimpleNamingService {
diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
index b04daa281e7..29625fa56fa 100644
--- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc b/TAO/tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc
index c674fbac67e..fbe453018e1 100644
--- a/TAO/tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc
+++ b/TAO/tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoserver {
exename = Collocated_Test
}
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
index d1192e1964c..57680cb8ed3 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
index ee2e5374ba8..e95f9c20d58 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc b/TAO/tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc
index 9f61292233d..dbd371f0d00 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc
+++ b/TAO/tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoserver, messaging, valuetype {
exename = Collocated_Test
}
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index b65594affff..0f8e79e67e2 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Task.h"
#include "tao/PortableServer/Object_Adapter.h"
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc
index 244a8cc2c48..a119c2bc77b 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Collocation Opportunities): taoserver, avoids_corba_e_micro {
exename = Collocation_Opportunities
}
diff --git a/TAO/tests/Collocation_Tests/Collocation_Tests.mpc b/TAO/tests/Collocation_Tests/Collocation_Tests.mpc
index a3b38d9513d..00c5ceec419 100644
--- a/TAO/tests/Collocation_Tests/Collocation_Tests.mpc
+++ b/TAO/tests/Collocation_Tests/Collocation_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Collocation_Tests): taoserver {
exename = Collocated_Test
}
diff --git a/TAO/tests/Compression/Compression_Test.mpc b/TAO/tests/Compression/Compression_Test.mpc
index f2ba78e695d..30324a09661 100644
--- a/TAO/tests/Compression/Compression_Test.mpc
+++ b/TAO/tests/Compression/Compression_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Zlib_Server): taoserver, compression, zlibcompressor, {
exename = zlibserver
Source_Files {
diff --git a/TAO/tests/Compression/RLECompressorTest.cpp b/TAO/tests/Compression/RLECompressorTest.cpp
index 4fe39e87049..930106809cb 100644
--- a/TAO/tests/Compression/RLECompressorTest.cpp
+++ b/TAO/tests/Compression/RLECompressorTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "ace/High_Res_Timer.h"
#include "ace/Compression/rle/RLECompressor.h"
diff --git a/TAO/tests/Compression/bzip2server.cpp b/TAO/tests/Compression/bzip2server.cpp
index ff76d1b43a5..a9e938e9283 100644
--- a/TAO/tests/Compression/bzip2server.cpp
+++ b/TAO/tests/Compression/bzip2server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Compression/lzoserver.cpp b/TAO/tests/Compression/lzoserver.cpp
index 767aa44933d..626462f419c 100644
--- a/TAO/tests/Compression/lzoserver.cpp
+++ b/TAO/tests/Compression/lzoserver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Compression/zlibserver.cpp b/TAO/tests/Compression/zlibserver.cpp
index e6f69de9958..02f9add34ef 100644
--- a/TAO/tests/Compression/zlibserver.cpp
+++ b/TAO/tests/Compression/zlibserver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
index 899a542fef2..944cc8de6d6 100644
--- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
+++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp
index 91d939dd38e..e89faed032e 100644
--- a/TAO/tests/Connect_Strategy_Test/client.cpp
+++ b/TAO/tests/Connect_Strategy_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Connect_Strategy_Test/server.cpp
+++ b/TAO/tests/Connect_Strategy_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Connection_Failure/Connection_Failure.mpc b/TAO/tests/Connection_Failure/Connection_Failure.mpc
index 2e1ace5ef7a..32775bd0891 100644
--- a/TAO/tests/Connection_Failure/Connection_Failure.mpc
+++ b/TAO/tests/Connection_Failure/Connection_Failure.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client): taoclient {
Source_Files {
testC.cpp
diff --git a/TAO/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp
index 3f7bb372923..38658ec1661 100644
--- a/TAO/tests/Connection_Failure/client.cpp
+++ b/TAO/tests/Connection_Failure/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc
index 5a45cca020f..6bedb983d57 100644
--- a/TAO/tests/Connection_Purging/Connection_Purging.mpc
+++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index a9e2ea6951b..eef190eeaa0 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp
index dbc357a6378..f39194018c4 100644
--- a/TAO/tests/Connection_Purging/server.cpp
+++ b/TAO/tests/Connection_Purging/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/Connection_Purging/test.idl b/TAO/tests/Connection_Purging/test.idl
index c5d7b77a2e1..7c5dec9cd92 100644
--- a/TAO/tests/Connection_Purging/test.idl
+++ b/TAO/tests/Connection_Purging/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void send_stuff(in string foo);
diff --git a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
index 9d58f4e8439..766e8f73564 100644
--- a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
+++ b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client): taoserver, messaging {
exename = client
avoids += ace_for_tao
diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp
index 23465cdc223..c0a0e8389d8 100644
--- a/TAO/tests/Connection_Timeout/client.cpp
+++ b/TAO/tests/Connection_Timeout/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Profile_Timer.h"
diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
index 278271d77ca..2be69848770 100644
--- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
+++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp
index 6ffabbd27a2..6d3b85d08fb 100644
--- a/TAO/tests/Crash_On_Write/client.cpp
+++ b/TAO/tests/Crash_On_Write/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp
index 8863e07603f..5d730cba5bd 100644
--- a/TAO/tests/Crash_On_Write/server.cpp
+++ b/TAO/tests/Crash_On_Write/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Oneway_Receiver.h"
#include "Crash_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
index f628c6296ee..d2e5d52f801 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index 33b5e775ea0..ba0ad2c43d0 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Crashed_Callback.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 2c74b294c77..a56060e900c 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Service.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
index 82d60fb0298..738235a547b 100644
--- a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
+++ b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc
index 18ac4d8cc04..28fb21e55bb 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc
+++ b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*oneway) : taoserver, dynamicinterface, avoids_minimum_corba{
exename = Collocated_Test
}
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc
index 931635159a9..bda42366831 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc
+++ b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*twoway) : taoserver, dynamicinterface, avoids_minimum_corba{
exename = Collocated_Test
}
diff --git a/TAO/tests/DIOP/Basic.mpc b/TAO/tests/DIOP/Basic.mpc
index 2f93ff5421e..99c50e7a9ba 100644
--- a/TAO/tests/DIOP/Basic.mpc
+++ b/TAO/tests/DIOP/Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags += -Sp -Sd
diff --git a/TAO/tests/DIOP/UDP.idl b/TAO/tests/DIOP/UDP.idl
index 3f1ebe8221a..e9597f24639 100644
--- a/TAO/tests/DIOP/UDP.idl
+++ b/TAO/tests/DIOP/UDP.idl
@@ -1,7 +1,5 @@
/* -*- C++ -*- */
// UDP.idl
-// $Id$
-
interface UDP
{
// = TITLE
diff --git a/TAO/tests/DIOP/UDP_Client_i.cpp b/TAO/tests/DIOP/UDP_Client_i.cpp
index 37c46dc90c8..ec477c40297 100644
--- a/TAO/tests/DIOP/UDP_Client_i.cpp
+++ b/TAO/tests/DIOP/UDP_Client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "UDP_Client_i.h"
#include "ace/SString.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/DIOP/UDP_i.cpp b/TAO/tests/DIOP/UDP_i.cpp
index 4c33ad2c521..9e4598bdb3c 100644
--- a/TAO/tests/DIOP/UDP_i.cpp
+++ b/TAO/tests/DIOP/UDP_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "UDP_i.h"
// Constructor
diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc
index fd5b6235a85..5c2f8dba9f6 100644
--- a/TAO/tests/DLL_ORB/DLL_ORB.mpc
+++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index 83f4d56e852..8d54d570503 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Test_Client_Module.h"
#include "tao/TAO_Singleton_Manager.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module_Export.h b/TAO/tests/DLL_ORB/Test_Client_Module_Export.h
index 5e53f353d4e..17560a5fa31 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module_Export.h
+++ b/TAO/tests/DLL_ORB/Test_Client_Module_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/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index 6f6702697e3..260efda2744 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Test_Server_Module.h"
#include "tao/TAO_Singleton_Manager.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module_Export.h b/TAO/tests/DLL_ORB/Test_Server_Module_Export.h
index 1b3a24f667e..cb6fed9abaf 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module_Export.h
+++ b/TAO/tests/DLL_ORB/Test_Server_Module_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/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index be88b80cb16..88e93855c0d 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Test_i.h"
Test_i::Test_i (void)
diff --git a/TAO/tests/DSI_AMH/DSI_AMH.mpc b/TAO/tests/DSI_AMH/DSI_AMH.mpc
index 648b79506e9..42a30de7b4e 100644
--- a/TAO/tests/DSI_AMH/DSI_AMH.mpc
+++ b/TAO/tests/DSI_AMH/DSI_AMH.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/DSI_AMH/client.cpp b/TAO/tests/DSI_AMH/client.cpp
index ef0384b966d..74f23dad92b 100644
--- a/TAO/tests/DSI_AMH/client.cpp
+++ b/TAO/tests/DSI_AMH/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/DSI_AMH/server.cpp b/TAO/tests/DSI_AMH/server.cpp
index 85caa9c72c1..a52236a4c9f 100644
--- a/TAO/tests/DSI_AMH/server.cpp
+++ b/TAO/tests/DSI_AMH/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc b/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc
index 3d1791f4ea1..ee3ab6223de 100644
--- a/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc
+++ b/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/DSI_AMI_Gateway/client.cpp b/TAO/tests/DSI_AMI_Gateway/client.cpp
index 2b6331ab8e5..5bff677eb76 100644
--- a/TAO/tests/DSI_AMI_Gateway/client.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/gateway.cpp b/TAO/tests/DSI_AMI_Gateway/gateway.cpp
index 0bd127fc870..3fa496dd2dd 100644
--- a/TAO/tests/DSI_AMI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_dsi.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/server.cpp b/TAO/tests/DSI_AMI_Gateway/server.cpp
index 1e520c7ff9a..6bf1effcc77 100644
--- a/TAO/tests/DSI_AMI_Gateway/server.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
index 5ac9d1ac72d..fae8cacfd73 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_dsi.h"
#include "tao/DynamicInterface/Request.h"
#include "tao/DynamicInterface/Unknown_User_Exception.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.inl b/TAO/tests/DSI_AMI_Gateway/test_dsi.inl
index 16ff803a4a9..e55cd67b013 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.inl
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
DSI_Simple_Server::DSI_Simple_Server (
CORBA::ORB_ptr orb,
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.cpp b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
index 34ec0538137..24445c85741 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.inl b/TAO/tests/DSI_AMI_Gateway/test_i.inl
index bd51e3a42bd..4865283b255 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_i.inl
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
index f59b20036bd..d80ed416806 100644
--- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
+++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index e579139a181..aac67ece8cf 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp
index 7f64bfc18b3..b01333ddcc3 100644
--- a/TAO/tests/DSI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_Gateway/gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_dsi.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp
index 1e520c7ff9a..6bf1effcc77 100644
--- a/TAO/tests/DSI_Gateway/server.cpp
+++ b/TAO/tests/DSI_Gateway/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index 59b695330f6..1ab1810fd52 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_dsi.h"
#include "tao/DynamicInterface/Request.h"
#include "tao/DynamicInterface/Unknown_User_Exception.h"
diff --git a/TAO/tests/DSI_Gateway/test_dsi.inl b/TAO/tests/DSI_Gateway/test_dsi.inl
index dab987ec71e..e53aa9faa59 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.inl
+++ b/TAO/tests/DSI_Gateway/test_dsi.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
DSI_Simple_Server::DSI_Simple_Server (CORBA::ORB_ptr orb,
CORBA::Object_ptr target,//Simple_Server_ptr target,
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index 34ec0538137..24445c85741 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
diff --git a/TAO/tests/DSI_Gateway/test_i.inl b/TAO/tests/DSI_Gateway/test_i.inl
index bd51e3a42bd..4865283b255 100644
--- a/TAO/tests/DSI_Gateway/test_i.inl
+++ b/TAO/tests/DSI_Gateway/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/DiffServ/client.cpp b/TAO/tests/DiffServ/client.cpp
index d14c203c8c1..4815a0b538e 100644
--- a/TAO/tests/DiffServ/client.cpp
+++ b/TAO/tests/DiffServ/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "tao/Policy_Manager.h"
diff --git a/TAO/tests/DiffServ/diffserv.mpc b/TAO/tests/DiffServ/diffserv.mpc
index 43e99e0da2c..65884d183e2 100644
--- a/TAO/tests/DiffServ/diffserv.mpc
+++ b/TAO/tests/DiffServ/diffserv.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp
index 7ccc9177032..778d72a4351 100644
--- a/TAO/tests/DiffServ/server.cpp
+++ b/TAO/tests/DiffServ/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/DynAny_Test/DynAny_Test.mpc b/TAO/tests/DynAny_Test/DynAny_Test.mpc
index 8b40435f308..4e6da93be9a 100644
--- a/TAO/tests/DynAny_Test/DynAny_Test.mpc
+++ b/TAO/tests/DynAny_Test/DynAny_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Basic): taoserver, dynamicany {
exename = basic_test
diff --git a/TAO/tests/DynUnion_Test/DynUnionTest.cpp b/TAO/tests/DynUnion_Test/DynUnionTest.cpp
index 27b92aa8960..b2b8b06a7dd 100644
--- a/TAO/tests/DynUnion_Test/DynUnionTest.cpp
+++ b/TAO/tests/DynUnion_Test/DynUnionTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dynanyC.h"
#include "tao/DynamicAny/DynamicAny.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/DynUnion_Test/dynany.idl b/TAO/tests/DynUnion_Test/dynany.idl
index bd245a5fcf0..96ad4b3bf74 100644
--- a/TAO/tests/DynUnion_Test/dynany.idl
+++ b/TAO/tests/DynUnion_Test/dynany.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module DynAnyTest {
enum EventKind {ALARM_EVENT, LOG_EVENT};
diff --git a/TAO/tests/DynUnion_Test/dynunion_test.mpc b/TAO/tests/DynUnion_Test/dynunion_test.mpc
index 9df25fa2b3b..3adca779bda 100644
--- a/TAO/tests/DynUnion_Test/dynunion_test.mpc
+++ b/TAO/tests/DynUnion_Test/dynunion_test.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): dynamicany {
IDL_Files {
dynany.idl
diff --git a/TAO/tests/DynValue_Test/Analyzer.cpp b/TAO/tests/DynValue_Test/Analyzer.cpp
index f248b6d8165..02ec090d294 100644
--- a/TAO/tests/DynValue_Test/Analyzer.cpp
+++ b/TAO/tests/DynValue_Test/Analyzer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Analyzer.h"
#include "tao/DynamicAny/DynCommon.h"
diff --git a/TAO/tests/DynValue_Test/Analyzer.h b/TAO/tests/DynValue_Test/Analyzer.h
index c40fcf876fb..961d7821677 100644
--- a/TAO/tests/DynValue_Test/Analyzer.h
+++ b/TAO/tests/DynValue_Test/Analyzer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INCLUDE_ANALYZER_H
#define INCLUDE_ANALYZER_H
diff --git a/TAO/tests/DynValue_Test/DynValue_Test.idl b/TAO/tests/DynValue_Test/DynValue_Test.idl
index 185aadab761..119070972ec 100644
--- a/TAO/tests/DynValue_Test/DynValue_Test.idl
+++ b/TAO/tests/DynValue_Test/DynValue_Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module DynValue_Test
{
abstract valuetype avt
diff --git a/TAO/tests/DynValue_Test/DynValue_Test.mpc b/TAO/tests/DynValue_Test/DynValue_Test.mpc
index 64b6c55fa37..9bf2d3f07dc 100644
--- a/TAO/tests/DynValue_Test/DynValue_Test.mpc
+++ b/TAO/tests/DynValue_Test/DynValue_Test.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): dynamicany {
IDL_Files {
DynValue_Test.idl
diff --git a/TAO/tests/DynValue_Test/ValueTypes_impl.cpp b/TAO/tests/DynValue_Test/ValueTypes_impl.cpp
index d8fca9ed7dd..a170a4278f3 100644
--- a/TAO/tests/DynValue_Test/ValueTypes_impl.cpp
+++ b/TAO/tests/DynValue_Test/ValueTypes_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ValueTypes_impl.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tests/DynValue_Test/ValueTypes_impl.h b/TAO/tests/DynValue_Test/ValueTypes_impl.h
index 573aafb54b0..25bd32b1323 100644
--- a/TAO/tests/DynValue_Test/ValueTypes_impl.h
+++ b/TAO/tests/DynValue_Test/ValueTypes_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INCLUDE_VALUETYPE_IMPL_H
#define INCLUDE_VALUETYPE_IMPL_H
diff --git a/TAO/tests/DynValue_Test/main.cpp b/TAO/tests/DynValue_Test/main.cpp
index 1f08866b2d0..408225d408f 100644
--- a/TAO/tests/DynValue_Test/main.cpp
+++ b/TAO/tests/DynValue_Test/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Analyzer.h"
//============= Test main() ============
diff --git a/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc b/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc
index 72e41407555..36fa2ec6a89 100644
--- a/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc
+++ b/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*test) : dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro, threads {
exename = test
}
diff --git a/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp b/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp
index c568378f49d..c0c04461ecc 100644
--- a/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp
+++ b/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_Config.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Service_Config.h"
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
index ff8b42ea470..689c1446bd9 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp
index 55f904e7488..8f2b3147a86 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc b/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc
index c7dbc16435e..a4390483074 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro, threads {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp
index 5a74d7a3cd8..7fb3d8daf0c 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc
index 7c4fa704639..d9a2b265c54 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro, threads {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
index b9b61436a4f..d658510f4e1 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
index 6aae090018f..45040fd3c7f 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc
index f5443b2ff36..7987796f853 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Dynamic_TP_POA_Test_Static_idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
index b9b61436a4f..d658510f4e1 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
index e75d885f7b9..387d7b39413 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
#include "tao/Dynamic_TP/DTP_POA_Loader.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc b/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc
index 67608a907eb..87e93601546 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc
+++ b/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*test) : dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro {
exename = test
}
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp
index 1b8e947b70e..9ebe6503e00 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
index 6dd9084f5ad..69771325bb1 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
time.idl
diff --git a/TAO/tests/Explicit_Event_Loop/time.idl b/TAO/tests/Explicit_Event_Loop/time.idl
index 827ea4c527d..32bb310b4aa 100644
--- a/TAO/tests/Explicit_Event_Loop/time.idl
+++ b/TAO/tests/Explicit_Event_Loop/time.idl
@@ -1,6 +1,4 @@
-// $Id$
-
struct TimeOfDay {
short hour; // 0 - 23
short minute; // 0 - 59
diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
index 780cb0f5cb8..d205fc13389 100644
--- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
+++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Counter.idl
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index f49887a77b8..231982ae857 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// -- App. Specific Include --
#include "Policy_Tester.h"
#include "RT_Properties.h"
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 0fdb414c1c1..81c07d0e08c 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Policy_Verifier.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index dddf5c131c4..5b0942d2b47 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// -- App. Specific Include --
#include "CounterC.h"
// #include "util.h"
diff --git a/TAO/tests/FL_Cube/FL_Cube.mpc b/TAO/tests/FL_Cube/FL_Cube.mpc
index 9f8856707ff..6d0e126775c 100644
--- a/TAO/tests/FL_Cube/FL_Cube.mpc
+++ b/TAO/tests/FL_Cube/FL_Cube.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client) : taoclient, portableserver, tao_flresource {
source_files {
client.cpp
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 4c3c82b1eda..2e3088390d6 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/FlResource/FlResource_Loader.h"
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index 8887b07b328..83f74fac289 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "tao/FlResource/FlResource_Loader.h"
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index 2a9e6954f04..14fc41808d6 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include <GL/gl.h>
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index 4ede4b6893f..68d1d2ba7d4 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index d8d2d54cc08..ec32b46fa2a 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 7f1aa5fd6d9..889f297e491 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.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/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index 14219aae5fb..ae6a6a137d3 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ping_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Faults/ping.idl b/TAO/tests/Faults/ping.idl
index e52c5776d28..afddd89f20a 100644
--- a/TAO/tests/Faults/ping.idl
+++ b/TAO/tests/Faults/ping.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface PingObject
{
// = DESCRIPTION
diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index 17462fd4fc4..2fed44d1079 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ping_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/Faults/ping_i.inl b/TAO/tests/Faults/ping_i.inl
index 6444139ea3c..38515dd085d 100644
--- a/TAO/tests/Faults/ping_i.inl
+++ b/TAO/tests/Faults/ping_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
PingObject_i::PingObject_i (CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa)
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index 580fa5b624f..cdbc5dec585 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ping_i.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index 03c87f5762a..14b151a399d 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/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/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index c7046eac7a7..449e6db1780 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/Faults/test_i.inl b/TAO/tests/Faults/test_i.inl
index 63f454c670b..fde2b8f5d61 100644
--- a/TAO/tests/Faults/test_i.inl
+++ b/TAO/tests/Faults/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index 3651047c5eb..17f64555f01 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
File.idl
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index d358a3ffbc4..ce2a1d2b538 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "File_i.h"
#include "tao/debug.h"
#include "ace/SString.h"
diff --git a/TAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc b/TAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc
index ee705f01845..a158bbdf7cd 100755
--- a/TAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc
+++ b/TAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp
index 5d3e11e6777..4d744d68c2a 100755
--- a/TAO/tests/ForwardOnceUponException/client.cpp
+++ b/TAO/tests/ForwardOnceUponException/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/ForwardOnceUponException/server.cpp b/TAO/tests/ForwardOnceUponException/server.cpp
index cde9adfca59..56e31ae6a71 100755
--- a/TAO/tests/ForwardOnceUponException/server.cpp
+++ b/TAO/tests/ForwardOnceUponException/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/ForwardOnceUponException/test.idl b/TAO/tests/ForwardOnceUponException/test.idl
index b9aa7108ed3..98cde9d77b1 100755
--- a/TAO/tests/ForwardOnceUponException/test.idl
+++ b/TAO/tests/ForwardOnceUponException/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
boolean test_is_a (in string type);
diff --git a/TAO/tests/ForwardOnceUponException/test_i.cpp b/TAO/tests/ForwardOnceUponException/test_i.cpp
index e139a027d6c..c94f6f039f9 100755
--- a/TAO/tests/ForwardOnceUponException/test_i.cpp
+++ b/TAO/tests/ForwardOnceUponException/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/ForwardOnceUponException/test_i.inl b/TAO/tests/ForwardOnceUponException/test_i.inl
index f31987e49d7..41ff942499f 100755
--- a/TAO/tests/ForwardOnceUponException/test_i.inl
+++ b/TAO/tests/ForwardOnceUponException/test_i.inl
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/Invocation_Utils.h"
ACE_INLINE
diff --git a/TAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc b/TAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc
index ee705f01845..a158bbdf7cd 100755
--- a/TAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc
+++ b/TAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/ForwardUponObjectNotExist/client.cpp b/TAO/tests/ForwardUponObjectNotExist/client.cpp
index 33a50754c6d..3e4948b7c89 100755
--- a/TAO/tests/ForwardUponObjectNotExist/client.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/ForwardUponObjectNotExist/server.cpp b/TAO/tests/ForwardUponObjectNotExist/server.cpp
index 133182484f3..e9a267ec27b 100755
--- a/TAO/tests/ForwardUponObjectNotExist/server.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/ForwardUponObjectNotExist/test.idl b/TAO/tests/ForwardUponObjectNotExist/test.idl
index b9aa7108ed3..98cde9d77b1 100755
--- a/TAO/tests/ForwardUponObjectNotExist/test.idl
+++ b/TAO/tests/ForwardUponObjectNotExist/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
boolean test_is_a (in string type);
diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
index bc33c618f74..4e447fad05e 100755
--- a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.inl b/TAO/tests/ForwardUponObjectNotExist/test_i.inl
index 97524552ff4..9357ec5d99c 100755
--- a/TAO/tests/ForwardUponObjectNotExist/test_i.inl
+++ b/TAO/tests/ForwardUponObjectNotExist/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index ee705f01845..a158bbdf7cd 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index bfd91f357d5..d4037881831 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index 7abc09e549a..434cb332d0f 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Forwarding/test.idl b/TAO/tests/Forwarding/test.idl
index b9aa7108ed3..98cde9d77b1 100644
--- a/TAO/tests/Forwarding/test.idl
+++ b/TAO/tests/Forwarding/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
boolean test_is_a (in string type);
diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp
index 4c2a71f0302..2b0a449a165 100644
--- a/TAO/tests/Forwarding/test_i.cpp
+++ b/TAO/tests/Forwarding/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/Forwarding/test_i.inl b/TAO/tests/Forwarding/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/Forwarding/test_i.inl
+++ b/TAO/tests/Forwarding/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc
index 693db9d11bc..f95c7c66a4d 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) {
requires += java
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
index 2edab1ba7d7..874a19dddc8 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc b/TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc
index 3c081fa6da4..1072daa2e9b 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) {
requires += java
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
index 127a41292a1..687b2096ddd 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Payload_Receiver.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc
index 567e50ee4f5..2e3ef6e7c46 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, avoids_corba_e_micro {
}
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
index 8c5e4caddff..db3aa9c564d 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Payload_Receiver.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/HandleExhaustion/HandleExhaustion.mpc b/TAO/tests/HandleExhaustion/HandleExhaustion.mpc
index 5718c68b775..cf92affbc70 100644
--- a/TAO/tests/HandleExhaustion/HandleExhaustion.mpc
+++ b/TAO/tests/HandleExhaustion/HandleExhaustion.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/HandleExhaustion/Test.idl b/TAO/tests/HandleExhaustion/Test.idl
index 1406633df03..0791a7a2c9a 100644
--- a/TAO/tests/HandleExhaustion/Test.idl
+++ b/TAO/tests/HandleExhaustion/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
void simple ();
diff --git a/TAO/tests/HandleExhaustion/client.cpp b/TAO/tests/HandleExhaustion/client.cpp
index 1f0d6280a75..827ee12269b 100644
--- a/TAO/tests/HandleExhaustion/client.cpp
+++ b/TAO/tests/HandleExhaustion/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp
index 042a7eef7a9..80d96c756be 100644
--- a/TAO/tests/HandleExhaustion/server.cpp
+++ b/TAO/tests/HandleExhaustion/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "ace/Get_Opt.h"
#include "ace/Handle_Set.h"
diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc
index 60a67b14c88..fc1d55d0f26 100644
--- a/TAO/tests/Hang_Shutdown/Hang.mpc
+++ b/TAO/tests/Hang_Shutdown/Hang.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Hang_Shutdown/Test.idl b/TAO/tests/Hang_Shutdown/Test.idl
index 0ea5055f05a..4b31340f9e0 100644
--- a/TAO/tests/Hang_Shutdown/Test.idl
+++ b/TAO/tests/Hang_Shutdown/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
interface Hang
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index b9a6d27a1fb..d5f0e3a45c2 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index aed5b6d77dc..03193adec64 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/Hello/Hello.cpp
+++ b/TAO/tests/Hello/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Hello/Hello.mpc
+++ b/TAO/tests/Hello/Hello.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index 1bb3e718137..db10fc575b3 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Hello/server.cpp
+++ b/TAO/tests/Hello/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc
index 11b1b561a3a..258760f6202 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.mpc
+++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(ICMG_Any_Bug_Hello_IDL): taoidldefaults {
idlflags -= -St
idlflags -= -Sa
diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index 04ee037423f..27117435628 100644
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Request.h"
#include "TestC.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp
index aea9277fb44..c2749ef789c 100644
--- a/TAO/tests/ICMG_Any_Bug/server.cpp
+++ b/TAO/tests/ICMG_Any_Bug/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
index 40f1c93b523..ad62372bfaa 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
InheritedOp.idl
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
index 1fdf64ad83d..1b8bcc27184 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "InheritedOp_i.h"
Derived_i::Derived_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
index efc430f3851..d64d6370536 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef INHERITED_OP_I_H
#define INHERITED_OP_I_H
diff --git a/TAO/tests/IDL_Inherited_Operation/client.cpp b/TAO/tests/IDL_Inherited_Operation/client.cpp
index 23a55737151..e7c8ad46380 100644
--- a/TAO/tests/IDL_Inherited_Operation/client.cpp
+++ b/TAO/tests/IDL_Inherited_Operation/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "InheritedOpC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/IDL_Inherited_Operation/server.cpp b/TAO/tests/IDL_Inherited_Operation/server.cpp
index ae20f1251a1..96989d9c1c1 100644
--- a/TAO/tests/IDL_Inherited_Operation/server.cpp
+++ b/TAO/tests/IDL_Inherited_Operation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "InheritedOp_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/IDL_Test/Bug_2350_Regression.idl b/TAO/tests/IDL_Test/Bug_2350_Regression.idl
index 1a24b054a21..9e9836ac7a4 100644
--- a/TAO/tests/IDL_Test/Bug_2350_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2350_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
exception something
{
};
diff --git a/TAO/tests/IDL_Test/Bug_2577_Regression.idl b/TAO/tests/IDL_Test/Bug_2577_Regression.idl
index 9b7b9ffa3af..1175c3f446f 100644
--- a/TAO/tests/IDL_Test/Bug_2577_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2577_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2577
struct DateTime_T
diff --git a/TAO/tests/IDL_Test/Bug_2582_Regression.idl b/TAO/tests/IDL_Test/Bug_2582_Regression.idl
index 9eacd797660..27e81c3d0d9 100644
--- a/TAO/tests/IDL_Test/Bug_2582_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2582_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2582
enum EncodingID_T
diff --git a/TAO/tests/IDL_Test/Bug_2583_Regression.idl b/TAO/tests/IDL_Test/Bug_2583_Regression.idl
index e524981b54c..2bd64076c5a 100644
--- a/TAO/tests/IDL_Test/Bug_2583_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2583_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2583
module Test {
diff --git a/TAO/tests/IDL_Test/Bug_2616_Regression.idl b/TAO/tests/IDL_Test/Bug_2616_Regression.idl
index 916d4db404e..7906cf11f8f 100644
--- a/TAO/tests/IDL_Test/Bug_2616_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2616_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2616
struct AA
diff --git a/TAO/tests/IDL_Test/Bug_2619_Regression.idl b/TAO/tests/IDL_Test/Bug_2619_Regression.idl
index 4d95f523a0e..223c77a33cd 100644
--- a/TAO/tests/IDL_Test/Bug_2619_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2619_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2619
struct Type_T
diff --git a/TAO/tests/IDL_Test/Bug_3243_Regression.idl b/TAO/tests/IDL_Test/Bug_3243_Regression.idl
index ddc61040a8e..17308963efb 100644
--- a/TAO/tests/IDL_Test/Bug_3243_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_3243_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 3243
const long long NptNow = 0x80000000;
diff --git a/TAO/tests/IDL_Test/Bug_3312_Regression.idl b/TAO/tests/IDL_Test/Bug_3312_Regression.idl
index 25c96b4ac7e..3d1e480b534 100644
--- a/TAO/tests/IDL_Test/Bug_3312_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_3312_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module CallMe
{
enum Colors { Red, Green, Blue };
diff --git a/TAO/tests/IDL_Test/Bug_3819_Regression.idl b/TAO/tests/IDL_Test/Bug_3819_Regression.idl
index f5eff4a043f..3b0a15676e7 100644
--- a/TAO/tests/IDL_Test/Bug_3819_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_3819_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module orange {
module apple {
valuetype Foo;
diff --git a/TAO/tests/IDL_Test/Bug_3821_Regression.idl b/TAO/tests/IDL_Test/Bug_3821_Regression.idl
index fb1fd5a0f07..bd10ab38ec2 100644
--- a/TAO/tests/IDL_Test/Bug_3821_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_3821_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module test {
enum Enumeration {
Enum1,
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index dc063f9f1e1..7f439bb428c 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoserver, messaging, gen_ostream {
custom_only=1
idlflags += -GC -GH -Gd -GT
diff --git a/TAO/tests/IDL_Test/PEMNaming.idl b/TAO/tests/IDL_Test/PEMNaming.idl
index 9248319643c..d90a10c0f86 100644
--- a/TAO/tests/IDL_Test/PEMNaming.idl
+++ b/TAO/tests/IDL_Test/PEMNaming.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _PEM_NAMING_IDL_
#define _PEM_NAMING_IDL_
diff --git a/TAO/tests/IDL_Test/attribute.idl b/TAO/tests/IDL_Test/attribute.idl
index 9762b92bed7..79ed7a197f6 100644
--- a/TAO/tests/IDL_Test/attribute.idl
+++ b/TAO/tests/IDL_Test/attribute.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Hello
{
exception InternalErrorA
diff --git a/TAO/tests/IDL_Test/loader_const.idl b/TAO/tests/IDL_Test/loader_const.idl
index 5eee3b0d563..2156a437eef 100644
--- a/TAO/tests/IDL_Test/loader_const.idl
+++ b/TAO/tests/IDL_Test/loader_const.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _LOADER_CONST_IDL_
#define _LOADER_CONST_IDL_
diff --git a/TAO/tests/IDL_Test/struct.idl b/TAO/tests/IDL_Test/struct.idl
index ad06f2f5134..bd80df37061 100644
--- a/TAO/tests/IDL_Test/struct.idl
+++ b/TAO/tests/IDL_Test/struct.idl
@@ -1,4 +1,3 @@
-// $Id$
// Double forward declared struct test, created by Martin Corino <mcorino@remedy.nl>
module Test
diff --git a/TAO/tests/IDL_Test/typeprefix.idl b/TAO/tests/IDL_Test/typeprefix.idl
index 67e4d1ac709..5fb34afb825 100644
--- a/TAO/tests/IDL_Test/typeprefix.idl
+++ b/TAO/tests/IDL_Test/typeprefix.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test a construct with typeprefix which failed when TAO_IDL was build
// with Intel C++ or Sun C++
diff --git a/TAO/tests/IORManipulation/IORManipulation.mpc b/TAO/tests/IORManipulation/IORManipulation.mpc
index cdc8ea5c99f..b0143a8dcb8 100644
--- a/TAO/tests/IORManipulation/IORManipulation.mpc
+++ b/TAO/tests/IORManipulation/IORManipulation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IORTest) : taoexe, iormanip {
exename = IORTest
}
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index 9bd530cdd3f..b6fe2c1e473 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//========================================================================
/**
* @file IORTest.cpp
diff --git a/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc b/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc
index 93ca0316852..4af54009d91 100644
--- a/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc
+++ b/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, iormanip {
}
diff --git a/TAO/tests/IORManipulation/filter/Test.idl b/TAO/tests/IORManipulation/filter/Test.idl
index 922ccde863b..4353118b3ae 100644
--- a/TAO/tests/IORManipulation/filter/Test.idl
+++ b/TAO/tests/IORManipulation/filter/Test.idl
@@ -1,4 +1,3 @@
-// $Id$
module Test
{
interface Hello
diff --git a/TAO/tests/IORManipulation/filter/server.cpp b/TAO/tests/IORManipulation/filter/server.cpp
index 49fb18bdf7e..99f4062fd55 100644
--- a/TAO/tests/IORManipulation/filter/server.cpp
+++ b/TAO/tests/IORManipulation/filter/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "tao/IORManipulation/IORManip_IIOP_Filter.h"
#include "tao/Stub.h"
diff --git a/TAO/tests/IORTable_Locator/Test.mpc b/TAO/tests/IORTable_Locator/Test.mpc
index 730fdbd2166..d0c82cbe90a 100644
--- a/TAO/tests/IORTable_Locator/Test.mpc
+++ b/TAO/tests/IORTable_Locator/Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IORTable_Locator_idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/IORTable_Locator/async_server.cpp b/TAO/tests/IORTable_Locator/async_server.cpp
index 73757fdd503..9c7f7d49b39 100644
--- a/TAO/tests/IORTable_Locator/async_server.cpp
+++ b/TAO/tests/IORTable_Locator/async_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_test_i.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_strings.h"
diff --git a/TAO/tests/IORTable_Locator/client.cpp b/TAO/tests/IORTable_Locator/client.cpp
index aa26c31770b..d5ace201f77 100644
--- a/TAO/tests/IORTable_Locator/client.cpp
+++ b/TAO/tests/IORTable_Locator/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/IORTable_Locator/server.cpp b/TAO/tests/IORTable_Locator/server.cpp
index 977e38eb068..0cc4dd853d3 100644
--- a/TAO/tests/IORTable_Locator/server.cpp
+++ b/TAO/tests/IORTable_Locator/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/IORTable_Locator/simple_test.idl b/TAO/tests/IORTable_Locator/simple_test.idl
index 308e9420436..11cce4bbd8f 100644
--- a/TAO/tests/IORTable_Locator/simple_test.idl
+++ b/TAO/tests/IORTable_Locator/simple_test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SIMPLE_TEST_
#define _SIMPLE_TEST_
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
index b4039bb8ddc..12f9468712a 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bogus_i.h"
bogus::bogus()
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
index cd941841865..f906c35dec6 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
// Extract the address for each network interface using EXACTLY
// the same algorithm as TAO_IIOP_Acceptor, and then print
diff --git a/TAO/tests/IPV6/IPV6_Hello.mpc b/TAO/tests/IPV6/IPV6_Hello.mpc
index 2e4131f6280..fc2a86b7fe3 100644
--- a/TAO/tests/IPV6/IPV6_Hello.mpc
+++ b/TAO/tests/IPV6/IPV6_Hello.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp
index 8ab32ee47c3..6d39358d5aa 100644
--- a/TAO/tests/IPV6/client.cpp
+++ b/TAO/tests/IPV6/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/SString.h"
diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/IPV6/server.cpp
+++ b/TAO/tests/IPV6/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp
index 0a6decbfecd..ee9cc39c811 100644
--- a/TAO/tests/InterOp-Naming/INS_i.cpp
+++ b/TAO/tests/InterOp-Naming/INS_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "INS_i.h"
// Constructor
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index dbb42b3c982..c4398122adc 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "INSC.h"
diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp
index 12310027192..d8b6c0fc962 100644
--- a/TAO/tests/InterOp-Naming/INS_test_server.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_i.h"
#include "INS_i.h"
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index 515a689a52b..06a381b1690 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
INS.idl
diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc
index 53c406090c3..86f872883af 100644
--- a/TAO/tests/Leader_Followers/Leader_Followers.mpc
+++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index ccc53a35c99..8416a589990 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "test_i.h"
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index b1e87f1c15a..99ec0e52d94 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/LongDouble/Global.h b/TAO/tests/LongDouble/Global.h
index a55696312b0..5c667cee8c3 100644
--- a/TAO/tests/LongDouble/Global.h
+++ b/TAO/tests/LongDouble/Global.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TAO_TEST_GLOBAL_H
#define TAO_TEST_GLOBAL_H
diff --git a/TAO/tests/LongDouble/LongDoubleTest.cpp b/TAO/tests/LongDouble/LongDoubleTest.cpp
index 8544f922c22..3a342d612ca 100644
--- a/TAO/tests/LongDouble/LongDoubleTest.cpp
+++ b/TAO/tests/LongDouble/LongDoubleTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LongDoubleTest.h"
#include "Global.h"
diff --git a/TAO/tests/LongDouble/LongDoubleTest.mpc b/TAO/tests/LongDouble/LongDoubleTest.mpc
index fd1a8ea4dfc..4789a0deb2e 100644
--- a/TAO/tests/LongDouble/LongDoubleTest.mpc
+++ b/TAO/tests/LongDouble/LongDoubleTest.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
custom_only = 1
}
diff --git a/TAO/tests/LongDouble/client.cpp b/TAO/tests/LongDouble/client.cpp
index 02fdbebed49..ba0b6363794 100644
--- a/TAO/tests/LongDouble/client.cpp
+++ b/TAO/tests/LongDouble/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "Global.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/LongDouble/server.cpp b/TAO/tests/LongDouble/server.cpp
index 078a6750c43..4e7ac85131c 100644
--- a/TAO/tests/LongDouble/server.cpp
+++ b/TAO/tests/LongDouble/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LongDoubleTest.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 604ae849cf7..79e9f35ef42 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef LONGUPCALLS_AMI_MANAGER_H
#define LONGUPCALLS_AMI_MANAGER_H
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index 21e23995b76..5957473e7e4 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef LONGUPCALLS_CONTROLLER_H
#define LONGUPCALLS_CONTROLLER_H
diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc
index 8a242f6938c..a94a613dd27 100644
--- a/TAO/tests/LongUpcalls/LongUpcalls.mpc
+++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/LongUpcalls/Test.idl b/TAO/tests/LongUpcalls/Test.idl
index 047bd3bde5f..8c0c018e358 100644
--- a/TAO/tests/LongUpcalls/Test.idl
+++ b/TAO/tests/LongUpcalls/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
interface Controller {
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index b5f1efc52a2..2d6e7732715 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Controller.h"
#include "Manager_Handler.h"
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index 94164a1eb6a..9d1c223557b 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "AMI_Manager.h"
diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index ceb750ed3b3..38ad1df82b6 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Controller.h"
diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index 128c91f59f1..a024de4d280 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Manager.h"
diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc
index 7beef1c3cfa..9aa43fe43bb 100644
--- a/TAO/tests/MProfile/MProfile.mpc
+++ b/TAO/tests/MProfile/MProfile.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, iormanip {
IDL_Files {
test.idl
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index f3f1dfeb84d..bd620441e42 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IORManipulation/IORManip_Loader.h"
#include "ace/SString.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index fa3c1874c6e..7ec816c36bb 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/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/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp
index 9c6d464b6ab..0c72e85ca20 100644
--- a/TAO/tests/MProfile/test_i.cpp
+++ b/TAO/tests/MProfile/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
index b8f58d81ffd..07638a44228 100644
--- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
+++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index df2e469c5f1..c53a5b09e68 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IORManipulation/IORManip_Loader.h"
#include "ace/SString.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp
index 3fa9c78bea4..cecca0ee717 100644
--- a/TAO/tests/MProfile_Connection_Timeout/server.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
index c9666c5d7ab..aace20bd464 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
// part of the famous caesium 133 atom transition for a
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index 5625f1183bf..9a339306a2b 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index 7d255007aa8..336242aaf5d 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/SString.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index 405a6eca91a..5517ecf0093 100644
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/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/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp
index 65291139aa8..c13b1242623 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.cpp
+++ b/TAO/tests/MProfile_Forwarding/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/MProfile_Forwarding/test_i.inl b/TAO/tests/MProfile_Forwarding/test_i.inl
index b11bb431e1f..ce98e245ca7 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.inl
+++ b/TAO/tests/MProfile_Forwarding/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc
index b9de35dbb68..38fbc74381a 100644
--- a/TAO/tests/MT_BiDir/MT_BiDir.mpc
+++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Receiver.idl
diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index 35f2360528c..00b43a9ed7d 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
#include "ace/Manual_Event.h"
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index abf16e115a9..b01992447ee 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Receiver_i.h"
#include "SenderC.h"
diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp
index 043ed95d566..ce5b925c9e8 100644
--- a/TAO/tests/MT_BiDir/server.cpp
+++ b/TAO/tests/MT_BiDir/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Sender_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
index b221f62ce4b..c5b269f3edc 100644
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ b/TAO/tests/MT_Client/MT_Client.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index a717f92b9f7..c4aef141512 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 0c1b9ff0d51..44ed8590e59 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index cc915920a38..3100cffb926 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/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/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index 3d7090b6bb2..52f50251cf2 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/MT_Client/test_i.inl b/TAO/tests/MT_Client/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/MT_Client/test_i.inl
+++ b/TAO/tests/MT_Client/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc b/TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc
index a11e11f20a6..ebb9a8e0683 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl
index 0081a42b4d0..39da6d24fd8 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test_Idl {
interface SharedIntf {
void ping();
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
index 4fcaa2aae6c..d0580eec270 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "ace/Log_Priority.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
index 3926689bcd1..1eca1fcea5e 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAREDINTF_I_H_
#define SHAREDINTF_I_H_
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
index b29c1e9bfc1..5c89d60360a 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "worker.h"
#include "chatter.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
index 576a4419ea8..a9e31f4e0f5 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined( CHATTER_H)
#define CHATTER_H
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/client.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/client.cpp
index 9d2dde85f95..b5595adf0eb 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/client.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "worker.h"
#include "chatter.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/police.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/police.cpp
index 852ccd952f1..0c198804856 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/police.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/police.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_sys_stat.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/police.h b/TAO/tests/MT_NoUpcall_Client_Leader/police.h
index af3144b1292..1f9703beb19 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/police.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/police.h
@@ -1,3 +1 @@
-// $Id$
-
void poll (const char* filename);
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/server.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/server.cpp
index e2479ce29fd..464e8c2494b 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/server.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "worker.h"
#include "chatter.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
index 5c5041b6418..c9d1484a04b 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "worker.h"
Worker::Worker (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/worker.h b/TAO/tests/MT_NoUpcall_Client_Leader/worker.h
index 55146024151..aa0244e0e21 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/worker.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/worker.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined( WORKER_H)
#define WORKER_H
diff --git a/TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc b/TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc
index d9b5e9ba330..cbfb6e68940 100644
--- a/TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc
+++ b/TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl b/TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl
index aa4615506d4..6b706cfbcbc 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test_Idl {
interface SharedIntf {
void do_upcall ();
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
index bc14376a412..cfaaf75e7ec 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "ace/Log_Priority.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
index 145e3a82a16..cd7cde57f25 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAREDINTF_I_H_
#define SHAREDINTF_I_H_
diff --git a/TAO/tests/MT_NoUpcall_Connect/client.cpp b/TAO/tests/MT_NoUpcall_Connect/client.cpp
index 312ad65667a..78d2941f6f4 100644
--- a/TAO/tests/MT_NoUpcall_Connect/client.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntfC.h"
#include "SharedIntfS.h"
diff --git a/TAO/tests/MT_NoUpcall_Connect/server.cpp b/TAO/tests/MT_NoUpcall_Connect/server.cpp
index 771f8f10323..f691ae823f2 100644
--- a/TAO/tests/MT_NoUpcall_Connect/server.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "ace/Task.h"
diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc
index bbcbfa8e1b6..ddbc541fa2f 100644
--- a/TAO/tests/MT_Server/MT_Server.mpc
+++ b/TAO/tests/MT_Server/MT_Server.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp
index e95c34b2f64..bae8827649c 100644
--- a/TAO/tests/MT_Server/client.cpp
+++ b/TAO/tests/MT_Server/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "testC.h"
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index ea6351e2bdf..82620993a6c 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index c42d5905cc6..9847377ea95 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_Server/test_i.inl b/TAO/tests/MT_Server/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/MT_Server/test_i.inl
+++ b/TAO/tests/MT_Server/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index ac60578d994..3c4a5ef3d64 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index f6ef9ebbff2..a1a9569a78b 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index 07af58ea28d..6927fb9f275 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sleep_Service.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc b/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc
index b8130b84a4d..aef448e5be3 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc
+++ b/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
test.idl
diff --git a/TAO/tests/Monitor/Marshal_Buffer/client.cpp b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
index 610ac702929..e74ef70b9c2 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/client.cpp
+++ b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
index 200b4ec6fa6..5a6ba3b7a37 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
+++ b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Monitor/Marshal_Buffer/server.cpp b/TAO/tests/Monitor/Marshal_Buffer/server.cpp
index e73b5750d94..21d5cf6125c 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/server.cpp
+++ b/TAO/tests/Monitor/Marshal_Buffer/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/tests/Monitor/Marshal_Buffer/test.idl b/TAO/tests/Monitor/Marshal_Buffer/test.idl
index 107036708f4..6a9e21913c6 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/test.idl
+++ b/TAO/tests/Monitor/Marshal_Buffer/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
string test_op (in string in_arg);
diff --git a/TAO/tests/Monitor/Marshal_Buffer/test_i.cpp b/TAO/tests/Monitor/Marshal_Buffer/test_i.cpp
index 90017cce332..d92724af92a 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/test_i.cpp
+++ b/TAO/tests/Monitor/Marshal_Buffer/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/streams.h"
#include "test_i.h"
diff --git a/TAO/tests/Monitor/Marshal_Buffer/test_i.h b/TAO/tests/Monitor/Marshal_Buffer/test_i.h
index bc6ab9a5ac5..f02d712dd0c 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/test_i.h
+++ b/TAO/tests/Monitor/Marshal_Buffer/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TEST_I_H
#define TAO_TEST_I_H
diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp
index 55a5b85d921..58ba868e616 100644
--- a/TAO/tests/Multiple/Collocation_Tester.cpp
+++ b/TAO/tests/Multiple/Collocation_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Collocation_Tester.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index 9e190d77bc5..e463f41bfe9 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Gd
IDL_Files {
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index 96788e8b1b8..8906917662d 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Collocation_Tester.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index c20b1a7d488..cedcde206be 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Multiple_Impl.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
index a045d5540d8..04e8b654387 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface A
{
string method1 ();
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index c57114e6146..28338fe7751 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Multiple_Inheritance.idl
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index ae87b53f82a..de6f2e48629 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Multiple_InheritanceS.h"
class Multiple_Inheritance_i : public POA_D
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index 2cf2385d16f..aae19ba1755 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Multiple_Inheritance_i.h"
#include "tao/Utils/ORB_Manager.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
index 250ee6a55d4..4deb6598d9c 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
#include <iostream>
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc
index 0b23fc42f14..90b09e158c0 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
index c2fa3ae7849..9fb90a86da2 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp
index c08c71cb744..43d54b1dd5c 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc
index ee705f01845..a158bbdf7cd 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
index ecd2d0df42d..bc53d39ce43 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp
index 295e3bd018d..2be72bb5c4c 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl
index b9aa7108ed3..98cde9d77b1 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
boolean test_is_a (in string type);
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
index 042b552b16d..a0e5aedb34f 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/Invocation_Utils.h"
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
index fa5851d93de..5ed49ad40c1 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index 07c2d7d5a75..413809511ec 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 9573acfcedc..2e4dce3e7dd 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
index 7314f7555fe..66ba195352c 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.inl b/TAO/tests/Muxed_GIOP_Versions/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.inl
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index ed8d0a0daee..9980092ae66 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e5d0bc88b04..9f69fba62ea 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index dc8a4887b11..99b5c23bd73 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index 2bf43f81b15..3c6b62ee443 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
Source_Files {
test.idl
diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp
index 9cc69f36f8b..63b68482745 100644
--- a/TAO/tests/Native_Exceptions/client.cpp
+++ b/TAO/tests/Native_Exceptions/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp
index 3006f8dfe10..87cdea0c03e 100644
--- a/TAO/tests/Native_Exceptions/server.cpp
+++ b/TAO/tests/Native_Exceptions/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/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp
index 43643b16f0d..dfa3792ac03 100644
--- a/TAO/tests/Native_Exceptions/test_i.cpp
+++ b/TAO/tests/Native_Exceptions/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/Native_Exceptions/test_i.inl b/TAO/tests/Native_Exceptions/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/Native_Exceptions/test_i.inl
+++ b/TAO/tests/Native_Exceptions/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
index cba516a30ef..c322e961173 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Nested_Upcall_Idl): taoidldefaults {
IDL_Files {
MT_Client_Test.idl
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc
index ec285b86e6b..3a0103984a7 100644
--- a/TAO/tests/NestedUpcall/Simple/Simple.mpc
+++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Nested_Upcall_Idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 555e40df214..7c6cbeaf6a4 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp
index 7525ef2160c..c25ba3f761f 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
client_i::client_i (int quiet,
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h
index b0d308f04b8..a257039dab6 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.h
+++ b/TAO/tests/NestedUpcall/Simple/client_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class client_i : public POA_client
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 8121c3a19b5..1f63d771f33 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 6e8e09d9f89..ca14337b876 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
server_i::server_i (int quiet,
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h
index adc1cf9dd25..6b070844b0b 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.h
+++ b/TAO/tests/NestedUpcall/Simple/server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class server_i : public POA_server
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 7a979bec324..027c9993cb2 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
index 7d62074dd0d..d3abeefc0c3 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
+++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Nested_Upcall_Server_Idl): taoidldefaults {
IDL_Files {
Triangle_Test.idl
diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
index 77c1118e5ce..1acef8e7aff 100644
--- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
+++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index 4f1a972f14f..4c06f40fb06 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
#include "test_i.h"
diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp
index 2dbfed5c6fc..53dc6f26297 100644
--- a/TAO/tests/Nested_Event_Loop/server.cpp
+++ b/TAO/tests/Nested_Event_Loop/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp
index 607f87b5ee1..26856a86a83 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.cpp
+++ b/TAO/tests/Nested_Event_Loop/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h
index 2c87f7099a8..58d9362d0f7 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.h
+++ b/TAO/tests/Nested_Event_Loop/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class server_i : public POA_server
diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
index 346ff645141..602268f2aa1 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp
index 4f87edd2180..f2127345363 100644
--- a/TAO/tests/Nested_Upcall_Crash/client.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Peer.h"
#include "Clock_Ticks.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
index 16801621f7b..e548316cdc5 100644
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp
index 5abc07a54f5..47b5e700d19 100644
--- a/TAO/tests/Nested_Upcall_Crash/server.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Peer.h"
#include "Clock_Ticks.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
index bbcbfa8e1b6..ddbc541fa2f 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
index ee461bf6f73..6649dbc7b0c 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
index cc915920a38..3100cffb926 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/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/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
index f2601f6c371..50d71b99e44 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.h b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
index 8a27179f677..e9a304aa039 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.h
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_NO_SERVER_MT_CLIENT_TEST_I_H
#define TAO_NO_SERVER_MT_CLIENT_TEST_I_H
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index 7f28d3934f3..940f6962ce5 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AnyS_impl.h"
Test_impl::Test_impl (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc
index cb7c8c9ef6c..a0917968a02 100644
--- a/TAO/tests/OBV/Any/OBV_Any.mpc
+++ b/TAO/tests/OBV/Any/OBV_Any.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Any.idl
diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index 834c8aee7f7..4727efe5d5b 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AnyC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp
index cc4bf4b55a1..5870e17a604 100644
--- a/TAO/tests/OBV/Any/server.cpp
+++ b/TAO/tests/OBV/Any/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AnyS_impl.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc
index 874fb7e2c0c..fea2ea46f89 100644
--- a/TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc
+++ b/TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Collocated): taoserver, valuetype {
exename = collocated
Source_Files {
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
index 206465a0e52..9e0fb1ab75a 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
Test_impl::Test_impl (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/OBV/Collocated/Forward/TreeBase.idl b/TAO/tests/OBV/Collocated/Forward/TreeBase.idl
index b350133f8ea..666b02e83fe 100644
--- a/TAO/tests/OBV/Collocated/Forward/TreeBase.idl
+++ b/TAO/tests/OBV/Collocated/Forward/TreeBase.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Forward declaration to make recursive construct.
valuetype BaseNode;
diff --git a/TAO/tests/OBV/Collocated/Forward/TreeController.idl b/TAO/tests/OBV/Collocated/Forward/TreeController.idl
index cdeffe9830b..464276ea890 100644
--- a/TAO/tests/OBV/Collocated/Forward/TreeController.idl
+++ b/TAO/tests/OBV/Collocated/Forward/TreeController.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype BaseNode;
// This TreeController is probably a silly idea.
diff --git a/TAO/tests/OBV/Collocated/Forward/TreeNode.idl b/TAO/tests/OBV/Collocated/Forward/TreeNode.idl
index f37c1639395..f8157f7f660 100644
--- a/TAO/tests/OBV/Collocated/Forward/TreeNode.idl
+++ b/TAO/tests/OBV/Collocated/Forward/TreeNode.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TreeBase.idl"
//
diff --git a/TAO/tests/OBV/Factory/Factory.idl b/TAO/tests/OBV/Factory/Factory.idl
index 43ce343697a..1fe2ccc8022 100644
--- a/TAO/tests/OBV/Factory/Factory.idl
+++ b/TAO/tests/OBV/Factory/Factory.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//
// This file contains few valuetypes to show and test basic OBV factory
// construct functionality.
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
index ceeec488401..c0cde67dcba 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FactoryC_impl.h"
OBV_FactoryTest::Value2*
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index a1bd5c28db1..c9e250aa71d 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FactoryC_impl.h"
#include "FactoryS_impl.h"
diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc
index 9e3d394d840..25cf9725e90 100644
--- a/TAO/tests/OBV/Factory/OBV_Factory.mpc
+++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Factory.idl
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 902fb5dd29d..3a2c472c964 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FactoryC.h"
#include "FactoryC_impl.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 528d1516f73..1eb6fa98891 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FactoryS_impl.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc
index e59ee7d2022..f3d88ea7381 100644
--- a/TAO/tests/OBV/Forward/OBV_Forward.mpc
+++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
TreeBase.idl
diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index 78d97b39cf7..9f65ab9bc71 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "TreeBaseC.h"
diff --git a/TAO/tests/OBV/Forward/TreeBase.idl b/TAO/tests/OBV/Forward/TreeBase.idl
index b350133f8ea..666b02e83fe 100644
--- a/TAO/tests/OBV/Forward/TreeBase.idl
+++ b/TAO/tests/OBV/Forward/TreeBase.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Forward declaration to make recursive construct.
valuetype BaseNode;
diff --git a/TAO/tests/OBV/Forward/TreeController.idl b/TAO/tests/OBV/Forward/TreeController.idl
index cdeffe9830b..464276ea890 100644
--- a/TAO/tests/OBV/Forward/TreeController.idl
+++ b/TAO/tests/OBV/Forward/TreeController.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype BaseNode;
// This TreeController is probably a silly idea.
diff --git a/TAO/tests/OBV/Forward/TreeNode.idl b/TAO/tests/OBV/Forward/TreeNode.idl
index f37c1639395..f8157f7f660 100644
--- a/TAO/tests/OBV/Forward/TreeNode.idl
+++ b/TAO/tests/OBV/Forward/TreeNode.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TreeBase.idl"
//
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index 9055a264a94..ab5273dcd11 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TreeBaseC.h"
#include "TreeControllerC.h"
#include "TreeNodeC.h"
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp
index 9ed20a28341..b809ee50eac 100644
--- a/TAO/tests/OBV/Forward/server.cpp
+++ b/TAO/tests/OBV/Forward/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TreeBaseC.h"
#include "TreeControllerC.h"
#include "TreeNodeC.h"
diff --git a/TAO/tests/OBV/Indirection/Factory.cpp b/TAO/tests/OBV/Indirection/Factory.cpp
index 4fecc7e5a81..4174e3ea656 100755
--- a/TAO/tests/OBV/Indirection/Factory.cpp
+++ b/TAO/tests/OBV/Indirection/Factory.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Factory.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tests/OBV/Indirection/Factory.h b/TAO/tests/OBV/Indirection/Factory.h
index 76acb647878..9ea876feab7 100755
--- a/TAO/tests/OBV/Indirection/Factory.h
+++ b/TAO/tests/OBV/Indirection/Factory.h
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/Valuetype/ValueFactory.h"
#include "tao/ORB.h"
#include "MessengerC.h"
diff --git a/TAO/tests/OBV/Indirection/Indirection.mpc b/TAO/tests/OBV/Indirection/Indirection.mpc
index 91ac7d5e1b8..f2fc815fd87 100644
--- a/TAO/tests/OBV/Indirection/Indirection.mpc
+++ b/TAO/tests/OBV/Indirection/Indirection.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): taoidldefaults, valuetype {
IDL_Files {
Messenger.idl
diff --git a/TAO/tests/OBV/Indirection/Messenger.idl b/TAO/tests/OBV/Indirection/Messenger.idl
index 753dbad94ec..ec0de56f88c 100644
--- a/TAO/tests/OBV/Indirection/Messenger.idl
+++ b/TAO/tests/OBV/Indirection/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
module demo {
diff --git a/TAO/tests/OBV/Indirection/MessengerClient.cpp b/TAO/tests/OBV/Indirection/MessengerClient.cpp
index 2269964b8b4..226a4cfd028 100644
--- a/TAO/tests/OBV/Indirection/MessengerClient.cpp
+++ b/TAO/tests/OBV/Indirection/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "Factory.h"
#include <iostream>
diff --git a/TAO/tests/OBV/Indirection/MessengerServer.cpp b/TAO/tests/OBV/Indirection/MessengerServer.cpp
index f6797e1a980..21a4c088e53 100644
--- a/TAO/tests/OBV/Indirection/MessengerServer.cpp
+++ b/TAO/tests/OBV/Indirection/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "Factory.h"
diff --git a/TAO/tests/OBV/Indirection/Messenger_i.cpp b/TAO/tests/OBV/Indirection/Messenger_i.cpp
index bd845b32e07..09f9d062d83 100644
--- a/TAO/tests/OBV/Indirection/Messenger_i.cpp
+++ b/TAO/tests/OBV/Indirection/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tests/OBV/Indirection/Messenger_i.h b/TAO/tests/OBV/Indirection/Messenger_i.h
index dc8f061cb07..14736adccb8 100644
--- a/TAO/tests/OBV/Indirection/Messenger_i.h
+++ b/TAO/tests/OBV/Indirection/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H
#define MESSENGER_I_H
diff --git a/TAO/tests/OBV/Simple/OBV.idl b/TAO/tests/OBV/Simple/OBV.idl
index f909dc25975..5436de284bd 100644
--- a/TAO/tests/OBV/Simple/OBV.idl
+++ b/TAO/tests/OBV/Simple/OBV.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Event
{
void do_print ();
diff --git a/TAO/tests/OBV/Simple/OBV_Simple.mpc b/TAO/tests/OBV/Simple/OBV_Simple.mpc
index 0e9f2963d62..127e02cfd51 100644
--- a/TAO/tests/OBV/Simple/OBV_Simple.mpc
+++ b/TAO/tests/OBV/Simple/OBV_Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags -= -St
IDL_Files {
diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp
index 8ae13d5288a..b49d1f116d7 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.cpp
+++ b/TAO/tests/OBV/Simple/OBV_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "OBV_impl.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h
index 4164a6ff96b..3bc81eda768 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.h
+++ b/TAO/tests/OBV/Simple/OBV_impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined (OBV_IMPL_H)
#define OBV_IMPL_H
diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp
index 498547af46c..1ad1a9cfb8b 100644
--- a/TAO/tests/OBV/Simple/Server_i.cpp
+++ b/TAO/tests/OBV/Simple/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "OBV_impl.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 0ed12054250..c7bab2b9e48 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/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/tests/OBV/Simple/server.cpp b/TAO/tests/OBV/Simple/server.cpp
index d2e2dec29d7..0c1b6e8b9fc 100644
--- a/TAO/tests/OBV/Simple/server.cpp
+++ b/TAO/tests/OBV/Simple/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Simple_util.h"
#include "Server_i.h"
diff --git a/TAO/tests/OBV/Supports/Supports_Test.idl b/TAO/tests/OBV/Supports/Supports_Test.idl
index 9b60a941d7a..d1b5fe9a494 100644
--- a/TAO/tests/OBV/Supports/Supports_Test.idl
+++ b/TAO/tests/OBV/Supports/Supports_Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
///////////////////////////////////////////////////////////////////////////////
/**
* \file Supports_Test.idl
diff --git a/TAO/tests/OBV/Supports/Supports_Test.mpc b/TAO/tests/OBV/Supports/Supports_Test.mpc
index 4dcc86fc472..feba948cc52 100644
--- a/TAO/tests/OBV/Supports/Supports_Test.mpc
+++ b/TAO/tests/OBV/Supports/Supports_Test.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Server): taoserver, valuetype, strategies {
// This is just a dummy_label to prevent the test from being compiled
// in MPC builds
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index 385c6fa7dab..fa192f1d10b 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -1,4 +1,3 @@
-// $Id$
// FUZZ: disable check_for_streams_include
#include "Supports_Test_impl.h"
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index 976f570a3eb..0154a8f971f 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SUPPORTS_TEST_IMPL_H
#define TAO_SUPPORTS_TEST_IMPL_H
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index 669d551153b..de74c2e2f51 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supports_Test_impl.h"
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp
index 45870a85cab..764f628537a 100644
--- a/TAO/tests/OBV/Supports/server.cpp
+++ b/TAO/tests/OBV/Supports/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supports_Test_impl.h"
#include "tao/Strategies/advanced_resource.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
index 075cfc0f63c..8fb093bd48b 100644
--- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
+++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
test.idl
diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp
index 5059c5a740c..1cf7dde9dc5 100644
--- a/TAO/tests/OBV/TC_Alignment/client.cpp
+++ b/TAO/tests/OBV/TC_Alignment/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp
index 7a7b83fb205..5a7d3f136d2 100644
--- a/TAO/tests/OBV/TC_Alignment/server.cpp
+++ b/TAO/tests/OBV/TC_Alignment/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp
index 71ca17435a1..ed20848b459 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.cpp
+++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/OBV/Truncatable/Extra.idl b/TAO/tests/OBV/Truncatable/Extra.idl
index 453b85a92b2..f61dc416695 100644
--- a/TAO/tests/OBV/Truncatable/Extra.idl
+++ b/TAO/tests/OBV/Truncatable/Extra.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//
// This file contains extra valuetypes which are unknown by the test
// server. We should be able to pass these values and have the server
diff --git a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
index d6b4c90da6e..34ab637d3b5 100644
--- a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
+++ b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Extra.idl
diff --git a/TAO/tests/OBV/Truncatable/Truncatable.idl b/TAO/tests/OBV/Truncatable/Truncatable.idl
index b86e094c470..e5f7542b6bc 100644
--- a/TAO/tests/OBV/Truncatable/Truncatable.idl
+++ b/TAO/tests/OBV/Truncatable/Truncatable.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//
// This file contains few valuetypes to show and test truncatable feature of
// valuetype.
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
index cf704486e3c..8c774f71e24 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TruncatableS_impl.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index c185a386dc7..1ddcc5470e2 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TruncatableC.h"
#include "ExtraC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp
index fdad2ebdcf2..26188c43b84 100644
--- a/TAO/tests/OBV/Truncatable/server.cpp
+++ b/TAO/tests/OBV/Truncatable/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TruncatableS_impl.h"
#include "TruncatableC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index 50e9c5b1d19..7f6f0d2ceba 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
Test_impl::Test_impl (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index d4367b0dff2..506cd15686c 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "valueboxC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp
index 37f27f1ccb3..88c3cab228f 100644
--- a/TAO/tests/OBV/ValueBox/server.cpp
+++ b/TAO/tests/OBV/ValueBox/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/ValueBox/valuebox.idl b/TAO/tests/OBV/ValueBox/valuebox.idl
index 235513c6c55..ccd9da6f193 100644
--- a/TAO/tests/OBV/ValueBox/valuebox.idl
+++ b/TAO/tests/OBV/ValueBox/valuebox.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "vb_basic.idl"
#include "vb_struct.idl"
#include "vb_union.idl"
diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc
index 27a4e43e502..f14a9d44810 100644
--- a/TAO/tests/OBV/ValueBox/valuebox.mpc
+++ b/TAO/tests/OBV/ValueBox/valuebox.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
vb_basic.idl
diff --git a/TAO/tests/OBV/ValueBox/vb_basic.idl b/TAO/tests/OBV/ValueBox/vb_basic.idl
index ab2556e3934..ad45ba0085a 100644
--- a/TAO/tests/OBV/ValueBox/vb_basic.idl
+++ b/TAO/tests/OBV/ValueBox/vb_basic.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//=========================================================================
// Valuebox of basic types
//=========================================================================
diff --git a/TAO/tests/OBV/ValueBox/vb_struct.idl b/TAO/tests/OBV/ValueBox/vb_struct.idl
index e25a207a2f0..79599bb43a4 100644
--- a/TAO/tests/OBV/ValueBox/vb_struct.idl
+++ b/TAO/tests/OBV/ValueBox/vb_struct.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//=========================================================================
// Valuebox of structs
//=========================================================================
diff --git a/TAO/tests/OBV/ValueBox/vb_union.idl b/TAO/tests/OBV/ValueBox/vb_union.idl
index 0a05be46651..59540ea4f6f 100644
--- a/TAO/tests/OBV/ValueBox/vb_union.idl
+++ b/TAO/tests/OBV/ValueBox/vb_union.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//=========================================================================
// Valuebox of unions
//=========================================================================
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
index f67164da137..a9d251e4c5c 100644
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
@@ -1,4 +1,3 @@
-// $Id$
// @author Jeff Mirwaisi <jeff_mirwaisi@yahoo.com>
// @author Iliyan Jeliazkov <iliyan2ociweb.com>
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc b/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
index 647d6163b54..087cb5a1cc4 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
@@ -1,6 +1,4 @@
-// $Id$
-
project (DllOrb) : taolib, portableserver {
dynamicflags += DLLORB_BUILD_DLL
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h
index 9eb5083ea7b..8c8c3a8840c 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl DllOrb
// ------------------------------
diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc b/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
index 9abda088933..168021f9f20 100644
--- a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
@@ -1,4 +1,3 @@
-// $Id$
// @author Phil Mesnier <mesnier_p@ociweb.com>
// This test scenario is documented in bugzilla bug 3049. This test
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
+++ b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
index 395079eae05..d02259117bb 100644
--- a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// The following is required to be able to access
// ace_svc_desc_TAO_*_Parser, below
#include "tao/CORBALOC_Parser.h"
diff --git a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
+++ b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Separation/Test.cpp b/TAO/tests/ORB_Local_Config/Separation/Test.cpp
index ce39070e37b..20b3d0df33e 100644
--- a/TAO/tests/ORB_Local_Config/Separation/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Separation/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CORBANAME_Parser.h"
#include "tao/CORBALOC_Parser.h"
#include "tao/IIOP_Factory.h"
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
index 41b069b5daa..1e00a53f757 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Service_Config_DLL.h"
#include "ace/Service_Config.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h
index 1688a745350..4c20ae6a70d 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_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/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
index 33b67542727..da42a8f8e25 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
after += Service_Config_Dependent_DLL TAO
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
index 338701e06fa..a738fa1f230 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Codeset_Descriptor_Base.h"
#include "tao/Codeset_Manager_Factory_Base.h"
#include "tao/Codeset_Manager.h"
diff --git a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
+++ b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Shared/Test.cpp b/TAO/tests/ORB_Local_Config/Shared/Test.cpp
index 9141a1fa422..ea5db3704c0 100644
--- a/TAO/tests/ORB_Local_Config/Shared/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Shared/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CORBANAME_Parser.h"
#include "tao/CORBALOC_Parser.h"
#include "tao/Protocol_Factory.h"
diff --git a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
+++ b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Simple/Test.cpp b/TAO/tests/ORB_Local_Config/Simple/Test.cpp
index b2db8cc4308..024b805f6b7 100644
--- a/TAO/tests/ORB_Local_Config/Simple/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Simple/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CORBANAME_Parser.h"
#include "tao/CORBALOC_Parser.h"
#include "tao/Protocol_Factory.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
index b56ec03a8e6..211d91693b2 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ORB_DLL.h"
#include "ace/Service_Config.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h
index f9f8860f2cd..b7555de2a55 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl Service_Config_ORB_DLL
// ------------------------------
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp
index 9190e37b13a..1c6d5526d6e 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ARGV.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
index 00428f2f257..f4d3d6c8a2c 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
index dd7162beabe..d5717fabb68 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ORB_DLL.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
index ae4e5499fc3..98caf3d4143 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ORB_DLL.h"
diff --git a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
index 7d02ce2ba35..6e8ad2850e8 100644
--- a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
+++ b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVICE_CONFIGURATION_PER_ORB_H
# define SERVICE_CONFIGURATION_PER_ORB_H
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.mpc b/TAO/tests/ORB_destroy/ORB_destroy.mpc
index 4665ebfdacc..cdb8729564c 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.mpc
+++ b/TAO/tests/ORB_destroy/ORB_destroy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver {
exename = ORB_destroy
}
diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp
index 137b3920ba8..ee8127dc804 100644
--- a/TAO/tests/ORB_init/ORB_init.cpp
+++ b/TAO/tests/ORB_init/ORB_init.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/ORB_init/ORB_init.mpc b/TAO/tests/ORB_init/ORB_init.mpc
index 7ccbe817f03..858d7f4b2d9 100644
--- a/TAO/tests/ORB_init/ORB_init.mpc
+++ b/TAO/tests/ORB_init/ORB_init.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe {
exename = ORB_init
}
diff --git a/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc b/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
index 2454cd6de7a..814a5e5ea44 100644
--- a/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
+++ b/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
}
diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp
index a89d07632bf..e5e58917cdd 100644
--- a/TAO/tests/ORB_init/Portspan/server.cpp
+++ b/TAO/tests/ORB_init/Portspan/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simpleI.h"
int
diff --git a/TAO/tests/ORB_init/Portspan/simple.idl b/TAO/tests/ORB_init/Portspan/simple.idl
index 0505f36e9ac..dca7ddc8856 100644
--- a/TAO/tests/ORB_init/Portspan/simple.idl
+++ b/TAO/tests/ORB_init/Portspan/simple.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface simple {
void test();
};
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.cpp b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
index a55aa17b7e1..ec9cc2839da 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.cpp
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Foo_Bar.h"
Foo_Bar::Foo_Bar (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.mpc b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
index 6cbfa60be64..3b18febd081 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.mpc
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(ORB Shutdown Server): taoserver {
Source_Files {
Foo_Bar.cpp
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index 7618864afe6..ffeeb4fed2b 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Foo_Bar.h"
#include "ace/Time_Value.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc
index 4d4b4688fc0..ec58bcf2742 100644
--- a/TAO/tests/ORT/ORT.mpc
+++ b/TAO/tests/ORT/ORT.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Test_ORT_IDL): taoidldefaults {
IDL_Files {
ORT_test.idl
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index 53ddd0ecb11..aaa376144d8 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORT_test_IORInterceptor.h"
#include "ObjectReferenceFactory.h"
diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp
index 7580b83f35a..0c0a7eb42fe 100644
--- a/TAO/tests/ORT/ORT_test_i.cpp
+++ b/TAO/tests/ORT/ORT_test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORT_test_i.h"
ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp
index 846a745b131..7bc1831378c 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.cpp
+++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ObjectReferenceFactory.h"
#include "tao/debug.h"
diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp
index c6170fd8ca3..9840a5ded32 100644
--- a/TAO/tests/ORT/ServerORBInitializer.cpp
+++ b/TAO/tests/ORT/ServerORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerORBInitializer.h"
#include "ServerRequestInterceptor.h"
#include "ORT_test_IORInterceptor.h"
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 7d71a124a69..096d6e628d1 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequestInterceptor.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp
index 9d3d446fe01..c0bddcfd54a 100644
--- a/TAO/tests/ORT/client.cpp
+++ b/TAO/tests/ORT/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORT_testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp
index 5918b3c001b..19432676790 100644
--- a/TAO/tests/ORT/server.cpp
+++ b/TAO/tests/ORT/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORT_test_i.h"
#include "ServerORBInitializer.h"
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index ebbe574b6a7..34376b8cde5 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Loader.h"
#include "Test_i.h"
diff --git a/TAO/tests/Object_Loader/OLT_Export.h b/TAO/tests/Object_Loader/OLT_Export.h
index f7d3ad034b9..d8edca6fd21 100644
--- a/TAO/tests/Object_Loader/OLT_Export.h
+++ b/TAO/tests/Object_Loader/OLT_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/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc
index 74f49da753c..b9e1548f2e0 100644
--- a/TAO/tests/Object_Loader/Object_Loader.mpc
+++ b/TAO/tests/Object_Loader/Object_Loader.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Object_Loader/Test.idl b/TAO/tests/Object_Loader/Test.idl
index 609fe5f62c8..9d82ef2d79a 100644
--- a/TAO/tests/Object_Loader/Test.idl
+++ b/TAO/tests/Object_Loader/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 6ca3c420183..5df62655307 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
CORBA::Long
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index a7309ca3f19..7010222e5aa 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index dd82699300d..18f6f1a2b12 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index 1db48a68a30..047fe627f5b 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/ACE.h"
#include "testC.h"
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 93fa08571ff..cc6c92208a1 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index fb3a36f0e82..faae9d09299 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/ACE.h"
diff --git a/TAO/tests/OctetSeq/test_i.inl b/TAO/tests/OctetSeq/test_i.inl
index eb8ded0afd6..e356538b357 100644
--- a/TAO/tests/OctetSeq/test_i.inl
+++ b/TAO/tests/OctetSeq/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Database_i::Database_i (CORBA::ORB_ptr orb,
Test::Index max_range)
diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp
index 68768aed3e2..30a7174af86 100644
--- a/TAO/tests/Ondemand_Write/Hello.cpp
+++ b/TAO/tests/Ondemand_Write/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
index 533fb3def3b..d36e5a92cbd 100644
--- a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
+++ b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Ondemand_Write/client.cpp b/TAO/tests/Ondemand_Write/client.cpp
index d00f9a7cf84..a32cac6d478 100644
--- a/TAO/tests/Ondemand_Write/client.cpp
+++ b/TAO/tests/Ondemand_Write/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Ondemand_Write/server.cpp
+++ b/TAO/tests/Ondemand_Write/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index f04ccc6e29a..64a47469668 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 0443972028e..b771e06306d 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Oneway_Buffering_Admin.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 7c60f9a794f..3d1970e478c 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index c27cd5cf5f0..af9a0bbe2b1 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Oneway_Buffering.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
index 7b516f83f14..f80506b0c0d 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.h b/TAO/tests/Oneway_Send_Timeouts/Client.h
index 73ff2b8282f..4413cacdbfb 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _CLIENT_
#define _CLIENT_
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h
index 16f16b996be..b40ae16d536 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _CLIENT_TASK_
#define _CLIENT_TASK_
diff --git a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h
index 88ce953eee7..60b870e3799 100644
--- a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h
+++ b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _ORB_TASK_
#define _ORB_TASK_
diff --git a/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc b/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc
index 43b719cbf51..2fb59a4ac0c 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc
+++ b/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.cpp b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
index a0122a45d7b..be87b9e6ba4 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.h b/TAO/tests/Oneway_Send_Timeouts/Server.h
index 13f7e5b9ed2..09d98a408d7 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Server.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SERVER_
#define _SERVER_
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h
index ed5db5eb1bd..08862f30111 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SERVER_TASK_
#define _SERVER_TASK_
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test.idl b/TAO/tests/Oneway_Send_Timeouts/Test.idl
index 2794efc1f03..e8d89500d3e 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test.idl
+++ b/TAO/tests/Oneway_Send_Timeouts/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// sleep for the said time, unless u head from
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
index 036c9580781..a8cccb33fb9 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.h b/TAO/tests/Oneway_Send_Timeouts/Test_i.h
index 75c56a3acc7..974a8401bba 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test_i.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_I_
#define _TEST_I_
diff --git a/TAO/tests/Oneway_Send_Timeouts/main.cpp b/TAO/tests/Oneway_Send_Timeouts/main.cpp
index 4d77273b0c7..c1153ecbbf8 100644
--- a/TAO/tests/Oneway_Send_Timeouts/main.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "Client_Task.h"
diff --git a/TAO/tests/Oneway_Timeouts/Test.idl b/TAO/tests/Oneway_Timeouts/Test.idl
index 30a517bde36..d076114e7c6 100644
--- a/TAO/tests/Oneway_Timeouts/Test.idl
+++ b/TAO/tests/Oneway_Timeouts/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Tester {
oneway void test(in long id);
long test2(in long id);
diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp
index e11fea62581..52f7a79c751 100644
--- a/TAO/tests/Oneway_Timeouts/client.cpp
+++ b/TAO/tests/Oneway_Timeouts/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp
index 3de5af50ebf..19b7f52659f 100644
--- a/TAO/tests/Oneway_Timeouts/server.cpp
+++ b/TAO/tests/Oneway_Timeouts/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/Oneway_Timeouts/test.mpc b/TAO/tests/Oneway_Timeouts/test.mpc
index 3f3e7cd6050..1cf73d70add 100644
--- a/TAO/tests/Oneway_Timeouts/test.mpc
+++ b/TAO/tests/Oneway_Timeouts/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index ca0d05b4dfb..a6a55473f33 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index f12cbc8c09b..78148ce9169 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver_i.h"
Receiver_i::Receiver_i (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 6944edebff0..6708456bf72 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
Sender_i::Sender_i (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
index 89b4c650553..9195b04f6f9 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver_i.h"
#include "Client_Task.h"
#include "Server_Task.h"
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
index ac3522946f8..6a20088761f 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Optimized_Connection/Optimized_Connection.mpc b/TAO/tests/Optimized_Connection/Optimized_Connection.mpc
index 39ff38f6991..8c2228d75c6 100644
--- a/TAO/tests/Optimized_Connection/Optimized_Connection.mpc
+++ b/TAO/tests/Optimized_Connection/Optimized_Connection.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Optimized_Connection/oc_client.cpp b/TAO/tests/Optimized_Connection/oc_client.cpp
index 42295a80a16..cb8915cd7d0 100644
--- a/TAO/tests/Optimized_Connection/oc_client.cpp
+++ b/TAO/tests/Optimized_Connection/oc_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 47df8aeb010..f414495f426 100644
--- a/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
libs += Generic_Servant
after += POA_Generic_Servant_Lib
diff --git a/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc b/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc
index cb7932e188b..6171a717542 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc
+++ b/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
index b46f29f82bd..6035eafe86f 100644
--- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServantLocator.h"
#include "test_i.h"
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
index b6aff9b68d2..11972183323 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORB_Constants.h"
#include "Server_Request_Interceptor.h"
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
index 38d56a401a0..8a9a3a32d87 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Request_Interceptor.h"
CORBA::Boolean receive_request_service_contexts_called = 0;
diff --git a/TAO/tests/POA/Bug_1592_Regression/client.cpp b/TAO/tests/POA/Bug_1592_Regression/client.cpp
index f7c91f25a47..ecf0b20b126 100644
--- a/TAO/tests/POA/Bug_1592_Regression/client.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/POA/Bug_1592_Regression/server.cpp b/TAO/tests/POA/Bug_1592_Regression/server.cpp
index 0066751ec00..a1aef31be38 100644
--- a/TAO/tests/POA/Bug_1592_Regression/server.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ServantLocator.h"
diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
index 4d9d57dd008..e5bba01dc1f 100644
--- a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
extern CORBA::Boolean receive_request_called;
diff --git a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
index 91146f271ff..3d6ca8e469f 100644
--- a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
+++ b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
}
diff --git a/TAO/tests/POA/Bug_2511_Regression/test.idl b/TAO/tests/POA/Bug_2511_Regression/test.idl
index 373c4ef82f0..5f6b89393a9 100644
--- a/TAO/tests/POA/Bug_2511_Regression/test.idl
+++ b/TAO/tests/POA/Bug_2511_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void normal ();
diff --git a/TAO/tests/POA/Current/Current.mpc b/TAO/tests/POA/Current/Current.mpc
index d2819003e8f..425874ce4f5 100644
--- a/TAO/tests/POA/Current/Current.mpc
+++ b/TAO/tests/POA/Current/Current.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver {
exename = Current
}
diff --git a/TAO/tests/POA/DSI/Database.idl b/TAO/tests/POA/DSI/Database.idl
index b2b0b21cb2b..a4b6e40a42d 100644
--- a/TAO/tests/POA/DSI/Database.idl
+++ b/TAO/tests/POA/DSI/Database.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Database
{
typedef unsigned long Flags;
diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp
index 0de086a877e..09554524fb5 100644
--- a/TAO/tests/POA/DSI/Database_i.cpp
+++ b/TAO/tests/POA/DSI/Database_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Database_i.h"
#include "tao/DynamicInterface/Server_Request.h"
diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h
index 4f625079c9b..caa24a15eab 100644
--- a/TAO/tests/POA/DSI/Database_i.h
+++ b/TAO/tests/POA/DSI/Database_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DatabaseS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc b/TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc
index 137d4f17e33..fcf8751aa5c 100644
--- a/TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc
+++ b/TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Hello.cpp
diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp
index a4ccb0f8198..57c35e134ba 100644
--- a/TAO/tests/POA/Deactivate_Object/server.cpp
+++ b/TAO/tests/POA/Deactivate_Object/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
index 582c1f14733..132c7635cbe 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA Default Servant): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Default_Servant
}
diff --git a/TAO/tests/POA/Default_Servant/test.idl b/TAO/tests/POA/Default_Servant/test.idl
index ae2a5fd10d4..c7f88e22381 100644
--- a/TAO/tests/POA/Default_Servant/test.idl
+++ b/TAO/tests/POA/Default_Servant/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
};
diff --git a/TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc b/TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc
index b48685f3af7..80a425240dd 100644
--- a/TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc
+++ b/TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
File.idl
diff --git a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
index 35f5976c43a..66fbc15d13d 100644
--- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp
index d5043541f5d..99120e971d0 100644
--- a/TAO/tests/POA/EndpointPolicy/client.cpp
+++ b/TAO/tests/POA/EndpointPolicy/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp
index 8e6bc1ccd34..37425ab21fd 100644
--- a/TAO/tests/POA/EndpointPolicy/server.cpp
+++ b/TAO/tests/POA/EndpointPolicy/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/PolicyC.h"
#include "tao/EndpointPolicy/EndpointPolicy.h"
diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc
index 3aa46e5d4cf..1dca33b12d9 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.mpc
+++ b/TAO/tests/POA/Etherealization/Etherealization.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Etherealization
}
diff --git a/TAO/tests/POA/Etherealization/test.idl b/TAO/tests/POA/Etherealization/test.idl
index dd1b063b9bf..75349b2460e 100644
--- a/TAO/tests/POA/Etherealization/test.idl
+++ b/TAO/tests/POA/Etherealization/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
index 413f8d26750..a06ce3cfcec 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_corba_e_micro {
exename = Excessive_Object_Deactivations
}
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/test.idl b/TAO/tests/POA/Excessive_Object_Deactivations/test.idl
index c7d0b23d96e..3c2146f8325 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/test.idl
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void deactivate_self ();
diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
index c6bb0dfd35d..6f43518ffd6 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taolib, wfmo {
sharedname = Alt_Resource_Factory
dynamicflags += Alt_Resource_Factory_BUILD_DLL
diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
index 898bad28526..3c8cfc796d0 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/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/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
index 9b6ae031814..f84623cbe4f 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Resource_Factory.h"
#include "ace/WFMO_Reactor.h"
diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
index 5ddb73d0a37..206c0a1ee8b 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/default_resource.h"
#include "Alt_Resource_Factory.h"
diff --git a/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index 47df8aeb010..f414495f426 100644
--- a/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
libs += Generic_Servant
after += POA_Generic_Servant_Lib
diff --git a/TAO/tests/POA/FindPOA/Adapter_Activator.cpp b/TAO/tests/POA/FindPOA/Adapter_Activator.cpp
index 1e4a8689991..21ccbf46fe1 100644
--- a/TAO/tests/POA/FindPOA/Adapter_Activator.cpp
+++ b/TAO/tests/POA/FindPOA/Adapter_Activator.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Adapter_Activator.h"
#if (TAO_HAS_MINIMUM_POA == 0)
diff --git a/TAO/tests/POA/FindPOA/POA_FindPOA.mpc b/TAO/tests/POA/FindPOA/POA_FindPOA.mpc
index 82b289cf4b2..bc12f9b3a4f 100644
--- a/TAO/tests/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/tests/POA/FindPOA/POA_FindPOA.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = FindPOA
}
diff --git a/TAO/tests/POA/Forwarding/POA_Forwarding.mpc b/TAO/tests/POA/Forwarding/POA_Forwarding.mpc
index 1ef382e5f9d..6d373a09ebc 100644
--- a/TAO/tests/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/tests/POA/Forwarding/POA_Forwarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) : taoidldefaults, anytypecode {
IDL_Files {
test.idl
diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.cpp b/TAO/tests/POA/Forwarding/Servant_Activator.cpp
index 605a43debaf..437245c15d8 100644
--- a/TAO/tests/POA/Forwarding/Servant_Activator.cpp
+++ b/TAO/tests/POA/Forwarding/Servant_Activator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Servant_Activator.h"
#include "test_i.h"
diff --git a/TAO/tests/POA/Forwarding/test.idl b/TAO/tests/POA/Forwarding/test.idl
index 6f4c8f78d99..3a6c4ee76b3 100644
--- a/TAO/tests/POA/Forwarding/test.idl
+++ b/TAO/tests/POA/Forwarding/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
long doit ();
diff --git a/TAO/tests/POA/Forwarding/test_i.cpp b/TAO/tests/POA/Forwarding/test_i.cpp
index e5869d89c06..4381f124cc1 100644
--- a/TAO/tests/POA/Forwarding/test_i.cpp
+++ b/TAO/tests/POA/Forwarding/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "Servant_Activator.h"
diff --git a/TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc
index f593bd9fac7..0670ac763a8 100644
--- a/TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc
+++ b/TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(POA_Generic_Servant_Lib): taolib_with_idl, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
sharedname = Generic_Servant
dynamicflags += GENERIC_SERVANT_BUILD_DLL
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
index 2d6f2520451..3ed1ef070f4 100644
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ b/TAO/tests/POA/Generic_Servant/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
#include "ace/Profile_Timer.h"
diff --git a/TAO/tests/POA/Generic_Servant/generic_servant_export.h b/TAO/tests/POA/Generic_Servant/generic_servant_export.h
index 4cb970ec91a..4cf6f40c6e5 100644
--- a/TAO/tests/POA/Generic_Servant/generic_servant_export.h
+++ b/TAO/tests/POA/Generic_Servant/generic_servant_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/tests/POA/Generic_Servant/test.idl b/TAO/tests/POA/Generic_Servant/test.idl
index bab53c761a0..a2e236e0a56 100644
--- a/TAO/tests/POA/Generic_Servant/test.idl
+++ b/TAO/tests/POA/Generic_Servant/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Generic_Servant/test_i.cpp b/TAO/tests/POA/Generic_Servant/test_i.cpp
index 2335e268f06..e8c87b99e13 100644
--- a/TAO/tests/POA/Generic_Servant/test_i.cpp
+++ b/TAO/tests/POA/Generic_Servant/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc
index be9b7edff28..a8b8fce6c61 100644
--- a/TAO/tests/POA/Identity/Identity.mpc
+++ b/TAO/tests/POA/Identity/Identity.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_corba_e_micro {
exename = Identity
}
diff --git a/TAO/tests/POA/Identity/test.idl b/TAO/tests/POA/Identity/test.idl
index ae2a5fd10d4..c7f88e22381 100644
--- a/TAO/tests/POA/Identity/test.idl
+++ b/TAO/tests/POA/Identity/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
};
diff --git a/TAO/tests/POA/Loader/POA_Loader.mpc b/TAO/tests/POA/Loader/POA_Loader.mpc
index fe5d10539dc..9eae50e2563 100644
--- a/TAO/tests/POA/Loader/POA_Loader.mpc
+++ b/TAO/tests/POA/Loader/POA_Loader.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
Source_Files {
server.cpp
diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp
index 3511aeffe3b..02631843c12 100644
--- a/TAO/tests/POA/Loader/Server_Manager.cpp
+++ b/TAO/tests/POA/Loader/Server_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Manager.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
index 4f833a99773..a3a2627aa30 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = MT_Servant_Locator
}
diff --git a/TAO/tests/POA/MT_Servant_Locator/test.idl b/TAO/tests/POA/MT_Servant_Locator/test.idl
index dd1b063b9bf..75349b2460e 100644
--- a/TAO/tests/POA/MT_Servant_Locator/test.idl
+++ b/TAO/tests/POA/MT_Servant_Locator/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
index 9d66d52ba76..289593831a5 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Nested_Non_Servant_Upcalls
}
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl b/TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl
index dd1b063b9bf..75349b2460e 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc b/TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc
index f4e31f3dfd0..d3cc7476bb5 100644
--- a/TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc
+++ b/TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = test
}
diff --git a/TAO/tests/POA/Non_Retain_System_Id/test.idl b/TAO/tests/POA/Non_Retain_System_Id/test.idl
index 8fb4acbb8ee..a022a3c50e7 100644
--- a/TAO/tests/POA/Non_Retain_System_Id/test.idl
+++ b/TAO/tests/POA/Non_Retain_System_Id/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface ID_Check
{
boolean check_servant_id (in short index);
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
index 5c7c5dfdef0..22cc630d00f 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver {
exename = Non_Servant_Upcalls
}
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/test.idl b/TAO/tests/POA/Non_Servant_Upcalls/test.idl
index ae2a5fd10d4..c7f88e22381 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/test.idl
+++ b/TAO/tests/POA/Non_Servant_Upcalls/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
};
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
index 6906d0d5e2c..9e95af510b3 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_corba_e_micro {
exename = Object_Reactivation
}
diff --git a/TAO/tests/POA/Object_Reactivation/test.idl b/TAO/tests/POA/Object_Reactivation/test.idl
index c7d0b23d96e..3c2146f8325 100644
--- a/TAO/tests/POA/Object_Reactivation/test.idl
+++ b/TAO/tests/POA/Object_Reactivation/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void deactivate_self ();
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
index 50882492aad..5a99021e652 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc b/TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc
index 75835257324..fa9cc036b8c 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(On_Demand_Act_D_Coll): taoserver, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = On_Demand_Act_D_Coll
idlflags += -Gd
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl
index ccb6713f7d3..9b085e36eaa 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
/// Return a simple string
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
index 1deaae764e1..81d081c8b6b 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
index e7ed9c1e67b..97fca576f2f 100644
--- a/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
+++ b/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = server
libs += Generic_Servant
diff --git a/TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc b/TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
index 91178d182f3..e6d5a7be1be 100644
--- a/TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
+++ b/TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = server
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
index bc7526091aa..b920ffbfda4 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Manager.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
index eda1c8db7aa..d9961889a70 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = POAManagerFactory
}
diff --git a/TAO/tests/POA/POA_BiDir/POA_BiDir.mpc b/TAO/tests/POA/POA_BiDir/POA_BiDir.mpc
index 214c90a98d3..2e63603fcb1 100644
--- a/TAO/tests/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/tests/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, bidir_giop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = POA_BiDir
}
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
index 8c38573927a..96f19b0c217 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver {
exename = POA_Destruction
}
diff --git a/TAO/tests/POA/POA_Destruction/test.idl b/TAO/tests/POA/POA_Destruction/test.idl
index 098546eb56e..d301677e078 100644
--- a/TAO/tests/POA/POA_Destruction/test.idl
+++ b/TAO/tests/POA/POA_Destruction/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void destroy_poa ();
diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
index 015c644c121..8028011df4a 100644
--- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
+++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA_IDL*): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/POA/Persistent_ID/test.idl b/TAO/tests/POA/Persistent_ID/test.idl
index 5651d1d18f6..d3545b73fb4 100644
--- a/TAO/tests/POA/Persistent_ID/test.idl
+++ b/TAO/tests/POA/Persistent_ID/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc
index d0363276786..6835ae7bd26 100644
--- a/TAO/tests/POA/Policies/Policies.mpc
+++ b/TAO/tests/POA/Policies/Policies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, pi_server, avoids_corba_e_micro {
exename = Policies
}
diff --git a/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
index 380a58cedeb..5a799ef7697 100644
--- a/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = server
libs += Generic_Servant
diff --git a/TAO/tests/POA/Reference_Counting/Reference_Counting.mpc b/TAO/tests/POA/Reference_Counting/Reference_Counting.mpc
index 68a3f8087d1..1b93ecbf8f0 100644
--- a/TAO/tests/POA/Reference_Counting/Reference_Counting.mpc
+++ b/TAO/tests/POA/Reference_Counting/Reference_Counting.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
test.cpp
diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp
index 8631f9e284a..976250bf66b 100644
--- a/TAO/tests/POA/Reference_Counting/test.cpp
+++ b/TAO/tests/POA/Reference_Counting/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HelloS.h"
class Hello_impl :
diff --git a/TAO/tests/POA/RootPOA/RootPOA.mpc b/TAO/tests/POA/RootPOA/RootPOA.mpc
index cbe208a28b8..ca7899507a0 100644
--- a/TAO/tests/POA/RootPOA/RootPOA.mpc
+++ b/TAO/tests/POA/RootPOA/RootPOA.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
exename = RootPOA
}
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
index 558e66bb88e..ae830fcc934 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Single_Threaded_POA
}
diff --git a/TAO/tests/POA/Single_Threaded_POA/test.idl b/TAO/tests/POA/Single_Threaded_POA/test.idl
index dd1b063b9bf..75349b2460e 100644
--- a/TAO/tests/POA/Single_Threaded_POA/test.idl
+++ b/TAO/tests/POA/Single_Threaded_POA/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/TIE/POA_TIE.mpc b/TAO/tests/POA/TIE/POA_TIE.mpc
index d252530897f..3b02a6017ad 100644
--- a/TAO/tests/POA/TIE/POA_TIE.mpc
+++ b/TAO/tests/POA/TIE/POA_TIE.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) : taoidldefaults {
idlflags += -GT
IDL_Files {
diff --git a/TAO/tests/POA/TIE/test.idl b/TAO/tests/POA/TIE/test.idl
index 409ca428547..bf6ceb30f81 100644
--- a/TAO/tests/POA/TIE/test.idl
+++ b/TAO/tests/POA/TIE/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface A
{
long doit();
diff --git a/TAO/tests/POA/wait_for_completion/test.idl b/TAO/tests/POA/wait_for_completion/test.idl
index 098546eb56e..d301677e078 100644
--- a/TAO/tests/POA/wait_for_completion/test.idl
+++ b/TAO/tests/POA/wait_for_completion/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void destroy_poa ();
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
index dc2f374ac05..2c43ed26bd1 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver {
exename = wait_for_completion
}
diff --git a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
index 6b71b6b4c45..e4254511318 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
+++ b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp
index 3e96f955529..0364c520ba5 100644
--- a/TAO/tests/Parallel_Connect_Strategy/client.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp
index ee7c20180f5..9183225ec89 100644
--- a/TAO/tests/Parallel_Connect_Strategy/server.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 0b887ef7890..e893228d48a 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
idlflags -= -Sa -St
diff --git a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
index ab5cf4db05d..edd41fca1db 100644
--- a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
+++ b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*StubTest) : taoexe, iormanip {
exename = StubTest
}
diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp
index f013183931e..d966325e7cc 100644
--- a/TAO/tests/Permanent_Forward/StubTest.cpp
+++ b/TAO/tests/Permanent_Forward/StubTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//========================================================================
/**
* @file StubTest.cpp
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index b49ac5b2594..b13e6c7a62c 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Policies/Policies.mpc b/TAO/tests/Policies/Policies.mpc
index 05a385e23a3..2f2b4ded042 100644
--- a/TAO/tests/Policies/Policies.mpc
+++ b/TAO/tests/Policies/Policies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Policies Manipulation): taoserver, messaging {
exename = Manipulation
}
diff --git a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
index b6358d7d003..6cb3839bf8d 100644
--- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
+++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp
index b156ee49c15..f2f7aace2da 100644
--- a/TAO/tests/Portable_Interceptors/AMI/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Handler.h"
#include "Client_ORBInitializer.h"
#include "Client_Interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp
index b02337b54a6..167f3b67ab6 100644
--- a/TAO/tests/Portable_Interceptors/AMI/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "Server_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
index 329a7bf2abd..35d60e1fc5a 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
StateTransfer.idl
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
index 6956b78b5fe..d953f523d12 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
InvokeMe.idl
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
index 329a7bf2abd..35d60e1fc5a 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
StateTransfer.idl
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
index 7556789e871..bfea67d3b52 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "client_interceptors.h"
#include "Interceptor_Type.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
index 5ecdecaeba5..a6259649f88 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Interceptor_Type.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
index 8c21f40315e..7626584c1bb 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
+++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags -= -Sa -St
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
index afb0b9d78f7..6bb583988f2 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "Interceptor_Type.h"
#include "server_interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 4d8f0fdea34..758467497be 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "marker.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
index 476a46d1dd4..6bad18941ff 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptors.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
index 41a2427480b..bb1ca298186 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "marker.h"
void
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.h b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
index b4cff869591..032e5d1771a 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/marker.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/High_Res_Timer.h"
#include "ace/Sched_Params.h"
#include "ace/Stats.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index a80e5756488..6cd7e017c72 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "Server_ORBInitializer.h"
#include "Interceptor_Type.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
index f4635a5725c..ab937bde14d 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptors.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
index 59c01162ab9..f11b29b637b 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "marker.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
index 395e526a9f0..14de839b7b3 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
index 778c95a2df9..8477a62bab0 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "client_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
index d76f6edc043..83fff97dd0e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
Server_ORBInitializer::Server_ORBInitializer (void)
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
index c7672a26863..50382009f30 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
index 6744b086064..f295510e9df 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
index e7af8982051..8b40121a747 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/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/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
index 152ccde0295..edd7970ba88 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
index 75d61f3827e..96622f81dc5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc b/TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc
index 87022b449ba..c6b56a9f3f7 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, pi, interceptors {
Source_Files {
Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
index e578f750ae8..928a4bcaf22 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
Client_ORBInitializer::Client_ORBInitializer (void) :
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
index c908fa6d094..241b24ac0de 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Client_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc b/TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc
index 4e3a62f3f1e..d2985a68338 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
index 8c25c69b51e..3c88fae18c2 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequest_Interceptor.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
index 430c542a0a3..2e31783440f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
index 50dd18fa608..517fc42e10b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/PortableInterceptorC.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
index 2017e62d471..90979bacc9f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
index 3063d6f4817..2409dc8c8ba 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
index c11f53f3fee..e161807d365 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "client_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
index 326900d2a38..bf5d836fee0 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
extern PortableInterceptor::SlotId slotId;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
index 3b0965ad24b..684b13eb11b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Synch.h"
#include "ace/Thread.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
index 5c27180d963..ae8793e46e2 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
index 9061a527d11..d2bf86eb2b5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/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/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
index 353766f9d5b..f364a40b997 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
index f2f1ff2ea50..45e61e456ce 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test_Interceptors
{
exception Silly
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
index 97e8b1004c2..2d056041912 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/PI/PI.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc b/TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc
index 2609cbc8946..4574377850b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
index b67fbb88829..8b78e2b5f97 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
index d7a70955a5c..93609cf3607 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
index 2e00425798a..b2b5e218e97 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
index 43de785db81..6a7adb205d8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp
index 3a0f5ad82ac..7ef2a0b85c1 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#include "CrashPoint.h"
short crash_point = 0;
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h b/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h
index a3729431834..1bd3a22875c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#ifndef CRASH_POINT_H
#define CRASH_POINT_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
index 8a83f147441..a59e89f3924 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
index 28755d413ad..116752a998e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
index 52449966d7f..a30c6d173d6 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "tao/ORB_Constants.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
index 6614e3bc958..1f2abcbc24b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef SERVER_REQUEST_INTERCEPTOR_H
#define SERVER_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp
index 04ac47995c7..74a9139b150 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp
index d04d4dcca49..c996ac5effe 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test.idl b/TAO/tests/Portable_Interceptors/Bug_3079/test.idl
index 8a89326b9c9..f30224b01f9 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
#include "tao/PI_Server/PI_Server_include.pidl"
module RedirectionTest
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc b/TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc
index d7bf9a06c79..772a9a401cf 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp
index ba1070b0cd5..49a8ac8dc7f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
index d39b06e5685..3d1aedf4e24 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
index e0c6aaeedea..b6ec4f91abd 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
index 325adf61729..8b106735713 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp
index 488ff0e88f1..6f204d5bf47 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp
index 2f461dd4d16..5ecdaf7cb13 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test.idl b/TAO/tests/Portable_Interceptors/Bug_3080/test.idl
index 3a0b56d8d83..223c8b3cf0f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
module RedirectionTest
{
interface test
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
index 15b949a6996..ee3dd1054dc 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h
index d7a70955a5c..93609cf3607 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
index df6b2fa9a8f..d8033778330 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
index 01dedacbeaa..3753fc5ccdc 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc b/TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc
index c900c79a4b9..c05e8d2e3dc 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp
index 31689d1c388..66dec2b7392 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp
index a849a628e61..5d22f6f4295 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test.idl b/TAO/tests/Portable_Interceptors/Bug_3582/test.idl
index 4eaa929ca10..5394038b172 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
#include "tao/PI_Server/PI_Server_include.pidl"
module RTTest
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
index c9fb4b2e48d..33dbd1eff79 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
index e116424db27..f296ce1d963 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Collocated): taoserver, pi, pi_server, interceptors {
exename = Collocated_Test
Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index ffaf78aae2c..78d71c38a09 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "test_i.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index 751f151c6bd..fb93e7ba264 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
index 32a4e3ba0e2..24d6b91041f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
index 2fe57c77168..22691fc3001 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
index cf8e7e6a23f..bc2ed90101e 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
@@ -1,4 +1,3 @@
-// $Id$
//
#ifndef SERVICE_CONTEXT_MANIPULATION_COLLOCATED_CLIENT_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
index 104386eca6c..e86871a0cae 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Collocated_ORBInitializer.h"
#include "interceptors.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
index 2c4cfe9de0e..7d7fd7ebafe 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVICE_CONTEXT_MANIPULATION_COLLOCATED_ORBINITIALIZER_H
#define SERVICE_CONTEXT_MANIPULATION_COLLOCATED_ORBINITIALIZER_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
index fcf3dbabb25..24a593dfaf1 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Collocated): taoserver, pi, pi_server, interceptors {
exename = collocated
Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
index 0f0b6b5cbb1..022376a0ccd 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVICE_CONTEXT_MANIPULATION_COLLOCATED_SERVER_TASK_H
#define SERVICE_CONTEXT_MANIPULATION_COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index 117d516b577..d37a68bc5aa 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
index ee11c0ae5f6..009b2779714 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVICE_CONTEXT_MANIPULATION_COLLOCATED_INTERCEPTORS_H
#define SERVICE_CONTEXT_MANIPULATION_COLLOCATED_INTERCEPTORS_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
index c10682c5c68..32bcca905a4 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
index 2cf11a1ff5f..2af09d07db9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Echo_Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
index c5beae64d34..095a32b08e0 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Echo_Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
index 8ea24af1d2a..19709a5e882 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags -= -Sa -St
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index 99e23771bf3..c0153f9e365 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 33fb5fbb16c..67647774e66 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index a6d7bc75836..6ca15eecd4b 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Echo_Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index 5d0e7659b91..4f12e95e2d5 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test.idl b/TAO/tests/Portable_Interceptors/Dynamic/test.idl
index a5be699d716..fb66ba70eb9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test.idl
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
// ===================================================================
/**
* @file test.idl
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
index 83e6eba0c99..540b0e2ebd3 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index fa8404d8845..d852f17e999 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index 17e904ccc91..daad2df1a45 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
index d4237b06ce8..982ef3787f4 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index 8409a93a337..d014deb7204 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index 5a82e33c4d5..ced0a970b53 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode.h"
#include "Server_Request_Interceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
index c9b39bd45c2..ccb2b1f35aa 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
index d8cba77f51c..961421fbe02 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index 04dfd2feb5b..cf8278aade8 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FOO_ClientRequestInterceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
index cfc99735237..5e88330aea7 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FOO_Client_ORBInitializer.h"
#include "FOO_ClientRequestInterceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index ebe19cd21e7..3edbd032331 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FOO_IORInterceptor.h"
#include "testS.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
index 450ce02d48f..2646a7d8ddf 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "FOO_IORInterceptor_ORBInitializer.h"
#include "FOO_IORInterceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
index cd6f166d8e8..b4ebc69a04b 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
index 9f5ca72f8d4..33e05aca03b 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index 0b2b3ba607a..e5228446bdd 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index 904570bb020..8444e9c7d44 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
index c7da0da2ba0..3dc32fa6122 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
index c248a50c45a..61c9937e968 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
index 500f2c85eaf..d8b124a8f65 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
index c7772228f6d..03a91660e71 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
index 2963c7aff62..3b7edf15ccd 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
index 3467c5b3390..3fc798684a3 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
index 507ac2ac517..efa8d158819 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ClientORBInitializer.h"
#include "ClientRequestInterceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
index 5f402b7bdd5..bdb22b875ce 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequestInterceptor.h"
#include "tao/CORBA_String.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
index 0761a907fcc..04cb706bf19 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequestInterceptor2.h"
#include "tao/CORBA_String.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
index b2eda2bb410..c1e76779505 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
+++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
index 65217fc799f..5e5cbda05e4 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerORBInitializer.h"
#include "ServerRequestInterceptor.h"
#include "ClientRequestInterceptor2.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index 396f088cc6e..74b6a11a33f 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequestInterceptor.h"
#include "tao/CORBA_String.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index d4891c53162..50e5b30603f 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index c7b4b946957..ee757c7daeb 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
index b2b72b018a4..7f6dd624104 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (PortableInterceptor::Current_ptr current,
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
index 4f3a65687d3..f33cdc51bb2 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IORInterceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
index 1c048efbcbc..bd8f1ee2fd1 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Policy.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
index 1d60d5a2e41..cfb5b62333b 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PolicyFactory.h"
#include "Policy.h"
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
index 450419eaac7..1205fa138fb 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "IORInterceptor.h"
#include "PolicyFactory.h"
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
index 307332238dc..8e74e7d00a3 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
index c6c5c380e07..545aac08305 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
index 5c4218c929f..59424ce20a6 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Collocated): taoserver, pi, pi_server, interceptors, avoids_corba_e_micro {
exename = PI_ProcMode_Collocated_Test
Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
index ffaf78aae2c..78d71c38a09 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "test_i.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
index adde10c09d5..f74bba712bd 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/PI/ClientRequestInfoC.h"
#include "tao/PI_Server/ServerRequestInfoC.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
index 4fe8eb0d837..f46bcf08ccb 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
index c6c56772cfb..c7e728d43c4 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
#include "client_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
index 22c2a76d8d4..bb87c987e1a 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_corba_e_micro {
idlflags -= -St
IDL_Files {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
index b658317741e..47fc26ac6d6 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "test_i.h"
#include "server_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
index a094b78f209..226dee9377a 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
index d50d028ec06..955feb9d110 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
index 86c82f814ed..c16b0f9373c 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc
index 87022b449ba..c6b56a9f3f7 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, pi, interceptors {
Source_Files {
Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
index 247c131a64f..72bfcfa6065 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
index 15b949a6996..ee3dd1054dc 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
index d7a70955a5c..93609cf3607 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
index 11dd4f09a45..8d7ff33ea6b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
index 01dedacbeaa..3753fc5ccdc 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp
index 3a0f5ad82ac..7ef2a0b85c1 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#include "CrashPoint.h"
short crash_point = 0;
diff --git a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h
index a3729431834..1bd3a22875c 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#ifndef CRASH_POINT_H
#define CRASH_POINT_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc b/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc
index 2609cbc8946..4574377850b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc
+++ b/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
index 8a83f147441..a59e89f3924 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
index e9b99cf3eda..6ca5ef7f4b1 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
index 52449966d7f..a30c6d173d6 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "tao/ORB_Constants.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
index 6614e3bc958..1f2abcbc24b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef SERVER_REQUEST_INTERCEPTOR_H
#define SERVER_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
index be64cb15b69..19fb19e1a34 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
index 48dd464b76d..e2886be4346 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test.idl b/TAO/tests/Portable_Interceptors/Redirection/test.idl
index 8a89326b9c9..f30224b01f9 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test.idl
+++ b/TAO/tests/Portable_Interceptors/Redirection/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
#include "tao/PI_Server/PI_Server_include.pidl"
module RedirectionTest
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc b/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc
index 30d2e2053c9..7834dea421a 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, pi, interceptors, avoids_corba_e_micro {
Source_Files {
test_i.cpp
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
index 0998a5aac00..f2c9fe409a2 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "test_i.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
index 55f9b3710d8..1694c6615a3 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
index 34a4258e7b0..6a8d2fbfb2e 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (void)
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
index 78e66358303..d01f7c76f92 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "tao/Exception.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index 19da555bfb0..ca47ad3f403 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
index f9487f30468..9a8b49dcb4e 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags -= -St
IDL_Files {
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
index f91aeea4748..0a4590bf850 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Request_Interceptor.h"
Request_Interceptor::Request_Interceptor (const char *name)
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
index 18520006375..7fd43c132b1 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/Exception.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index d47d16aeb08..435eb4e6a3d 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "testC.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
index 2a2ac4e7b73..27bbaa68fc7 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
index 023ad932f4a..b4fb5762a73 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
index 519ffd3319c..a99ca98158b 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
index 395e526a9f0..14de839b7b3 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index 13d6cfb232c..1fe2ff983db 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
index 8dbf21a741a..b33f1b1692b 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index 5891af15597..c028ce679b1 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
index c6d15ecfdb6..a7660ec5c1a 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
index 75d61f3827e..96622f81dc5 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc b/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc
index c7289e6e4f8..573d56acf84 100644
--- a/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc
+++ b/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*driver): orbsvcsexe, pi_server, interceptors {
exename = driver
Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Slot/driver.cpp b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
index aa24db1e945..e1519d1b7ee 100644
--- a/TAO/tests/Portable_Interceptors/Slot/driver.cpp
+++ b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@kolpackov.net>
-// $Id$
-
#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index 5805f452dcd..f3b5abcd567 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): taoserver, tao_qtresource, ace_qt4 {
MOC_Files {
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 55261dcb1a1..6dc109b89c1 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 63101f832b2..18c3b4a3e72 100644
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/QtTests/test.idl b/TAO/tests/QtTests/test.idl
index d65cc24720a..e05b5b90acd 100644
--- a/TAO/tests/QtTests/test.idl
+++ b/TAO/tests/QtTests/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface LCD_Display
{
void send_val (in long val);
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 745b65dc513..3b019c1e6da 100644
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc b/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc
index 8112970c356..893da7c5995 100644
--- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe {
exename = Queued_Message_Test
}
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc
index 85905a99a88..72052a8815c 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver {
}
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
index 9371c089787..54cc414e83e 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// *******************************************************************
//
// This test links in RTCORBA and RTPortableServer and creates two
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl
index 7ad0d88103b..14392a6edc5 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Arch_Idl {
interface Monitorable {
};
diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
index 4c00f78eff3..957582902c5 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
+++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index fb15c1bfa9d..6942d174cd2 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index 0be2aa05dd1..d59cac80edf 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc b/TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc
index b7e6b09d0da..bb4e716d2d3 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rt_server {
Source_Files {
server.cpp
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
index b1da2b8dbde..671d565d4b8 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Task.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
index e455ac9af81..3e5e24aa0d4 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
index c6d20b0dc8a..253f91cd2f6 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp
index 0d433be115e..620b1327e14 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc b/TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc
index 07d678f931a..20e5098865f 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
index 0901e47d1c7..7e0342f40b4 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
index a2562a1baf5..e981333a51e 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
index 93cf9c3939a..f619d77831a 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
index 42e9f95661a..949b3859ab4 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
+++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 3e4bbdc8a2d..f6c5804dff7 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Task.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index e455ac9af81..3e5e24aa0d4 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index c969befaecb..2d7e68a5d92 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
index 2a58e30e83f..1b86934eb40 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index 7894a7a4046..f46560e5472 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 360f8d9409b..1046f789a89 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index aaf702561a0..d1772091436 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Array_Base.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc
index 76b154f13a5..42e0ac08d5c 100644
--- a/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc
+++ b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rt_server {
exename = Collocation
}
diff --git a/TAO/tests/RTCORBA/Collocation/test.idl b/TAO/tests/RTCORBA/Collocation/test.idl
index fb23b0eeb08..29dd8932df5 100644
--- a/TAO/tests/RTCORBA/Collocation/test.idl
+++ b/TAO/tests/RTCORBA/Collocation/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void start ();
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index 1db92e716ab..8288d96bef0 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/ORB.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc b/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc
index cad5007911c..d64d71e031d 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rt_server {
exename = Destroy_Thread_Pool
}
diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
index 155d0516de5..ff80804b53d 100644
--- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Custom_Network_Priority_Mapping.h"
#include "tao/debug.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
index b68fb6cda04..5553b69abee 100644
--- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp
index 8ff12669c25..396bf3cbe4f 100644
--- a/TAO/tests/RTCORBA/Diffserv/client.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index 1d783e35537..48f9dd6b394 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
index c08dbc630cd..27ccba729f1 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
index e1a03f0299d..c18442452a1 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index 43f0d5d83f7..7bdf6bff90d 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
index 93cf9c3939a..f619d77831a 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
index 9f222f50a1e..4bfbce54b6a 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
+++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
Source_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
index 8c958b81d36..50c3d9ed8a4 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index b4b2e135b84..a9026c64252 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index dad4a066bc3..caa27bc9e3b 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index c95cb27668c..8267d9a2e70 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "testC.h"
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 3d635b57f48..de5e91f02cb 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Linear_Priority/test.idl b/TAO/tests/RTCORBA/Linear_Priority/test.idl
index 93c7ac56f50..df676082f4f 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/test.idl
+++ b/TAO/tests/RTCORBA/Linear_Priority/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
index 7fe1672ae73..30905838e99 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
Source_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index e2cb0bc9020..48a6b0f905a 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 22c226a5d2d..dd493dd7b41 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
index 353b8f29a50..faee740ce21 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc b/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc
index 54605e4c57a..7c1dea45626 100644
--- a/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc
+++ b/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (ORB_init_RT) : rt_client {
exename = ORB_init
}
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index dad4a066bc3..caa27bc9e3b 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index 540c1e002a2..016bb479251 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index fbfb1d0974d..4f81db55c44 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testS.h"
#include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/test.idl b/TAO/tests/RTCORBA/Persistent_IOR/test.idl
index 5c4d926d6cf..36e44236901 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/test.idl
+++ b/TAO/tests/RTCORBA/Persistent_IOR/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc
index b94ae30ec74..45c246e8884 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.mpc
+++ b/TAO/tests/RTCORBA/Policies/Policies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTCORBA Policies Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Policies
}
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index 5040de044de..499ea306b2d 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index f0f3dee1ecd..a078e62bc71 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "testC.h"
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index fb3743ca079..c6fde5e5d02 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testS.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/test.idl b/TAO/tests/RTCORBA/Policy_Combinations/test.idl
index 6d6ba1c9f84..e1865eb9b06 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/test.idl
+++ b/TAO/tests/RTCORBA/Policy_Combinations/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
short method ();
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
index c08dbc630cd..27ccba729f1 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index 968e12e75bd..bb1ff6f6332 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index 8c424029757..75130ee1850 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
index 636b668c44f..cadb2149ffa 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
#include "tao/RTCORBA/Thread_Pool.h"
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index 6b2f5be9e36..1851b7b0736 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp
index 2c2cd3ce609..e36c4ab63df 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/Policy_ManagerC.h"
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 0bf981d4dd8..5f1894cc998 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
index 45c49c24cf6..3cbbe054250 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 51ad9e23a26..4a154cd0e18 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
#include "tao/RTCORBA/Thread_Pool.h"
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl
index 93c7ac56f50..df676082f4f 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc b/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc
index 2d55bc96c4f..6d9cd9349e6 100644
--- a/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc
+++ b/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rt_server {
}
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index 623819c300c..f1fb70b5967 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
index 4c00f78eff3..957582902c5 100644
--- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
+++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index dfa21801840..94011da03fe 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index c55dec52d54..b35389e6690 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index 2d81c7c0606..7bee41818cc 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index eb45ac1526b..fe72f82d57e 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index a0cf28825c7..620c748d934 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "tao/RTCORBA/RT_Policy_i.h"
#include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index c08dbc630cd..27ccba729f1 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index a4eac855841..6b3ab9377b1 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index d5ff7b033f8..93f3a714a7a 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index f5f7fd2a337..b0ccaf4b360 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/check_supported_priorities.cpp b/TAO/tests/RTCORBA/check_supported_priorities.cpp
index b10d8cbc291..11ff3473e08 100644
--- a/TAO/tests/RTCORBA/check_supported_priorities.cpp
+++ b/TAO/tests/RTCORBA/check_supported_priorities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Sched_Params.h"
#include "tao/ORB_Core.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp
index 55af5bcec45..beb292b7cad 100644
--- a/TAO/tests/RTCORBA/common_args.cpp
+++ b/TAO/tests/RTCORBA/common_args.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Read_Buffer.h"
#include "ace/Array_Base.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/RTScheduling/Current/Current.mpc b/TAO/tests/RTScheduling/Current/Current.mpc
index 6e425b993a1..876bc0b4f06 100644
--- a/TAO/tests/RTScheduling/Current/Current.mpc
+++ b/TAO/tests/RTScheduling/Current/Current.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Current) : rtscheduling_client {
Source_Files {
../Scheduler.cpp
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
index 03148fc9b2a..1aee52a1f54 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Thread_Task.h"
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTScheduling/Current/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp
index b20a0f805ec..ab112932bf8 100644
--- a/TAO/tests/RTScheduling/Current/test.cpp
+++ b/TAO/tests/RTScheduling/Current/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Thread_Task.h"
#include "../Scheduler.h"
#include "tao/RTScheduling/RTScheduler_Manager.h"
diff --git a/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc b/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc
index 9349bca041e..6f62778535b 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc
+++ b/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DT_Spawn) : rtscheduling_client {
Source_Files {
../Scheduler.cpp
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
index 8b23bb0292a..b1b70d96ce3 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc
index a87b61b1875..fd7b29a796e 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Thread_Cancel) : rtscheduling_client {
Source_Files {
../Scheduler.cpp
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index e6328945ddf..8791b9e4fad 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Thread_Task.h"
#include "ace/Atomic_Op.h"
#include "ace/OS_NS_errno.h"
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index d58cea54ce6..8877b1c7f3b 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Thread_Task.h"
#include "ace/OS_NS_unistd.h"
#include "../Scheduler.h"
diff --git a/TAO/tests/RTScheduling/VoidData/VoidData.mpc b/TAO/tests/RTScheduling/VoidData/VoidData.mpc
index 8e02b6b7770..100fa8c433d 100644
--- a/TAO/tests/RTScheduling/VoidData/VoidData.mpc
+++ b/TAO/tests/RTScheduling/VoidData/VoidData.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(VoidData) : rtscheduling_client {
exename = VoidData
Source_Files {
diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
index 38b1f4ff31d..64ccd76f2c0 100644
--- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
+++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index 06564a478f7..90190845885 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp
index a6840a8110d..f2a93b65dd1 100644
--- a/TAO/tests/Reliable_Oneways/server.cpp
+++ b/TAO/tests/Reliable_Oneways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Oneway_Receiver.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc b/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc
index 2750d6ef2a3..320b84b882c 100644
--- a/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc
+++ b/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(StringSeq) : taoexe {
exename = StringSeq
Source_Files {
diff --git a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
index ade6fc436ed..f2c600244e2 100644
--- a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
+++ b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*UB_Simple_Types) : seq_tests, taoexe {
Source_Files {
Unbounded_Simple_Types.cpp
diff --git a/TAO/tests/Sequence_Unit_Tests/test_macros.h b/TAO/tests/Sequence_Unit_Tests/test_macros.h
index 2db80f1410f..a51c08bb429 100644
--- a/TAO/tests/Sequence_Unit_Tests/test_macros.h
+++ b/TAO/tests/Sequence_Unit_Tests/test_macros.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#define FAIL_RETURN_IF(CONDITION) \
diff --git a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
index cf42218d334..d833b44bbc7 100644
--- a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
+++ b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
Source_Files {
server.cpp
diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp
index 0a9f412be5c..47308260ac2 100644
--- a/TAO/tests/Servant_To_Reference_Test/server.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
index 1b7d5497c06..7a90555bb9d 100644
--- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Server_Connection_Purging/Test.idl b/TAO/tests/Server_Connection_Purging/Test.idl
index add2175d346..8a4875610b6 100644
--- a/TAO/tests/Server_Connection_Purging/Test.idl
+++ b/TAO/tests/Server_Connection_Purging/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
/*
diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp
index ee883a364ac..c0e49323d01 100644
--- a/TAO/tests/Server_Connection_Purging/client.cpp
+++ b/TAO/tests/Server_Connection_Purging/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/Get_Opt.h"
#include "ace/Log_Msg.h"
#include "ace/SOCK_Connector.h"
diff --git a/TAO/tests/Server_Connection_Purging/client2.cpp b/TAO/tests/Server_Connection_Purging/client2.cpp
index 406ab3f4fc9..0ff2c2fd269 100644
--- a/TAO/tests/Server_Connection_Purging/client2.cpp
+++ b/TAO/tests/Server_Connection_Purging/client2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "TestC.h"
diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp
index 263256e1d5b..1a3d909fe58 100644
--- a/TAO/tests/Server_Connection_Purging/server.cpp
+++ b/TAO/tests/Server_Connection_Purging/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 464133475b6..203c02e3b4d 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp
index f3a5cc20a6f..b399bf730af 100644
--- a/TAO/tests/Server_Leaks/client.cpp
+++ b/TAO/tests/Server_Leaks/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp
index b2f1c39fbbf..94aa99fb5ab 100644
--- a/TAO/tests/Server_Leaks/server.cpp
+++ b/TAO/tests/Server_Leaks/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Ping_Service.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc b/TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc
index 4790e24fc4a..5f065f095f7 100644
--- a/TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc
+++ b/TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Hello.cpp
diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp
index 8bc92fedd9d..3b4714ef588 100644
--- a/TAO/tests/Server_Port_Zero/server.cpp
+++ b/TAO/tests/Server_Port_Zero/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index f685a64e73e..4fe4455be92 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index a7da7ced2c7..a2c13bc6ef7 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
#include "testC.h"
diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index 455d25e9e97..9c2ecff4477 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/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/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 5ff43da0a20..fd901f80264 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Skeleton_Inheritance/client.cpp b/TAO/tests/Skeleton_Inheritance/client.cpp
index d09c7da24f6..88470f91f65 100644
--- a/TAO/tests/Skeleton_Inheritance/client.cpp
+++ b/TAO/tests/Skeleton_Inheritance/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "idl_3C.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
index d4a5267eea0..dff1368f8de 100644
--- a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "interface_3_i.h"
interface_3_i::interface_3_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Skeleton_Inheritance/server.cpp b/TAO/tests/Skeleton_Inheritance/server.cpp
index d9b0660b7a4..93982a91f8f 100644
--- a/TAO/tests/Skeleton_Inheritance/server.cpp
+++ b/TAO/tests/Skeleton_Inheritance/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interface_3_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
index 50f5129edc9..19784063af5 100644
--- a/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
+++ b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(idl_one_gen): taoidldefaults {
custom_only = 1
diff --git a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
index 920c81e7db3..49e5e982882 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
+++ b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
IDL_Files {
test.idl
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index b6accb28b45..9af4c84e1ce 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
Smart_Test_Factory::Smart_Test_Factory (void)
{
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
index 2ba06e0df97..af205ea5619 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
{
diff --git a/TAO/tests/Smart_Proxies/Benchmark/test.idl b/TAO/tests/Smart_Proxies/Benchmark/test.idl
index 5bcb1fa79dd..5c954463b51 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/test.idl
+++ b/TAO/tests/Smart_Proxies/Benchmark/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index e7ddda5bbf0..0cf604ac6c9 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================================
//
// =FILENAME
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
index 96366bd6f15..f7b8a7f346e 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================================
//
// =FILENAME
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond.idl b/TAO/tests/Smart_Proxies/Collocation/Diamond.idl
index 0e60b25c52c..8b0072e4a90 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond.idl
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Diamond
{
interface Top
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
index 0200835d0a8..76500e00431 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Diamond_i.h"
Top_i::Top_i ()
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
index 9896ece35c6..354ae97d32b 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (TAO_DIAMOND_I_H)
#define TAO_DIAMOND_I_H
diff --git a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
index 765052118d0..181d2678d73 100644
--- a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
+++ b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
idlflags += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index fc629e39647..bcda296ad7f 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
index 539b46165a7..1dd3fc82864 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
@@ -1,4 +1,3 @@
-// $Id$
//
#ifndef SMART_PROXY_IMPL_H
#define SMART_PROXY_IMPL_H
diff --git a/TAO/tests/Smart_Proxies/Collocation/diamond_export.h b/TAO/tests/Smart_Proxies/Collocation/diamond_export.h
index fff24d8a0e5..78ba933286c 100644
--- a/TAO/tests/Smart_Proxies/Collocation/diamond_export.h
+++ b/TAO/tests/Smart_Proxies/Collocation/diamond_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/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp
index d5eceaf8341..11c916abe48 100644
--- a/TAO/tests/Smart_Proxies/Collocation/main.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Coll_Tester.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/Smart_Proxies/Collocation/stub_export.h b/TAO/tests/Smart_Proxies/Collocation/stub_export.h
index 2242f4a184e..ca0093d192c 100644
--- a/TAO/tests/Smart_Proxies/Collocation/stub_export.h
+++ b/TAO/tests/Smart_Proxies/Collocation/stub_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/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
index d9f66a381ff..b60757cf94f 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
+++ b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
IDL_Files {
test.idl
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
index 245458f38a4..689bdf84d5b 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Smart_Proxy_Impl.h"
Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
index 289adfea298..ab6e3d51dcd 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
index 21f7cef8bef..c982fedccc3 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
#include "ace/Service_Object.h"
#include "ace/svc_export.h"
diff --git a/TAO/tests/Smart_Proxies/On_Demand/test.idl b/TAO/tests/Smart_Proxies/On_Demand/test.idl
index 0f8886ac634..350c9ce76b9 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/test.idl
+++ b/TAO/tests/Smart_Proxies/On_Demand/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
index 920c81e7db3..49e5e982882 100644
--- a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
+++ b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
IDL_Files {
test.idl
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
index 3edc23f2103..4eb3378faa4 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
Smart_Test_Factory::Smart_Test_Factory (int one_shot_factory)
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
index ba291b7d2b4..2f64d451b43 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
diff --git a/TAO/tests/Smart_Proxies/Policy/test.idl b/TAO/tests/Smart_Proxies/Policy/test.idl
index 6d98cb1223c..91045954780 100644
--- a/TAO/tests/Smart_Proxies/Policy/test.idl
+++ b/TAO/tests/Smart_Proxies/Policy/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
index 2529b667c8d..370cf25e13e 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
+++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
IDL_Files {
test.idl
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index 36e3158ea0f..479385bf9da 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
ACE_CString Smart_Test_Proxy::fake_ior_ ("This_is_my_fake_ior");
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index 4000212331e..6059b92b107 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/SString.h"
diff --git a/TAO/tests/Smart_Proxies/test.idl b/TAO/tests/Smart_Proxies/test.idl
index 6d98cb1223c..91045954780 100644
--- a/TAO/tests/Smart_Proxies/test.idl
+++ b/TAO/tests/Smart_Proxies/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index e9da8b404fa..65b758f4edf 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp
index 5f7e03858c6..8b5fd8d0389 100644
--- a/TAO/tests/Stack_Recursion/client.cpp
+++ b/TAO/tests/Stack_Recursion/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp
index 93f40f4df09..eb309a0ca67 100644
--- a/TAO/tests/Stack_Recursion/server.cpp
+++ b/TAO/tests/Stack_Recursion/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Storable/Savable.cpp b/TAO/tests/Storable/Savable.cpp
index d3b3221a76d..45fd111d431 100644
--- a/TAO/tests/Storable/Savable.cpp
+++ b/TAO/tests/Storable/Savable.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Savable.h"
#include "tao/Storable_Base.h"
#include "tao/Storable_Factory.h"
diff --git a/TAO/tests/Storable/Savable.h b/TAO/tests/Storable/Savable.h
index 82aad1f6c7d..39f3c573bdc 100644
--- a/TAO/tests/Storable/Savable.h
+++ b/TAO/tests/Storable/Savable.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Storable_Base.h"
#include "tao/Storable_Factory.h"
diff --git a/TAO/tests/Storable/Storable.mpc b/TAO/tests/Storable/Storable.mpc
index 8dc0de72161..a063a138ca7 100644
--- a/TAO/tests/Storable/Storable.mpc
+++ b/TAO/tests/Storable/Storable.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoclient {
exename = test
}
diff --git a/TAO/tests/Storable/test.cpp b/TAO/tests/Storable/test.cpp
index bb57d1adde0..0748cb9b409 100644
--- a/TAO/tests/Storable/test.cpp
+++ b/TAO/tests/Storable/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Assumed to be one of two processes that
// writes/reads from persistent store.
// Each process writes one group of attributes
diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc
index df4ff8ecdf3..529d9cbc4da 100644
--- a/TAO/tests/Strategies/Strategies.mpc
+++ b/TAO/tests/Strategies/Strategies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
simple_test.idl
diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp
index 7d1dd8c33bf..1ef663928e2 100644
--- a/TAO/tests/Strategies/client.cpp
+++ b/TAO/tests/Strategies/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "simple_testC.h"
diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp
index 75cf6830738..bee0491382e 100644
--- a/TAO/tests/Strategies/server.cpp
+++ b/TAO/tests/Strategies/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "simple_test_i.h"
diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp
index bbb6b1c07fb..f4292f5454b 100644
--- a/TAO/tests/Strategies/simple_test_i.cpp
+++ b/TAO/tests/Strategies/simple_test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_test_i.h"
#include "tao/debug.h"
diff --git a/TAO/tests/Strategies/simple_test_i.inl b/TAO/tests/Strategies/simple_test_i.inl
index ed9a04eb108..60169bc2be1 100644
--- a/TAO/tests/Strategies/simple_test_i.inl
+++ b/TAO/tests/Strategies/simple_test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Time_Policy/Time_Policy.mpc b/TAO/tests/Time_Policy/Time_Policy.mpc
index d6bb48b97f2..fce09ec4ce7 100644
--- a/TAO/tests/Time_Policy/Time_Policy.mpc
+++ b/TAO/tests/Time_Policy/Time_Policy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Exe): taoserver {
exename = test
Source_Files {
diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc
index 2124c1b7605..f0d7d6fcfc8 100644
--- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc
+++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Lib): taolib {
sharedname = CustomTimePolicy
dynamicflags = TPTEST_BUILD_DLL
diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
index 9eae626747a..803f6e98555 100644
--- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
+++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Custom_Time_Policy_Strategy.h"
#include "ace/Timer_Heap_T.h"
diff --git a/TAO/tests/Time_Policy_Custom/TPTest_Export.h b/TAO/tests/Time_Policy_Custom/TPTest_Export.h
index 4dcfe63f844..160f8730653 100644
--- a/TAO/tests/Time_Policy_Custom/TPTest_Export.h
+++ b/TAO/tests/Time_Policy_Custom/TPTest_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TPTEST
// ------------------------------
diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
index 5178bae4ddf..5ec2b0e098e 100644
--- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
+++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index 612df69b35f..ab89abebe3a 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_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/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index 62fce048a11..59e6db0265c 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc
index 0c95ddf25e6..99ff723e7e1 100644
--- a/TAO/tests/Timeout/Timeout.mpc
+++ b/TAO/tests/Timeout/Timeout.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index a5b94214917..6faa56e1516 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
index 1e66973cff6..b592a4416c9 100644
--- a/TAO/tests/Timeout/server.cpp
+++ b/TAO/tests/Timeout/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index 4dec77755fe..829ad2298e3 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
index b3f28bd21f5..8674b995e7a 100644
--- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/TransportCurrent/TCC.h"
#include "Current_Test_Impl.h"
diff --git a/TAO/tests/TransportCurrent/Framework/Framework.mpc b/TAO/tests/TransportCurrent/Framework/Framework.mpc
index 93b74f884a0..e8b10317176 100644
--- a/TAO/tests/TransportCurrent/Framework/Framework.mpc
+++ b/TAO/tests/TransportCurrent/Framework/Framework.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, tc, pi_server {
after += Current_Test_Lib_Client Current_Test_Lib_Server
libs += Current_Test_Lib_Client Current_Test_Lib_Server
diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
index c6d7ad97d0f..133d33b4aa2 100644
--- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
/// Prototype
diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp
index a17fec6c9d2..2e08cbe97f2 100644
--- a/TAO/tests/TransportCurrent/Framework/Tester.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/TransportCurrent/Transport_Current.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp
index 48b63aaba8e..87cd0ed6803 100644
--- a/TAO/tests/TransportCurrent/Framework/client.cpp
+++ b/TAO/tests/TransportCurrent/Framework/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
index f4f14a14a7a..bf76a489a6d 100644
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ b/TAO/tests/TransportCurrent/Framework/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Task.h"
diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp
index 4a121500240..5c9f92d54b9 100644
--- a/TAO/tests/TransportCurrent/Framework/simple.cpp
+++ b/TAO/tests/TransportCurrent/Framework/simple.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index 82f2f56d9ea..9d3e9ab646e 100644
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/TransportCurrent/TC_IIOPC.h"
#include "tao/TransportCurrent/TCC.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
index 4449c98e225..e96ab5a8bc5 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, tc_iiop, pi_server {
after += Current_Test_Lib_Client Current_Test_Lib_Server
libs += Current_Test_Lib_Client Current_Test_Lib_Server
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
index 3005a704841..060175b7518 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "IIOP_Server_Request_Interceptor.h"
/// Prototype
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index b0918b36806..4e1a630dd06 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "tao/ORB_Constants.h"
#include "tao/TransportCurrent/TC_IIOPC.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
index c2ad72bc867..fc92ac1c7e0 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/TransportCurrent/IIOP_Transport_Current.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp
index 5faa5e6ca69..e627b4e8bd5 100644
--- a/TAO/tests/TransportCurrent/IIOP/client.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp
index ec3f6611858..122086f513d 100644
--- a/TAO/tests/TransportCurrent/IIOP/server.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Task.h"
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
index d137ab4288c..2eb5c6e8d19 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "Client_Request_Interceptor.h"
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
index db233e7864e..5374a39a00f 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "Current_TestC.h"
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Export.h b/TAO/tests/TransportCurrent/lib/Current_Test_Export.h
index cfdf16fe60e..cfe9d2786a6 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Export.h
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -d Current_Test
// ------------------------------
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc b/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
index e2806575743..4ea23ea285b 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
dynamicflags += CURRENT_TEST_BUILD_DLL
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
index c8d3752852d..f15ce0662e4 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "Server_Request_Interceptor.h"
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
index 13a739ca479..17064f19bbe 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "Server_Request_Interceptor.h"
diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
index cedde496a0d..77e6554d86c 100644
--- a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
+++ b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
#include "ace/SString.h"
diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
index 2d152550002..27c5a224c32 100644
--- a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
+++ b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
#include "ace/SString.h"
diff --git a/TAO/tests/Transport_Cache_Manager/TCM.mpc b/TAO/tests/Transport_Cache_Manager/TCM.mpc
index b8325dce8cb..c26c4850277 100644
--- a/TAO/tests/Transport_Cache_Manager/TCM.mpc
+++ b/TAO/tests/Transport_Cache_Manager/TCM.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Bug_3549_Regression): taoclient {
exename = Bug_3549_Regression
Source_Files {
diff --git a/TAO/tests/Transport_Cache_Manager/mock_ps.h b/TAO/tests/Transport_Cache_Manager/mock_ps.h
index 1ac46cc79ab..a5cd90a8d65 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_ps.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_ps.h
@@ -1,5 +1,3 @@
-// $Id$
-
class mock_ps
{
public:
diff --git a/TAO/tests/Transport_Cache_Manager/mock_tdi.h b/TAO/tests/Transport_Cache_Manager/mock_tdi.h
index 341b9b31626..91e4b79d78e 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_tdi.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_tdi.h
@@ -1,5 +1,3 @@
-// $Id$
-
class mock_tdi
{
public:
diff --git a/TAO/tests/Transport_Cache_Manager/mock_transport.h b/TAO/tests/Transport_Cache_Manager/mock_transport.h
index 58460704e1d..6ad84edf323 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_transport.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_transport.h
@@ -1,5 +1,3 @@
-// $Id$
-
class mock_transport
{
public:
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index a4cc32c1562..7fe7a2364e5 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Second_i.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index 6739a263ca4..06635ee07bc 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Two_Objects.idl
diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp
index 72213d9df43..34f7b8cb30f 100644
--- a/TAO/tests/Two_Objects/client.cpp
+++ b/TAO/tests/Two_Objects/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Two_ObjectsC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index c1713a14618..165b1cb0d2a 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "worker.h"
#include "Object_Factory_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp
index a405d915563..716034e780d 100644
--- a/TAO/tests/Typedef_String_Array/client.cpp
+++ b/TAO/tests/Typedef_String_Array/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp
index 8e9538a4c4f..15de0999914 100644
--- a/TAO/tests/Typedef_String_Array/server.cpp
+++ b/TAO/tests/Typedef_String_Array/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "testImpl.h"
diff --git a/TAO/tests/Typedef_String_Array/test.idl b/TAO/tests/Typedef_String_Array/test.idl
index 776cebb3be0..c79e4fd291e 100644
--- a/TAO/tests/Typedef_String_Array/test.idl
+++ b/TAO/tests/Typedef_String_Array/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Either of these sets will work, but only the last one
// demonstrates the original tao_idl problem.
diff --git a/TAO/tests/Typedef_String_Array/testImpl.cpp b/TAO/tests/Typedef_String_Array/testImpl.cpp
index 5256013a259..17975281fa9 100644
--- a/TAO/tests/Typedef_String_Array/testImpl.cpp
+++ b/TAO/tests/Typedef_String_Array/testImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testImpl.h"
static const CORBA::ULong maxd = 15;
diff --git a/TAO/tests/Typedef_String_Array/testImpl.h b/TAO/tests/Typedef_String_Array/testImpl.h
index acbd61ef1cc..41102029d1e 100644
--- a/TAO/tests/Typedef_String_Array/testImpl.h
+++ b/TAO/tests/Typedef_String_Array/testImpl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class TestImpl: public POA_SimpleStrings
diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
index fbd82f97a5f..c658edff84a 100644
--- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
+++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
index f07c72a056d..05b94b8c451 100644
--- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
+++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/UNKNOWN_Exception/client.cpp b/TAO/tests/UNKNOWN_Exception/client.cpp
index 9895a7b8a02..f754670339e 100644
--- a/TAO/tests/UNKNOWN_Exception/client.cpp
+++ b/TAO/tests/UNKNOWN_Exception/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index df224db010e..6e6a3f0066a 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testS.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp
index 6d3de01204b..b539334d7f8 100644
--- a/TAO/tests/Xt_Stopwatch/Control.cpp
+++ b/TAO/tests/Xt_Stopwatch/Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Control.h"
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
index aa6ff78ed24..fb6095fd925 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Stopwatch_display.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
index 5d3847ad5f6..b82f5515288 100644
--- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
+++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, tao_xtresource, ace_motif {
Source_Files {
test_i.cpp
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 61b62cb138a..7dd4d0ad804 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index f42ca6922a7..4158a3b7318 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Xt_Stopwatch/test.idl b/TAO/tests/Xt_Stopwatch/test.idl
index a3fffd63f86..108a1974d9f 100644
--- a/TAO/tests/Xt_Stopwatch/test.idl
+++ b/TAO/tests/Xt_Stopwatch/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Stopwatch
{
void start ();
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index aa38cd96551..4f617855354 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp b/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp
index b5a32600deb..1be147c9308 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestCompressor.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
index 6f85faea948..471d36cde19 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestCompressor_Factory.h"
#include "TestCompressor.h"
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_export.h b/TAO/tests/ZIOP/TestCompressor/TestCompressor_export.h
index 47490000514..179247f0e4c 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_export.h
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_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/tests/ZIOP/ZIOP.mpc b/TAO/tests/ZIOP/ZIOP.mpc
index 3c5af503912..b9cee219f6d 100644
--- a/TAO/tests/ZIOP/ZIOP.mpc
+++ b/TAO/tests/ZIOP/ZIOP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TestCompressor) : taolib, compression, taoidldefaults {
sharedname = TAO_TestCompressor
dynamicflags += TAO_TESTCOMPRESSOR_BUILD_DLL
diff --git a/TAO/tests/ZIOP/client.cpp b/TAO/tests/ZIOP/client.cpp
index b2fdcef6e1a..38fcf9db330 100644
--- a/TAO/tests/ZIOP/client.cpp
+++ b/TAO/tests/ZIOP/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/ZIOP/ZIOP.h"
diff --git a/TAO/tests/ZIOP/common.h b/TAO/tests/ZIOP/common.h
index f896f7650da..42a3b039cb2 100644
--- a/TAO/tests/ZIOP/common.h
+++ b/TAO/tests/ZIOP/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#define CLIENT_COMPRESSION_LEVEL 7
#define SERVER_COMPRESSION_LEVEL 5
#define LEAST_COMPRESSION_LEVEL ((CLIENT_COMPRESSION_LEVEL < SERVER_COMPRESSION_LEVEL) ?\
diff --git a/TAO/tests/ZIOP/server.cpp b/TAO/tests/ZIOP/server.cpp
index cdce279b1dc..996abbf3847 100644
--- a/TAO/tests/ZIOP/server.cpp
+++ b/TAO/tests/ZIOP/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/objref_comparison_test/foo.idl b/TAO/tests/objref_comparison_test/foo.idl
index 6c5acbe1288..7f4177c6e84 100644
--- a/TAO/tests/objref_comparison_test/foo.idl
+++ b/TAO/tests/objref_comparison_test/foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/tests/objref_comparison_test/main.cpp b/TAO/tests/objref_comparison_test/main.cpp
index 54b1d15a379..482e8516000 100644
--- a/TAO/tests/objref_comparison_test/main.cpp
+++ b/TAO/tests/objref_comparison_test/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Functor.h"
#include "ace/Task.h"
#include "fooS.h"
diff --git a/TAO/tests/objref_comparison_test/objref_comparison_test.mpc b/TAO/tests/objref_comparison_test/objref_comparison_test.mpc
index ef0f0475c56..ac4087ec1a8 100644
--- a/TAO/tests/objref_comparison_test/objref_comparison_test.mpc
+++ b/TAO/tests/objref_comparison_test/objref_comparison_test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoserver {
Source_Files {
main.cpp