summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp12
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp20
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp2
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp2
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Datastore.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Enum_Type_Visitor.cpp8
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Exception_Scope.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Interface_Scope.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Module_Scope.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Module_Visitor.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Node.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_OctetSeq.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Op_Dcl_Scope.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Root_Scope.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Scope.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Simple_Scope.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Stream.cpp8
-rw-r--r--TAO/orbsvcs/PSS/PSDL_String.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Struct_Scope.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Typecode_Defn.cpp2
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Visitor_Factory.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Clerk_i.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Server_i.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Server.cpp2
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/Filter.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/PSS/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Entries.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_tests.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Schedule.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Events.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Filter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Simple.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Updates.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Name.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp2
-rw-r--r--TAO/orbsvcs/tests/Property/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Property/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/Property/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Time/Client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Time/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Importer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/import_test.cpp2
270 files changed, 293 insertions, 293 deletions
diff --git a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
index a2916004551..0e653bc1ed1 100644
--- a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
Sun, Sun Microsystems and the Sun logo are trademarks or registered
trademarks of Sun Microsystems, Inc.
-SunSoft, Inc.
-2550 Garcia Avenue
+SunSoft, Inc.
+2550 Garcia Avenue
Mountain View, California 94043
NOTE:
@@ -71,7 +71,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "drv_private_ifr.h"
#include "be_extern.h"
-ACE_RCSID(IFR_Service, drv_init_ifr, "$Id$")
+
const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024;
@@ -107,8 +107,8 @@ DRV_init (void)
#endif /* TAO_IDL_PREPROCESSOR */
char local_escapes[LOCAL_ESCAPES_BUFFER_SIZE];
- ACE_OS::memset (&local_escapes,
- 0,
+ ACE_OS::memset (&local_escapes,
+ 0,
LOCAL_ESCAPES_BUFFER_SIZE);
idl_global->set_local_escapes (local_escapes);
@@ -125,6 +125,6 @@ DRV_init (void)
// Initialize driver private data.
DRV_nfiles = 0;
- DRV_file_index = 0;
+ DRV_file_index = 0;
}
diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
index f83d85a62fa..b5ff1ba822e 100644
--- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
@@ -70,7 +70,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "idl_extern.h"
#include "drv_private_ifr.h"
-ACE_RCSID(IFR_Service, drv_private_ifr, "$Id$")
+
// Storage for file names
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 0974d75e53d..13d512721ea 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -9,7 +9,7 @@
#include "ACEXML/common/FileCharStream.h"
#include "ACEXML/common/XML_Util.h"
-ACE_RCSID (ImplRepo_Service, Locator_Repository, "$Id$")
+
static const ACE_TCHAR* STARTUP_COMMAND = ACE_TEXT("StartupCommand");
static const ACE_TCHAR* WORKING_DIR = ACE_TEXT("WorkingDir");
@@ -138,8 +138,8 @@ public:
{
}
virtual void next_server (const ACE_CString& server_id,
- const ACE_CString& name, const ACE_CString& aname,
- const ACE_CString& cmdline, const Locator_XMLHandler::EnvList& envlst,
+ const ACE_CString& name, const ACE_CString& aname,
+ const ACE_CString& cmdline, const Locator_XMLHandler::EnvList& envlst,
const ACE_CString& dir, const ACE_CString& amodestr, int start_limit,
const ACE_CString& partial_ior, const ACE_CString& ior)
{
@@ -356,13 +356,13 @@ Locator_Repository::init(const Options& opts)
int
Locator_Repository::unregister_if_address_reused (
const ACE_CString& server_id,
- const ACE_CString& name,
+ const ACE_CString& name,
const char* partial_ior)
{
if (this->debug_ > 0)
{
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: checking reuse address ")
- ACE_TEXT ("for server \"%s %s\" ior \"%s\"\n"),
+ ACE_TEXT ("for server \"%s %s\" ior \"%s\"\n"),
server_id.c_str(), name.c_str (), partial_ior));
}
@@ -373,16 +373,16 @@ Locator_Repository::unregister_if_address_reused (
for (; siit.next (sientry); siit.advance() )
{
Server_Info_Ptr& info = sientry->int_id_;
-
+
if (this->debug_)
{
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: iterating - registered server")
- ACE_TEXT ("\"%s %s\" ior \"%s\"\n"), info->server_id.c_str(),
+ ACE_TEXT ("\"%s %s\" ior \"%s\"\n"), info->server_id.c_str(),
info->name.c_str (), info->partial_ior.c_str ()));
}
- if (info->partial_ior == partial_ior
- && name != info->name
+ if (info->partial_ior == partial_ior
+ && name != info->name
&& info->server_id != server_id)
{
if (this->debug_)
@@ -396,7 +396,7 @@ Locator_Repository::unregister_if_address_reused (
}
}
}
-
+
int err = 0;
for (size_t i = 0; i < srvs.size (); ++i)
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index 55757e8c97f..ff6ffe9eb5a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -3,7 +3,7 @@
#include "Locator_XMLHandler.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID (ImplRepo_Service,Locator_XMLHandler,"$Id$")
+
const ACE_TCHAR* Locator_XMLHandler::ROOT_TAG = ACE_TEXT("ImplementationRepository");
const ACE_TCHAR* Locator_XMLHandler::SERVER_INFO_TAG = ACE_TEXT("Servers");
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index bb6be70b13c..81713505d56 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -16,7 +16,7 @@
#include "Criteria_Evaluator.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID(LifeCycle_Service, Criteria_Evaluator, "$Id$")
+
Criteria_Evaluator::Criteria_Evaluator (const CosLifeCycle::Criteria &criteria)
: criteria_ (criteria)
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index c5b2f62b0ad..e28723215c8 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -6,7 +6,7 @@
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
-ACE_RCSID(Naming_Service, Naming_Service, "$Id$")
+
// Default Constructor.
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
index 5148e9085d5..0f45ea1c2a2 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
@@ -7,7 +7,7 @@
#include "tao/AnyTypeCode/Any.h"
#include "tao/CodecFactory/CodecFactory.h"
-ACE_RCSID (PSS, PSDL_Code_Gen, "$Id$")
+
TAO_PSDL_Code_Gen::TAO_PSDL_Code_Gen (CORBA::ORB_ptr orb)
: file_name_ ("Data_Store"),
diff --git a/TAO/orbsvcs/PSS/PSDL_Datastore.cpp b/TAO/orbsvcs/PSS/PSDL_Datastore.cpp
index 0a57e27c9b3..e93e40d952e 100644
--- a/TAO/orbsvcs/PSS/PSDL_Datastore.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Datastore.cpp
@@ -11,7 +11,7 @@
#include "ace/Auto_Ptr.h"
-ACE_RCSID (PSS, PSDL_Datastore, "$Id$")
+
TAO_PSDL_Datastore::TAO_PSDL_Datastore ()
: allocator_ (0),
diff --git a/TAO/orbsvcs/PSS/PSDL_Enum_Type_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Enum_Type_Visitor.cpp
index 865af26a348..8584b385c94 100644
--- a/TAO/orbsvcs/PSS/PSDL_Enum_Type_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Enum_Type_Visitor.cpp
@@ -4,7 +4,7 @@
#include "PSDL_Enum_Type_Visitor.h"
#include "PSDL_Stream.h"
-ACE_RCSID (PSS, PSDL_Enum_Type_Visitor, "$Id$")
+
TAO_PSDL_Enum_Type_Visitor::TAO_PSDL_Enum_Type_Visitor (void)
{
@@ -36,7 +36,7 @@ TAO_PSDL_Enum_Type_Visitor::visit_enumerator (TAO_PSDL_Enumerator *enumerator)
// Get a pointer to PSDL_Stream of the stub header.
TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
+
*ps_sh<< " " << this->identifiers_ [this->count_ - 1]
<< ";\n";
@@ -61,7 +61,7 @@ TAO_PSDL_Enum_Type_Visitor::visit_predefined_type (TAO_PSDL_Predefined_Type *pre
// Get a pointer to PSDL_Stream of the stub header.
TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
+
*ps_sh<< "enum " << enum_type_name.c_str () << "\n";
*ps_sh<< "{\n";
@@ -86,7 +86,7 @@ TAO_PSDL_Enum_Type_Visitor::print_class_for_enum_type (ACE_CString enum_type_nam
{
// Get a pointer to PSDL_Stream of the stub header.
TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
+
ps_sh->nl ();
*ps_sh << "typedef " << enum_type_name << " &"
diff --git a/TAO/orbsvcs/PSS/PSDL_Exception_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Exception_Scope.cpp
index 6771165044f..12a32a0d119 100644
--- a/TAO/orbsvcs/PSS/PSDL_Exception_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Exception_Scope.cpp
@@ -4,7 +4,7 @@
#include "PSDL_Exception_Scope.h"
-ACE_RCSID (PSS, PSDL_Exception_Scope, "$Id$")
+
TAO_PSDL_Exception_Scope::TAO_PSDL_Exception_Scope (TAO_PSDL_Scope *parent_scope)
: scope_map_ (),
diff --git a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
index 06b73624aef..d6a33d1a866 100644
--- a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
@@ -4,7 +4,7 @@
#include "PSDL_Exception_Visitor.h"
#include "PSDL_Stream.h"
-ACE_RCSID (PSS, PSDL_Exception_Visitor, "$Id$")
+
TAO_PSDL_Exception_Visitor::TAO_PSDL_Exception_Visitor (void)
: exception_name_ ()
diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Interface_Scope.cpp
index a0015737d6f..e7c040063ca 100644
--- a/TAO/orbsvcs/PSS/PSDL_Interface_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Interface_Scope.cpp
@@ -4,7 +4,7 @@
#include "PSDL_Module_Scope.h"
#include "PSDL_Interface_Scope.h"
-ACE_RCSID (PSS, PSDL_Interface_Scope, "$Id$")
+
TAO_PSDL_Interface_Scope::TAO_PSDL_Interface_Scope (TAO_PSDL_Scope *parent_scope)
: interface_scope_ (),
diff --git a/TAO/orbsvcs/PSS/PSDL_Interpreter.cpp b/TAO/orbsvcs/PSS/PSDL_Interpreter.cpp
index c3bf8d7a1c0..dafd3940218 100644
--- a/TAO/orbsvcs/PSS/PSDL_Interpreter.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Interpreter.cpp
@@ -5,7 +5,7 @@
#include "PSDL_Node.h"
#include "PSDL_y.h"
-ACE_RCSID(PSDL, PSDL_Interpreter, "$Id$")
+
TAO_SYNCH_MUTEX TAO_PSDL_Interpreter::parserMutex__;
diff --git a/TAO/orbsvcs/PSS/PSDL_Module_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Module_Scope.cpp
index bda3bbb4ff8..f90d5ad7213 100644
--- a/TAO/orbsvcs/PSS/PSDL_Module_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Module_Scope.cpp
@@ -4,7 +4,7 @@
#include "PSDL_Module_Scope.h"
#include "PSDL_Interface_Scope.h"
-ACE_RCSID (PSS, PSDL_Module_Scope, "$Id$")
+
TAO_PSDL_Module_Scope::TAO_PSDL_Module_Scope (TAO_PSDL_Scope *parent_scope)
: module_scope_ (),
diff --git a/TAO/orbsvcs/PSS/PSDL_Module_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Module_Visitor.cpp
index 23c7d29490c..8fc9ad252b1 100644
--- a/TAO/orbsvcs/PSS/PSDL_Module_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Module_Visitor.cpp
@@ -5,7 +5,7 @@
#include "PSDL_Scope.h"
#include "PSDL_Stream.h"
-ACE_RCSID (PSS, PSDL_Module_Visitor, "$Id$")
+
TAO_PSDL_Module_Visitor::TAO_PSDL_Module_Visitor (void)
{
diff --git a/TAO/orbsvcs/PSS/PSDL_Node.cpp b/TAO/orbsvcs/PSS/PSDL_Node.cpp
index 2562abf32c9..b23e9ca3d6c 100644
--- a/TAO/orbsvcs/PSS/PSDL_Node.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Node.cpp
@@ -10,7 +10,7 @@
#include "PSDL_Stream.h"
#include "tao/CORBA_String.h"
-ACE_RCSID (PSS, PSDL_Node, "$Id$")
+
TAO_PSDL_Node::TAO_PSDL_Node (void)
: identifiers_ (),
diff --git a/TAO/orbsvcs/PSS/PSDL_OctetSeq.cpp b/TAO/orbsvcs/PSS/PSDL_OctetSeq.cpp
index fb223b54ae9..94a5a5e042c 100644
--- a/TAO/orbsvcs/PSS/PSDL_OctetSeq.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_OctetSeq.cpp
@@ -4,7 +4,7 @@
#include "ace/Malloc_Base.h"
-ACE_RCSID (PSS, PSDL_OctetSeq, "$Id")
+
// Constructor
TAO_PSDL_OctetSeq::TAO_PSDL_OctetSeq ()
diff --git a/TAO/orbsvcs/PSS/PSDL_Op_Dcl_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Op_Dcl_Scope.cpp
index 279d0a6c0d9..a7eb775690d 100644
--- a/TAO/orbsvcs/PSS/PSDL_Op_Dcl_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Op_Dcl_Scope.cpp
@@ -4,7 +4,7 @@
#include "PSDL_Module_Scope.h"
#include "PSDL_Op_Dcl_Scope.h"
-ACE_RCSID (PSS, PSDL_Op_Dcl_Scope, "$Id$")
+
TAO_PSDL_Op_Dcl_Scope::TAO_PSDL_Op_Dcl_Scope (TAO_PSDL_Scope *parent_scope)
: scope_map_ (),
diff --git a/TAO/orbsvcs/PSS/PSDL_Root_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Root_Scope.cpp
index 32c1b429572..d6f5760514e 100644
--- a/TAO/orbsvcs/PSS/PSDL_Root_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Root_Scope.cpp
@@ -4,7 +4,7 @@
#include "PSDL_Root_Scope.h"
#include "PSDL_Interface_Scope.h"
-ACE_RCSID (PSS, PSDL_Root_Scope, "$Id$")
+
TAO_PSDL_Root_Scope::TAO_PSDL_Root_Scope ()
: root_scope_map_ ()
diff --git a/TAO/orbsvcs/PSS/PSDL_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Scope.cpp
index 0e64ffca560..f9d1030c8fb 100644
--- a/TAO/orbsvcs/PSS/PSDL_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Scope.cpp
@@ -12,7 +12,7 @@
#include "PSDL_Stream.h"
#include "ace/OS_NS_ctype.h"
-ACE_RCSID (PSS, PSDL_Scope, "$Id$")
+
#undef INCREMENT
#define INCREMENT 40
diff --git a/TAO/orbsvcs/PSS/PSDL_Simple_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Simple_Scope.cpp
index 40f5bbfd332..fb7b012100f 100644
--- a/TAO/orbsvcs/PSS/PSDL_Simple_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Simple_Scope.cpp
@@ -4,7 +4,7 @@
#include "PSDL_Simple_Scope.h"
#include "PSDL_Interface_Scope.h"
-ACE_RCSID (PSS, PSDL_Simple_Scope, "$Id$")
+
TAO_PSDL_Simple_Scope::TAO_PSDL_Simple_Scope (TAO_PSDL_Scope *parent_scope,
ACE_CString identifier_type)
diff --git a/TAO/orbsvcs/PSS/PSDL_Stream.cpp b/TAO/orbsvcs/PSS/PSDL_Stream.cpp
index eb5a8522c91..3fbc06c6aea 100644
--- a/TAO/orbsvcs/PSS/PSDL_Stream.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Stream.cpp
@@ -3,7 +3,7 @@
#include "PSDL_Stream.h"
-ACE_RCSID (PSS, PSDL_Scope, "$Id$")
+
TAO_PSDL_Stream::TAO_PSDL_Stream (void)
{
@@ -121,7 +121,7 @@ TAO_PSDL_Stream::operator<< (const char *str)
{
ACE_OS::fprintf (this->fp_, "%s", str);
ACE_OS::fflush (this->fp_);
-
+
return *this;
}
@@ -130,7 +130,7 @@ TAO_PSDL_Stream::operator<< (ACE_CString str)
{
ACE_OS::fprintf (this->fp_, "%s", str.c_str ());
ACE_OS::fflush (this->fp_);
-
+
return *this;
}
@@ -142,7 +142,7 @@ TAO_PSDL_Stream::operator<< (const unsigned long num)
num);
ACE_OS::fflush (this->fp_);
-
+
return *this;
}
diff --git a/TAO/orbsvcs/PSS/PSDL_String.cpp b/TAO/orbsvcs/PSS/PSDL_String.cpp
index 56eb91f7886..2baedd9399e 100644
--- a/TAO/orbsvcs/PSS/PSDL_String.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_String.cpp
@@ -5,7 +5,7 @@
#include "ace/Malloc_Base.h"
#include "ace/SString.h"
-ACE_RCSID (PSS, PSDL_String, "$Id")
+
// Constructor
TAO_PSDL_String::TAO_PSDL_String ()
diff --git a/TAO/orbsvcs/PSS/PSDL_Struct_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Struct_Scope.cpp
index cbbce2777cd..20518ca9ed5 100644
--- a/TAO/orbsvcs/PSS/PSDL_Struct_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Struct_Scope.cpp
@@ -3,7 +3,7 @@
#include "PSDL_Struct_Scope.h"
-ACE_RCSID (PSS, PSDL_Struct_Scope, "$Id$")
+
TAO_PSDL_Struct_Scope::TAO_PSDL_Struct_Scope (TAO_PSDL_Scope *parent_scope)
: struct_scope_ (),
diff --git a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
index 878f19db993..0f2b9f73f67 100644
--- a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
@@ -6,7 +6,7 @@
#include "PSDL_y.h"
#include "tao/CORBA_String.h"
-ACE_RCSID (PSS, PSDL_Struct_Visitor, "$Id$")
+
TAO_PSDL_Struct_Visitor::TAO_PSDL_Struct_Visitor (void)
: identifiers_count_ (0),
diff --git a/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp
index 0bde2955e69..bf24b1e6f24 100644
--- a/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp
@@ -4,7 +4,7 @@
#include "PSDL_Type_Dcl_Visitor.h"
#include "PSDL_Stream.h"
-ACE_RCSID (PSS, PSDL_Type_Dcl_Visitor, "$Id$")
+
TAO_PSDL_Type_Dcl_Visitor::TAO_PSDL_Type_Dcl_Visitor (void)
{
diff --git a/TAO/orbsvcs/PSS/PSDL_Typecode_Defn.cpp b/TAO/orbsvcs/PSS/PSDL_Typecode_Defn.cpp
index cb458ae9528..5da6bec3d69 100644
--- a/TAO/orbsvcs/PSS/PSDL_Typecode_Defn.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Typecode_Defn.cpp
@@ -3,7 +3,7 @@
#include "PSDL_Typecode_Defn.h"
#include "PSDL_Stream.h"
-ACE_RCSID(be_visitor_typecode, typecode_defn, "$Id$")
+
TAO_PSDL_Typecode_Defn::TAO_PSDL_Typecode_Defn ()
diff --git a/TAO/orbsvcs/PSS/PSDL_Visitor_Factory.cpp b/TAO/orbsvcs/PSS/PSDL_Visitor_Factory.cpp
index d33e61862db..8f432704079 100644
--- a/TAO/orbsvcs/PSS/PSDL_Visitor_Factory.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Visitor_Factory.cpp
@@ -9,7 +9,7 @@
#include "PSDL_Enum_Type_Visitor.h"
#include "PSDL_Exception_Visitor.h"
-ACE_RCSID (PSS, PSDL_Visitor_Factory, "$Id$")
+
TAO_PSDL_Visitor_Factory::TAO_PSDL_Visitor_Factory (void)
{
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index abde51def24..189991f6f26 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -11,7 +11,7 @@
#include "ace/OS_NS_fcntl.h"
#include "ace/os_include/os_netdb.h"
-ACE_RCSID(Time_Service, Clerk_i, "$Id$")
+
// Constructor.
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 60421473742..c90b4e3999e 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -9,7 +9,7 @@
#include "ace/OS_NS_string.h"
#include "ace/os_include/os_netdb.h"
-ACE_RCSID(Time_Service, Server_i, "$Id$")
+
// Constructor.
Server_i::Server_i (void)
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index 8a0347b8c09..79649db92a1 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -3,7 +3,7 @@
#include "Clerk_i.h"
#include "ace/OS_main.h"
-ACE_RCSID(TimeService, Time_Service_Clerk, "$Id$")
+
// This is the main driver program for the Time Service clerk.
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index 4b2714a3c24..fe0c8e9c885 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -3,7 +3,7 @@
#include "Server_i.h"
#include "ace/OS_main.h"
-ACE_RCSID(TimeService, Time_Service_Server, "$Id$")
+
// This is the main driver program for the Time Service server.
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index f1d46210ff3..1e7d19231c2 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -4,7 +4,7 @@
#include "ace/Arg_Shifter.h"
#include "Trading_Service.h"
-ACE_RCSID(Trading_Service, Trading_Service, "$Id$")
+
Trading_Shutdown::Trading_Shutdown (Trading_Service& trader)
: trader_ (trader)
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index 98f7088d0cc..aea93327e95 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -4,7 +4,7 @@
#include "orbsvcs/CosTypedEventChannelAdminC.h"
#include "CountryC.h"
-ACE_RCSID(CosEC_Examples, Supplier, "$Id:")
+
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index 04a7df4e395..db8e31cc3ea 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -2,7 +2,7 @@
#include "Filter.h"
-ACE_RCSID(Filter, Filter, "$Id$")
+
#define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
#define NAMING_SERVICE_NAME "NameService"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index e66ba23fa80..8697daeebd0 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -10,7 +10,7 @@
#include "ace/Sched_Params.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID (Notify, TAO_Notify_Lanes_Consumer_Client, "$Id$")
+
TAO_Notify_Lanes_Consumer_Client::TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects)
: orb_objects_ (orb_objects)
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index 420ece6b765..43f68e43eaa 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -2,7 +2,7 @@
#include "ORB_Objects.h"
-ACE_RCSID (Notify, TAO_Notify_ORB_Objects, "$Id$")
+
TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
{
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index 0b181bdf553..f2344182273 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -2,7 +2,7 @@
#include "ORB_Run_Task.h"
-ACE_RCSID (Notify, TAO_Notify_ORB_Run_Task, "$Id$")
+
TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects)
: orb_objects_ (orb_objects)
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index 5210b534d17..f453c3944e2 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -2,7 +2,7 @@
#include "Supplier.h"
-ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier, "$Id$")
+
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 9c2e44e458d..85245d221e3 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -11,7 +11,7 @@
#include "orbsvcs/CosNamingC.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$")
+
TAO_Notify_Lanes_Supplier_Client::TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects)
: orb_objects_ (orb_objects)
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index 8fc4757099a..527c1eb5c0d 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -1,7 +1,7 @@
/* -*- C++ -*- $Id$ */
#include "Subscribe.h"
-ACE_RCSID(Notify, Subscribe, "$Id$")
+
#define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
#define NAMING_SERVICE_NAME "NameService"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 26a3a3779cb..0a72f5c06fe 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -10,7 +10,7 @@
#include "ace/Sched_Params.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID (Notify, TAO_Notify_ThreadPool_Consumer_Client, "$Id$")
+
TAO_Notify_ThreadPool_Consumer_Client::TAO_Notify_ThreadPool_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects)
: orb_objects_ (orb_objects)
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
index 420ece6b765..43f68e43eaa 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
@@ -2,7 +2,7 @@
#include "ORB_Objects.h"
-ACE_RCSID (Notify, TAO_Notify_ORB_Objects, "$Id$")
+
TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
{
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
index 0b181bdf553..f2344182273 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
@@ -2,7 +2,7 @@
#include "ORB_Run_Task.h"
-ACE_RCSID (Notify, TAO_Notify_ORB_Run_Task, "$Id$")
+
TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects)
: orb_objects_ (orb_objects)
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index 44fa82370f5..e24c683536f 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -2,7 +2,7 @@
#include "Supplier.h"
-ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier, "$Id$")
+
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 83bc0304d81..9720725fb57 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -11,7 +11,7 @@
#include "orbsvcs/CosNamingC.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$")
+
TAO_Notify_ThreadPool_Supplier_Client::TAO_Notify_ThreadPool_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects)
: orb_objects_ (orb_objects)
diff --git a/TAO/orbsvcs/examples/PSS/server.cpp b/TAO/orbsvcs/examples/PSS/server.cpp
index 696b5faa71e..b757dfaa5b7 100644
--- a/TAO/orbsvcs/examples/PSS/server.cpp
+++ b/TAO/orbsvcs/examples/PSS/server.cpp
@@ -22,7 +22,7 @@
#include "Server_i.h"
#include "ace/Get_Opt.h"
-ACE_RCSID (PSS, client, "$Id$")
+
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 3c88f73b002..72ddfc327d6 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -2,7 +2,7 @@
#include "Consumer.h"
-ACE_RCSID(EC_Examples, Consumer, "$Id$")
+
Consumer::Consumer (void)
{
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index 6ad6b434cb3..2938db68015 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -21,7 +21,7 @@
#include "ace/OS_NS_strings.h"
#include "ace/Thread.h"
-ACE_RCSID(EC_Examples, Service, "$Id$")
+
namespace
{
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index 9dd7b492b1a..69cadbb56ce 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -5,7 +5,7 @@
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/RtecEventCommC.h"
-ACE_RCSID(EC_Examples, Supplier, "$Id$")
+
Supplier::Supplier (RtecEventComm::EventSourceID id,
const RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy)
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index 66e1c5117bc..b1317b482f7 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -2,7 +2,7 @@
#include "AddrServer.h"
-ACE_RCSID(EC_Examples, AddrServer, "$Id$")
+
AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
: addr_ (addr)
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 3c88f73b002..72ddfc327d6 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -2,7 +2,7 @@
#include "Consumer.h"
-ACE_RCSID(EC_Examples, Consumer, "$Id$")
+
Consumer::Consumer (void)
{
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index a9355f78bda..ed8c7911a5a 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -16,7 +16,7 @@
#include "ace/Auto_Ptr.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(EC_Examples, Service, "$Id$")
+
int config_run = 0;
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index a1321f64e45..493be0d1293 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -2,7 +2,7 @@
#include "SLevel1_TestC.h"
-ACE_RCSID (SecurityLevel1, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index ea058de54e7..c8ab340d9c9 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -4,7 +4,7 @@
#include "ace/Read_Buffer.h"
#include "testC.h"
-ACE_RCSID(Send_File, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 1444eacfc3f..8bc73539a7c 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -5,7 +5,7 @@
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(Send_File, server, "$Id$")
+
const ACE_TCHAR *ior_output_file = 0;
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 0b8df081939..5137d42bc91 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -6,7 +6,7 @@
#include "test_i.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Send_File, test_i, "$Id$")
+
void
Simple_Server_i::send_line (const char *line)
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index cada96abdc1..8793ff67520 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -17,7 +17,7 @@
#include "ace/Process_Semaphore.h"
-ACE_RCSID(AV, Endpoint_Strategy, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
index e7cca074af3..26da6188ebb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
@@ -4,7 +4,7 @@
#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
-ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 9b7f29ca0e6..597e9c0f3df 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -12,7 +12,7 @@
#include "orbsvcs/Concurrency/CC_LockSetFactory.h"
#include "orbsvcs/Concurrency/CC_LockSet.h"
-ACE_RCSID(Concurrency, CC_LockSetFactory, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index 88c8f20cd5d..64b0c672e3a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -16,7 +16,7 @@
#include "orbsvcs/Concurrency/Concurrency_Loader.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID (Concurrency, Concurrency_Loader, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index 9b671f519f2..ac830526779 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/CosEvent/CEC_Dispatching.h"
#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
-ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index dfdf410281a..9dc4b6b2f19 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -13,7 +13,7 @@
#include "orbsvcs/CosEvent/CEC_EventChannel.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(CosEvent, CEC_EventChannel, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
index e2ffe759211..eeb89d93f1b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/CosEvent/CEC_Factory.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(CosEvent, CEC_Factory, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 487c4079285..ba31df77c25 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h"
-ACE_RCSID(CosEvent, CEC_MT_Dispatching, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
index eeb8c998046..84f62c99fbf 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
-ACE_RCSID(CosEvent, CEC_Pulling_Strategy, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 4c695f29823..4389bfb2314 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -20,7 +20,7 @@
#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index 114603f9913..2ad307d240b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/CosEvent/CEC_SupplierControl.h"
-ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
index 18415bd9fc0..2694b25b984 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
@@ -9,6 +9,6 @@
#include "orbsvcs/ESF/ESF_RefCount_Guard.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(ESF, ESF_RefCount_Guard, "$Id$")
+
#endif /* TAO_ESF_REFCOUNT_GUARD_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 8a241a85c17..7d725174738 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -10,7 +10,7 @@
#include "orbsvcs/Event/ECG_CDR_Message_Sender.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_CDR_Message_Sender, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index c093e008c15..f3f35179378 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
-ACE_RCSID(Event, ECG_ConsumerEventChannelControl, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 5933ad66272..498477b8bc0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -13,7 +13,7 @@
#include "orbsvcs/Event/ECG_Mcast_EH.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_Mcast_EH, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index ed6fa1eb620..aa41d68c8e8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -20,7 +20,7 @@
#include "orbsvcs/Event/ECG_Mcast_Gateway.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_Mcast_Gateway, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index 1a3c54d765e..49d935a6757 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -7,7 +7,7 @@
#include "ace/Reactor.h"
-ACE_RCSID(Event, ECG_Reactive_ConsumerEventChannelControl, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 9358fbc65af..8f5891204de 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -6,7 +6,7 @@
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
-ACE_RCSID(Event, ECG_Reconnect_ConsumerEventChannelControl, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index 213e0ea32dc..b47650a3a8b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -8,7 +8,7 @@
#include "orbsvcs/Event/ECG_UDP_EH.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_UDP_EH, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index a201234c375..119d4cf8628 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -9,7 +9,7 @@
#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_UDP_Out_Endpoint, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 335f20b9854..410fc180797 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_And_Filter.h"
-ACE_RCSID(Event, EC_And_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index fc231d2186d..f5d247f36ff 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -15,7 +15,7 @@
#include "orbsvcs/Event/EC_Basic_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Basic_Filter_Builder, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index 607f65f3a48..a68adc7021a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_Bitmask_Filter.h"
-ACE_RCSID(Event, EC_Bitmask_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index ff6f91ecd91..1ee8109222a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_Conjunction_Filter.h"
-ACE_RCSID(Event, EC_Conjunction_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index f037ca17b53..c1b9f29b326 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_ConsumerControl.h"
-ACE_RCSID(Event, EC_ConsumerControl, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 90b03525203..bc6e10440b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -39,7 +39,7 @@
#include "orbsvcs/Event/EC_Default_Factory.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Default_Factory, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index 4fb5196f194..aaef0d96cdf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Event/EC_Supplier_Filter.h"
#include "ace/Reverse_Lock_T.h"
-ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 51b47cc607c..8b15c1a39ef 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_Disjunction_Filter.h"
-ACE_RCSID(Event, EC_Disjunction_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index 4e2ead6d6e1..1f42a3a762d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Event/EC_Dispatching.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
-ACE_RCSID(Event, EC_Dispatching, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index b35602065d0..f8e9cd7023e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -4,7 +4,7 @@
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(Event, EC_Event_Channel, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index aa68b7259ad..87227b52c6d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -14,7 +14,7 @@
#include "orbsvcs/Event/EC_Event_Channel_Base.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Event_Channel_Base, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 1a5cebd8ecd..13afbe4f81a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Event/EC_Factory.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(Event, EC_Factory, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index f06edd5439c..24f7ce3a85d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/Event/EC_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Filter_Builder, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index 8d701f9f8fb..77bd6021c07 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -8,7 +8,7 @@
#include "orbsvcs/Event/EC_Group_Scheduling.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Group_Scheduling, "$Id$")
+
void
TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies (
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index d3700e473f2..9c5b3c5bbb7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -4,7 +4,7 @@
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(Event, EC_Kokyu_Filter, "$Id$")
+
TAO_EC_Kokyu_Filter::
TAO_EC_Kokyu_Filter (const char* name,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index 891cc55c412..a94a6f5728f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -10,7 +10,7 @@
#include "orbsvcs/Event/EC_Kokyu_Scheduling.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Kokyu_Scheduling, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index eed91d2c9f0..898172f5895 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_MT_Dispatching.h"
-ACE_RCSID(Event, EC_MT_Dispatching, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index cff73bd1cd3..55219040071 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_Masked_Type_Filter.h"
-ACE_RCSID(Event, EC_Masked_Type_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 577da9bf02f..b2b0c6b7f43 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_Negation_Filter.h"
-ACE_RCSID(Event, EC_Negation_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 58607107d24..8304b895e65 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -19,7 +19,7 @@
#include "tao/ORB_Core.h"
-ACE_RCSID(Event, EC_Null_Factory, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index cfec105b9a4..4fde40b5ae8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -8,7 +8,7 @@
#include "orbsvcs/Event/EC_Null_Scheduling.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Null_Scheduling, "$Id$")
+
void
TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies (
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 48d13c2bc31..3da8854d4b1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -13,7 +13,7 @@
#include "orbsvcs/Event/EC_ObserverStrategy.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_ObserverStrategy, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 37f99bf81da..d9aaf04d5a9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -15,7 +15,7 @@
#include "orbsvcs/Event/EC_Per_Supplier_Filter.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Per_Supplier_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index 580c0e4d4d3..ab4cabf6723 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -15,7 +15,7 @@
#include "orbsvcs/Event/EC_Prefix_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Prefix_Filter_Builder, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index f44f34ba32c..a7f902c9b55 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -10,7 +10,7 @@
#include "ace/Sched_Params.h"
-ACE_RCSID(Event, EC_Priority_Dispatching, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index 7bd17246249..84c00ffa45f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -10,7 +10,7 @@
#include "orbsvcs/Event/EC_Priority_Scheduling.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Priority_Scheduling, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
index 1e39f9bb795..522f6ad45e0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
@@ -6,4 +6,4 @@
#include "orbsvcs/Event/EC_QOS_Info.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_QOS_Info, "$Id$")
+
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index 5668c79f14e..3f2770ff0eb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
#include "tao/RTCORBA/Priority_Mapping.h"
-ACE_RCSID(Event, EC_RTCORBA_Dispatching, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 36aec7f29d2..48e44f70852 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -5,7 +5,7 @@
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
-ACE_RCSID(Event, EC_RTCORBA_Factory, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index c72ea526cf8..436d0ff5b62 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -15,7 +15,7 @@
#include "orbsvcs/Event/EC_Reactive_ConsumerControl.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Reactive_ConsumerControl, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index bffad152a77..1d384bd5092 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
-ACE_RCSID(Event, EC_Reactive_Dispatching, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index 40e96be4414..a8d388bdef5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -15,7 +15,7 @@
#include "orbsvcs/Event/EC_Reactive_SupplierControl.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Reactive_SupplierControl, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 1f310ff9de8..4732e146e71 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -15,7 +15,7 @@
#include "orbsvcs/Event/EC_Sched_Factory.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Sched_Factory, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 82910313264..1ae39568dea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -4,7 +4,7 @@
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(Event, EC_Sched_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 374a0a67cf0..5625bf412b7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -14,7 +14,7 @@
#include "orbsvcs/Event/EC_Sched_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Sched_Filter_Builder, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index 76be60d02ec..edeafe0f87c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
-ACE_RCSID(Event, EC_Scheduling_Strategy, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 1b2f58cd72e..812865a639a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -8,7 +8,7 @@
#include "orbsvcs/ESF/ESF_Peer_Admin.h"
#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
-ACE_RCSID(Event, EC_SupplierAdmin, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 3b9fa1c3563..63c4e91e295 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_SupplierControl.h"
-ACE_RCSID(Event, EC_SupplierControl, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index dfe1f96394d..b606d150ec8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -8,7 +8,7 @@
#include "orbsvcs/Event/EC_Supplier_Filter.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Supplier_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index 63203a004fa..a06f36274f1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
-ACE_RCSID(Event, EC_Supplier_Filter_Builder, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index 1137af088b0..ee9eac9e287 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -5,7 +5,7 @@
#include <ace/Dynamic_Service.h>
-ACE_RCSID(Event, EC_TPC_Dispatching, "$Id$")
+
#if !defined(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
#define TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE 32
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index 3fa0682b367..390c3832b2f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -12,7 +12,7 @@
#include "ace/Sched_Params.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(Event, EC_TPC_Factory, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index c80be748333..8ed6366b614 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
-ACE_RCSID(Event, EC_TPC_ProxyConsumer, "$Id$")
+
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_TPC_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 09cc25296ee..d70bf720539 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Event/EC_TPC_ProxySupplier.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$")
+
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_TPC_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
index bc3a9cc1947..d4107aababb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
@@ -8,7 +8,7 @@
#include "ace/Log_Msg.h"
#include "ace/Sched_Params.h"
-ACE_RCSID(Event, EC_Thread_Flags , "$Id$")
+
#define TETFSF(flag) { #flag, flag }
TAO_EC_Thread_Flags::Supported_Flag TAO_EC_Thread_Flags::supported_flags_[] = {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index 93f1264d176..b4f61f8a4a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -8,7 +8,7 @@
#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug
-ACE_RCSID(Event, EC_Trivial_Supplier_Filter, "$Id$")
+
// ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index f4f99440f0c..90e81d0293f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Event/EC_Type_Filter.h"
-ACE_RCSID(Event, EC_Type_Filter, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index fd0ef8ebc02..fc5f4c97198 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -11,7 +11,7 @@
#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(FaultTolerance, FT_ClientPolicy_i, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
index 784e1c4dd8b..0e78c3cf120 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
@@ -6,7 +6,7 @@
#include "tao/ORBInitializer_Registry.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(FaultTolerance, FT_ClientService_Activate, "$Id$")
+
static bool initialized = false;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index ca7daf1007f..b7d45633400 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -10,7 +10,7 @@
#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(FaultTolerance, FT_ServerPolicy_i, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
index be4448486c8..27f1a9a75b2 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
@@ -5,7 +5,7 @@
#include "tao/ORBInitializer_Registry.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(FaultTolerance, FT_ServerService_Activate, "$Id$")
+
static bool initialized = false;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index 9485b217bec..d0a5b002bd7 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -6,7 +6,7 @@
#include "tao/Service_Callbacks.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(FaultTolerance, FT_Service_Activate, "$Id$")
+
static bool initialized = false;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
index aae10d1aa90..69061e2ce04 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
@@ -12,7 +12,7 @@
#include "orbsvcs/Naming/Entries.h"
-ACE_RCSID(Naming, Entries, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 52d30d4c3ef..44736086700 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -17,7 +17,7 @@
#include "ace/Dynamic_Service.h"
#include "ace/Argv_Type_Converter.h"
-ACE_RCSID (Naming, Naming_Loader, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index e1c0b8c0956..34eef002ead 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -13,7 +13,7 @@
#include "orbsvcs/Naming/Bindings_Iterator_T.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID(Naming, Transient_Naming_Context, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index 0e1a0f1bc89..823d541fc0a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -5,7 +5,7 @@
#include "tao/Transport.h"
#include "tao/debug.h"
-ACE_RCSID(tao, Wait_On_Leader_Follower, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 5b8bb50d2f0..993f6eb0225 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -14,7 +14,7 @@
#include "ace/ACE.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID(Property, CosPropertyService_i, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index 7ec5e1de1a1..a0449dfe4d6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -9,7 +9,7 @@
#include "orbsvcs/Sched/Config_Scheduler.h"
-ACE_RCSID(Sched, Config_Scheduler, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 6424d1b5c05..ea9dd850db2 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -21,7 +21,7 @@
#include "orbsvcs/Sched/DynSched.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Sched, DynSched, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index 8ff73d87e6b..eced05efa7b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -19,7 +19,7 @@
#include "orbsvcs/Time_Utilities.h"
-ACE_RCSID (Sched, Reconfig_Sched_Utils, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 6cb44d2889c..b94d0709197 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -18,7 +18,7 @@
#include "orbsvcs/Sched/SchedEntry.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Sched, SchedEntry, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 42973f57074..be0150b9136 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -16,7 +16,7 @@
#include "ace/Lock_Adapter_T.h"
-ACE_RCSID(Sched, Scheduler, "$Id$")
+
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index 03e28d3b35b..dee012d8eb6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -14,7 +14,7 @@
#include "orbsvcs/Sched/Scheduler_Generic.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID(Sched, Scheduler_Generic, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index f7004fab47c..1bb51c844ab 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -6,7 +6,7 @@
# include "orbsvcs/Time_Utilities.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(orbsvcs, Time_Utilities, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index f8a41ab797b..4de1e115937 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -2,7 +2,7 @@
#include "orbsvcs/Trader/Offer_Iterators.h"
-ACE_RCSID(Trader, Offer_Iterators, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index f2316c9c9ed..75b59671a9f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Trader/Trader_Utils.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID(Trader, Trader_Utils, "$Id$")
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 549179fdaef..00267cfddd7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -28,7 +28,7 @@
#include "ace/OS_NS_unistd.h"
#include "ace/os_include/os_netdb.h"
-ACE_RCSID (Trader, Trading_Loader, "$Id$")
+
TAO_Trading_Loader::TAO_Trading_Loader (void)
: federate_ (0),
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index 4843a18ed81..ae26fe26f32 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -30,7 +30,7 @@
#include "ace/Basic_Stats.h"
#include "ace/Barrier.h"
-ACE_RCSID(TAO_PERF_RTEC_Colocated_Roundtrip, driver, "$Id$")
+
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index da435eb281a..3520b025b13 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -28,7 +28,7 @@
#include "ace/Sched_Params.h"
#include "ace/Barrier.h"
-ACE_RCSID(TAO_RTEC_PERF_Roundtrip, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
int nthreads = 0;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index bb3905eca7b..eb121a24cfb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -27,7 +27,7 @@
#include "ace/Sched_Params.h"
#include "ace/Barrier.h"
-ACE_RCSID(TAO_RTEC_PERF_Roundtrip, client, "$Id$")
+
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
index 3ea29febda8..5f85dccebff 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
@@ -8,7 +8,7 @@
#include "Receiver_Stats.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(ace, Receiver_Stats, "$Id$")
+
void
Receiver_Stats::accumulate (const Receiver_Stats &rhs)
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
index 8b28339da93..43136853f36 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
@@ -10,7 +10,7 @@
#include "tao/Messaging/Messaging.h"
#include "orbsvcs/CosNamingC.h"
-ACE_RCSID(Bug_2074_Regression, ORB_Task, "$Id$")
+
ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index ce5558c04f2..8814ead3a6c 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -3,7 +3,7 @@
//
#include "Hello.h"
-ACE_RCSID(Hello, Hello, "$Id$")
+
CORBA::Boolean
Hello::ids_differ_ = 1;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
index 97f77e1ffaa..2e2cfe20530 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
#include "Hello.h"
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 9b9e21b6bec..25548e70d91 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -9,7 +9,7 @@
#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
#include "ace/Auto_Ptr.h"
-ACE_RCSID(Hello, client, "$Id$")
+
//const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index c20b692c4af..1c7d9ff5608 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -3,7 +3,7 @@
//
#include "Hello.h"
-ACE_RCSID(Hello, Hello, "$Id$")
+
Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
index da8bd5258d7..c642d3318a0 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
#include "Hello.h"
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index 81115492175..dfa637f9960 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -5,7 +5,7 @@
#include "ServerRequest_Interceptor2.h"
#include "Hello.h"
-ACE_RCSID(Hello, Hello, "$Id$")
+
Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 8de294f3253..a3652123853 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
#include "Hello.h"
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://ior.ior");
const ACE_TCHAR *iogr = ACE_TEXT("file://iogr.ior");
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
index df5dc90d3d9..752bb07aa19 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
@@ -3,7 +3,7 @@
//
#include "Hello.h"
-ACE_RCSID(Hello, Hello, "$Id$")
+
Hello::Hello (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
index 17f6fe73f85..1fd8aaf2b46 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
@@ -4,7 +4,7 @@
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior");
bool shutdown_nsmain = false;
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
index b838677dfdc..185704c073d 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
@@ -3,7 +3,7 @@
//
#include "Hello.h"
-ACE_RCSID(Hello, Hello, "$Id$")
+
Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index f026595737b..d562d038e01 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
#include "Hello.h"
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
index 73c4c9fe95e..c5463121e4f 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
@@ -3,7 +3,7 @@
//
#include "Hello.h"
-ACE_RCSID(Hello, Hello, "$Id$")
+
CORBA::Boolean
Hello::normal_context_ok_ = 0;
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
index 280732d27b9..174a0d84e97 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
#include "Hello.h"
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
index eac16dcaaf2..5773b0d7be3 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
@@ -2,7 +2,7 @@
#include "Test_impl.h"
-ACE_RCSID(Bug_3444_Regression, Test_impl, "$Id$")
+
Server_impl::Server_impl (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
index 3ccacdb17f2..8401e17bcd6 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
@@ -4,7 +4,7 @@
#include "ace/Get_Opt.h"
#include "TestC.h"
-ACE_RCSID(Bug_3444_Regression, client, "$Id$")
+
const ACE_TCHAR *ior_server = 0;
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
index df20af73877..8ca34ec5465 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
@@ -5,7 +5,7 @@
#include "ace/Get_Opt.h"
#include "orbsvcs/PortableGroup/GOA.h"
-ACE_RCSID(Bug_3444_Regression, server, "$Id$")
+
const ACE_TCHAR *uipmc_url = 0;
const ACE_TCHAR *ior_output_file = 0;
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
index 7b9497529ec..04ad5ba319a 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
@@ -3,7 +3,7 @@
//
#include "Hello.h"
-ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp")
+
Hello::Hello (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
index f86033651b1..1ade4cfea1d 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
@@ -7,7 +7,7 @@
#include "tao/ORBInitializer_Registry.h"
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
-ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
+
const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
index df5dc90d3d9..752bb07aa19 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
@@ -3,7 +3,7 @@
//
#include "Hello.h"
-ACE_RCSID(Hello, Hello, "$Id$")
+
Hello::Hello (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
index f4a7a4a42a9..46818d96944 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
@@ -4,7 +4,7 @@
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior");
bool shutdown_nsmain = false;
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
index 5dd84ffaf9d..ff30844d186 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -6,7 +6,7 @@
#include "tao/ORB_Core.h"
#include "TestC.h"
-ACE_RCSID(Muxing, Client_Task, "$Id$")
+
Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context,
CORBA::ORB_ptr corb,
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
index 9cfd6c265c9..3048e6f95f7 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
@@ -6,7 +6,7 @@
#include "tao/ORB_Table.h"
#include "tao/Strategies/advanced_resource.h"
-ACE_RCSID(Hello, Hello, "$Id$")
+
Hello::Hello (CORBA::ORB_ptr orb,
ACE_thread_t thrid)
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 4415eb811f5..a139a8517fb 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -29,7 +29,7 @@
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_fcntl.h"
-ACE_RCSID(Concurrency, CC_client, "$Id$")
+
// Constructor.
CC_Client::CC_Client (void)
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index 523154493e4..4593ced36a5 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -21,7 +21,7 @@
#include "ace/OS_NS_string.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
+
CC_naming_service::CC_naming_service (CORBA::ORB_var orb)
: cc_factory_key_ (0),
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 4080b9e369f..930792d8a14 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -22,7 +22,7 @@
#include "ace/OS.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(Concurrency, CC_test_utils, "$Id$")
+
char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
{
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index cda1e777953..ce1cbd5d4fd 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -21,7 +21,7 @@
#include "ace/OS.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(Concurrency, CC_tests, "$Id$")
+
CC_Test::CC_Test (CC_naming_service *ns)
: result (CC_FAIL),
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index d51f9d3e32b..92c6b7f9f71 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -3,7 +3,7 @@
#include "Counting_Consumer.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(CEC_Tests, CEC_Count_Consumer, "$Id$")
+
CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name)
: event_count (0),
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 1fcfae99a24..841d66408af 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -3,7 +3,7 @@
#include "Counting_Supplier.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(CEC_Tests, CEC_Count_Supplier, "$Id$")
+
CEC_Counting_Supplier::CEC_Counting_Supplier (void)
: event_count (0),
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
index 6d7f7c3e48e..a6a580f0a65 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
@@ -3,7 +3,7 @@
#include "ECM_Data.h"
#include "tao/CDR.h"
-ACE_RCSID(EC_Custom_Marshal, ECM_Data, "$Id$")
+
CORBA::Boolean
operator<< (TAO_OutputCDR& cdr, ECM_Data& x)
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index bcb95d23cfb..5e85a0ee5d9 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -16,7 +16,7 @@
#include "ECM_Data.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID(EC_Custom_Marshal, ECM_Supplier, "$Id$")
+
ECMS_Driver::ECMS_Driver (void)
: n_suppliers_ (1),
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index 0aaabaaa42e..d97704bf08a 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -3,7 +3,7 @@
#include "ECT_Driver.h"
#include "ace/High_Res_Timer.h"
-ACE_RCSID(EC_Throughput, ECT_Driver, "$Id$")
+
ECT_Driver::~ECT_Driver (void)
{
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index ed84937dff7..c0461b8125f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -11,7 +11,7 @@
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
-ACE_RCSID(EC_Tests_Basic, Schedule, "$Id$")
+
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index d23fda2966e..7e308b5124d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -4,7 +4,7 @@
#include "Consumer.h"
#include "Supplier.h"
-ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$")
+
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
index 6255f267333..1ae3cae880d 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
@@ -5,7 +5,7 @@
#include "orbsvcs/RtecEventCommC.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://as.ior");
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 279aaad2520..3e32e862847 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -13,7 +13,7 @@
#include "ace/Sched_Params.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID(EC_Tests_Performance, Latency, "$Id$")
+
int iterations = 1000;
int do_dump_history = 0;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index e2e7e8e4937..41a771b90fc 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -12,7 +12,7 @@
#include "ace/Sched_Params.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID(EC_Tests_Performance, Latency_Server, "$Id$")
+
const ACE_TCHAR *ior_file_name = ACE_TEXT("ec.ior");
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
index 9ced5ca501e..b38aaa13633 100644
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
+++ b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
@@ -9,7 +9,7 @@
#include "ace/OS_NS_Thread.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(EC_Tests, testflags, "$Id$")
+
/*
Here are the scenarios we need to test:
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
index 0ee93ca95cb..7992bc6f951 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
@@ -3,7 +3,7 @@
#include "AddrServer.h"
#include "tao/SystemException.h"
-ACE_RCSID(EC_Examples, AddrServer, "$Id$")
+
AddrServer::AddrServer (const ACE_INET_Addr& addr)
{
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index a022244d3cb..cf78deb34e1 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -2,7 +2,7 @@
#include "Counting_Consumer.h"
-ACE_RCSID(EC_Tests, EC_Count_Consumer, "$Id$")
+
EC_Counting_Consumer::EC_Counting_Consumer (const char* name)
: event_count (0),
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 4202c834f61..4c3d1c11106 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -26,7 +26,7 @@
#include "Driver.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(EC_Tests, EC_Driver, "$Id$")
+
EC_Driver::EC_Driver (void)
: n_consumers_ (1),
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 65f59b5c21d..ed8c1b4122d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -6,7 +6,7 @@
//#include "test_i.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(MT_Client, test_i, "$Id$")
+
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
index d5e5ea40f22..0921e592646 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
@@ -20,7 +20,7 @@
#include "ami_test_i.h"
#include "tao/debug.h"
-ACE_RCSID(AMI, ami_test_i, "$Id$")
+
AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index 872febf29b6..49c77a333d6 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -23,7 +23,7 @@
#include "ami_testC.h"
#include "ami_testS.h"
-ACE_RCSID(AMI, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
int nthreads = 5;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index f4b50e9c0bd..bb6cba8ec5e 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -23,7 +23,7 @@
#include "ace/Get_Opt.h"
#include "ace/OS_NS_sys_socket.h"
-ACE_RCSID(AMI, server, "$Id$")
+
const ACE_TCHAR *ior_output_file = 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index e3fefcf0c4b..82173a62a44 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -26,7 +26,7 @@
#include "ami_testC.h"
#include "ami_testS.h"
-ACE_RCSID(AMI, simple_client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
int niterations = 5;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index e73deb4202f..38338f55589 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -5,7 +5,7 @@
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "tao/AnyTypeCode/Any.h"
-ACE_RCSID(BiDirectional, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index 6459299e22c..e97d73f9d06 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -6,7 +6,7 @@
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "tao/AnyTypeCode/Any.h"
-ACE_RCSID(BiDirectional, server, "$Id$")
+
const ACE_TCHAR *ior_output_file = 0;
int no_iterations = 10;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index ae60fd04171..d2bdb7e602e 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -11,7 +11,7 @@
#include "test_i.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(BiDirectional, test_i, "$Id$")
+
void
Callback_i::shutdown (void)
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index dd1638af6b2..085f99d3e35 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -3,7 +3,7 @@
//
#include "Hello.h"
-ACE_RCSID(Hello, Hello, "$Id$")
+
Hello::Hello (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
index f7a982b8175..fd455acdbc1 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -4,7 +4,7 @@
#include <ace/Get_Opt.h>
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 5b0f945c09d..df7a00e9391 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -6,7 +6,7 @@
#include "ace/Read_Buffer.h"
#include "ace/ACE.h"
-ACE_RCSID(ImplRepo, airplane_client_i, "$Id$")
+
// Constructor.
Airplane_Client_i::Airplane_Client_i (void)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index bce2b51d639..0372682f06b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -6,7 +6,7 @@
#include "ace/Read_Buffer.h"
#include "ace/ACE.h"
-ACE_RCSID(ImplRepo, nestea_client_i, "$Id$")
+
// Constructor.
Nestea_Client_i::Nestea_Client_i (void)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 13363307324..c508ff5f744 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -11,7 +11,7 @@
const size_t MAX_UINT32_STR_LEN = 11; // Largest UINT32 is 8589934591 + NUL is 11 characters
-ACE_RCSID(ImplRepo, nestea_i, "$Id$")
+
Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename)
: cans_ (0)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 1177d965430..c382406ccd3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -2,7 +2,7 @@
#include "nestea_server_i.h"
-ACE_RCSID(ImplRepo, nestea_server, "$Id$")
+
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 7c07ae8c949..b64dffa1938 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -11,7 +11,7 @@
#include "ace/Read_Buffer.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID(ImplRepo, nestea_server_i, "$Id$")
+
// The file to save the persistent state to.
const ACE_TCHAR NESTEA_DATA_FILENAME[] = ACE_TEXT("nestea.dat");
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 9407a53a1da..8470b696545 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Shutdown_Utilities.h"
#include "ace/Get_Opt.h"
-ACE_RCSID(Application_Test, server, "$Id$")
+
static const ACE_TCHAR *ior_output_file = ACE_TEXT("iorfile");
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
index 0585d1bc80c..60b58de2ed4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
@@ -7,7 +7,7 @@
#include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
-ACE_RCSID(Hello, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index fc7606b14ea..b1a5fab848f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -5,7 +5,7 @@
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID(Persistence_Test, Ptest, "$Id$")
+
Ptest::Ptest (void)
: debug_ (0),
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 10dd672650c..f195a6e5c9a 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -3,7 +3,7 @@
//
#include "McastHello.h"
-ACE_RCSID(McastHello, McastHello, "$Id$")
+
McastHello::McastHello (CORBA::ORB_ptr orb,
int instance)
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index a012ab1bfa6..a84044b4085 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -5,7 +5,7 @@
#include "tao/Object_T.h"
#include "orbsvcs/PortableGroup/MIOP.h"
-ACE_RCSID(Hello, client, "$Id$")
+
#define MAX_MIOP_OCTET_SEQUENCE (ACE_MAX_DGRAM_SIZE - 272 /* MIOP_MAX_HEADER_SIZE */)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index e041818db73..6891dcd7cd1 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -5,7 +5,7 @@
#include "tao/debug.h"
#include "ConnectDisconnect.h"
-ACE_RCSID (Notify_Tests, ConnectDisconnect, "$Id$")
+
#define CD_IMPLEMENT_ENTITY(X)\
\
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 2adf54c8439..5ec7883937c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -5,7 +5,7 @@
#include "tao/debug.h"
#include "Events.h"
-ACE_RCSID (Notify_Tests, Events, "$Id$")
+
/***************************************************************************/
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index 754a6e91714..904a3a3a3f5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -5,7 +5,7 @@
#include "tao/debug.h"
#include "Filter.h"
-ACE_RCSID (Notify_Tests, Filter, "$Id$")
+
Filter::Filter (void)
: event_count_ (5)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index aebb3cf1a7b..382a27887f1 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -5,7 +5,7 @@
#include "tao/debug.h"
#include "MultiTypes.h"
-ACE_RCSID (Notify_Tests, MultiTypes, "$Id$")
+
//*****************************************************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index ef04ba96627..6b345e31871 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -6,7 +6,7 @@
#include "tao/debug.h"
#include "Sequence.h"
-ACE_RCSID (Notify_Tests, Sequence, "$Id$")
+
/***************************************************************************/
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index 919c22d568f..5cc9b2df6ec 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -5,7 +5,7 @@
#include "tao/debug.h"
#include "Simple.h"
-ACE_RCSID (Notify_Tests, Simple, "$Id$")
+
//***************************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index 426f2f2525e..cb23b49b2b2 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -5,7 +5,7 @@
#include "tao/debug.h"
#include "Updates.h"
-ACE_RCSID (Notify_Tests, Updates, "$Id$")
+
Updates_StructuredPushConsumer::Updates_StructuredPushConsumer (Updates *test_client)
: test_client_ (test_client)
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
index 3176f89fcdd..374c542d4c5 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
@@ -4,7 +4,7 @@
#include "ace/Get_Opt.h"
#include "ace/OS.h"
-ACE_RCSID(Filter, Filter, "Filter.cpp,v 1.13 2002/05/28 20:24:16 pradeep Exp")
+
#define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
#define NAMING_SERVICE_NAME "NameService"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index cdb315860a1..c365a16f619 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -2,7 +2,7 @@
#include "RT_Application_Command.h"
-ACE_RCSID(lib, TAO_RT_Application_Command, "$Id$")
+
#include "../lib/LookupManager.h"
#include "RT_Priority_Mapping.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
index 35be49f7be6..40b4b622f9c 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "../lib/Factories_Define.h"
-ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$Id$")
+
#include "rt_notify_test_export.h"
#include "../lib/Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index c29c721f8df..42f2427f0ba 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -2,7 +2,7 @@
#include "RT_POA_Command.h"
-ACE_RCSID(lib, TAO_RT_POA_Command, "$Id$")
+
#include "tao/debug.h"
#include "../lib/LookupManager.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index 7b9cf2c5d67..ea665041c17 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -2,7 +2,7 @@
#include "RT_Priority_Mapping.h"
-ACE_RCSID(lib, RT_Priority_Mapping, "$Id$")
+
#include "../lib/LookupManager.h"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 7607939e5a9..a8c48427f85 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -8,7 +8,7 @@
#include "ace/OS_NS_stdio.h"
#include "tao/AnyTypeCode/Any.h"
-ACE_RCSID (Notify_Tests, Consumer_Main, "$Id$")
+
static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
static const char NAMING_SERVICE_NAME[] = "NameService";
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index bd32b35229d..1df25516425 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -8,7 +8,7 @@
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID (Notify_Tests, Supplier_Main, "$Id$")
+
static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
static const char NAMING_SERVICE_NAME[] = "NameService";
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 6db332ceea9..8b86e1cdeb2 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -2,7 +2,7 @@
#include "RT_Test_Filter.h"
-ACE_RCSID(Notify, TAO_RT_Test_Filter, "$Id$")
+
#include "tao/debug.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index f5a5401b6d2..ec9df0597f2 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -2,7 +2,7 @@
#include "RT_Test_FilterFactory.h"
-ACE_RCSID(Notify, TAO_RT_Test_FilterFactory, "$Id$")
+
#include "RT_Test_Filter.h"
#include "tao/debug.h"
@@ -86,13 +86,13 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create_mapping_filter (const char * /*co
throw CORBA::NO_IMPLEMENT ();
}
-TAO_Notify_Object::ID
+TAO_Notify_Object::ID
TAO_Notify_Tests_RT_Test_FilterFactory::get_filter_id (CosNotifyFilter::Filter_ptr /*filter*/)
{
throw CORBA::NO_IMPLEMENT ();
}
-CosNotifyFilter::Filter_ptr
+CosNotifyFilter::Filter_ptr
TAO_Notify_Tests_RT_Test_FilterFactory::get_filter (const TAO_Notify_Object::ID& /*id*/)
{
throw CORBA::NO_IMPLEMENT ();
@@ -105,7 +105,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::release (void)
//@@ inform factory
}
-void
+void
TAO_Notify_Tests_RT_Test_FilterFactory::save_persistent (TAO_Notify::Topology_Saver& /*saver*/)
{
throw CORBA::NO_IMPLEMENT ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 4cad93833a9..d7d2f4b7575 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -2,7 +2,7 @@
#include "Application_Command.h"
-ACE_RCSID(lib, TAO_Application_Command, "$Id$")
+
#include "tao/PortableServer/PortableServer.h"
#include "LookupManager.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 1704b36dcc1..9e483b37962 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -7,7 +7,7 @@
#include "ace/Log_Msg.h"
-ACE_RCSID(lib, TAO_Command, "$Id$")
+
TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void)
:next_ (0), command_ (INVALID)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index 071f6da5141..debce6d572b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -7,7 +7,7 @@
#include "Command_Factory.h"
#include "Name.h"
-ACE_RCSID(lib, TAO_Command_Builder, "$Id$")
+
TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void)
:start_command_ (0)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
index 5005641fe4a..792a1cf69bb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
@@ -3,7 +3,7 @@
#include "Command_Factory.h"
-ACE_RCSID(lib, TAO_Command_Factory, "$Id$")
+
TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void)
{
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
index a4bca1a5c56..a1f7102c400 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
@@ -5,7 +5,7 @@
#include "Command_Factory_T.h"
-ACE_RCSID(Notify, TAO_Command_Factory_T, "$Id$")
+
#include "ace/Dynamic_Service.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index dc6d3d6a7e1..ddb0f7ad687 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -2,7 +2,7 @@
#include "ConsumerAdmin_Command.h"
-ACE_RCSID(lib, TAO_ConsumerAdmin_Command, "$Id$")
+
#include "LookupManager.h"
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 7647879b111..19e8d2357ac 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -4,7 +4,7 @@
#include "Consumer_T.h"
-ACE_RCSID(Notify, TAO_Notify_Tests_Consumer_T, "$Id$")
+
template <class Consumer_Traits>
TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index e4550193bd1..93e07d08887 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -2,7 +2,7 @@
#include "Direct_Consumer.h"
-ACE_RCSID(lib, TAO_Direct_Consumer, "$Id$")
+
#include "LookupManager.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index a57d98f22ef..a3dfe8a7080 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -6,7 +6,7 @@
#include "Direct_Supplier.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Notify, TAO_Notify_Tests_Direct_Supplier, "$Id$")
+
#include "LookupManager.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 871ea1c1872..742e65d3281 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -2,7 +2,7 @@
#include "Driver.h"
-ACE_RCSID(lib, TAO_Driver, "$Id$")
+
#include "ace/Dynamic_Service.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index caa4a37b107..3f424e30fca 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -3,7 +3,7 @@
#include "EventChannel_Command.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(lib, TAO_EventChannel_Command, "$Id$")
+
#include "LookupManager.h"
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
index 337e8651108..346d3876902 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Factories_Define.h"
-ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$Id$")
+
#include "Name.h"
#include "Command_Factory_T.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index af99168980b..083b6711bb6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -3,7 +3,7 @@
#include "Filter_Command.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(lib, TAO_Filter_Command, "$Id$")
+
#include "LookupManager.h"
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 67b09574776..1524e8e0a3d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -3,7 +3,7 @@
#include "LookupManager.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID(lib, TAO_LookupManager, "$Id$")
+
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
index b8a3081afbe..44b649dffb7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
@@ -2,7 +2,7 @@
#include "Name.h"
-ACE_RCSID(lib, TAO_Name, "$Id$")
+
#define TAO_Notify_Tests_DECLARE_NAME(target, name) \
const char* const TAO_Notify_Tests_Name::target = name;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
index 870eef04d59..79ca0812d95 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
@@ -2,7 +2,7 @@
#include "Priority_Mapping.h"
-ACE_RCSID(lib, Priority_Mapping, "$Id$")
+
TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void)
{
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 27cb0748b62..79ef0239bcd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -6,7 +6,7 @@
#include "PushConsumer.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(lib, TAO_PushConsumer, "$Id$")
+
TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void)
:type_ (CosNotifyChannelAdmin::ANY_EVENT)
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index 335efc1ec7e..b01c70d6913 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -6,7 +6,7 @@
#include "PushSupplier.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(lib, TAO_PushSupplier, "$Id$")
+
TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void)
:type_ (CosNotifyChannelAdmin::ANY_EVENT)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index 252d400bd7b..f1fbdc1589c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -2,7 +2,7 @@
#include "Relay_Consumer.h"
-ACE_RCSID(Notify, TAO_Notify_Tests_Relay_Consumer, "$Id$")
+
#include "LookupManager.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index 169b179a4aa..08e1ceff1db 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -6,7 +6,7 @@
#include "SequencePushConsumer.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(lib, TAO_SequencePushConsumer, "$Id$")
+
TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void)
:type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index 36537a16048..e98fb96a64d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -6,7 +6,7 @@
#include "SequencePushSupplier.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(lib, TAO_SequencePushSupplier, "$Id$")
+
TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void)
:type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
index 6c6a9882916..df0a5070e30 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
@@ -2,7 +2,7 @@
#include "StructuredEvent.h"
-ACE_RCSID(RT_Notify, TAO_Notify_Tests_StructuredEvent, "$Id$")
+
TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void)
{
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index eb7973ba0e6..a63246fb1ed 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -6,7 +6,7 @@
#include "StructuredPushConsumer.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(lib, TAO_StructuredPushConsumer, "$Id$")
+
TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void)
:type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index d5cc66c07d0..ec7504e106f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -6,7 +6,7 @@
#include "StructuredPushSupplier.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(lib, TAO_StructuredPushSupplier, "$Id$")
+
TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void)
:type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index ce6077a3632..00bbda0d9e2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -2,7 +2,7 @@
#include "SupplierAdmin_Command.h"
-ACE_RCSID(lib, TAO_SupplierAdmin_Command, "$Id$")
+
#include "LookupManager.h"
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 86d43a54f03..f7a32546bf1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -4,7 +4,7 @@
#include "Supplier_T.h"
-ACE_RCSID(Notify, TAO_Notify_Tests_Supplier_T, "$Id$")
+
template <class Supplier_Traits>
TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void)
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 8c0a7edd4e5..54280501069 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -19,7 +19,7 @@
#include "client.h"
#include "tao/debug.h"
-ACE_RCSID(CosPropertyService, client, "$Id$")
+
Client::Client (void)
{
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 66d117d3feb..4044d2734a0 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -18,7 +18,7 @@
#include "orbsvcs/CosPropertyS.h"
#include "orbsvcs/Property/CosPropertyService_i.h"
-ACE_RCSID(CosPropertyService, main, "$Id$")
+
class TAO_PropertySet_Tester
{
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index ec2c85ac2e5..c1a60066209 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -18,7 +18,7 @@
#include "server.h"
-ACE_RCSID(CosPropertyService, server, "$Id$")
+
// Main program
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index 5d1d575a31e..bf367eee839 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -11,7 +11,7 @@
#include "orbsvcs/Scheduler_Factory.h"
#include "orbsvcs/Naming/Naming_Server.h"
-ACE_RCSID(Sched_Conf, Sched_Conf_Anomalies, "$Id$")
+
const char* service_name = "ScheduleService";
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 4f2cbe98442..e345717497c 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -14,7 +14,7 @@
#include "Sched_Conf_Runtime.h"
-ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$")
+
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index 89f5843811b..58fcbbf43df 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -9,7 +9,7 @@
#include "tao/Transport_Cache_Manager.h"
#include "tao/Thread_Lane_Resources.h"
-ACE_RCSID(BiDirectional, client, "$Id$")
+
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index f1190f6653f..5fd70020fac 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -6,7 +6,7 @@
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "tao/AnyTypeCode/Any.h"
-ACE_RCSID(BiDirectional, server, "$Id$")
+
const ACE_TCHAR *ior_output_file = 0;
int no_iterations = 10;
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index a4438816292..6bb15414370 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -11,7 +11,7 @@
#include "test_i.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(BiDirectional, test_i, "$Id$")
+
void
Callback_i::shutdown (void)
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
index 94e400077c2..8e1ad8e0a71 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
@@ -5,7 +5,7 @@
#include "Client_Task.h"
#include "MessengerC.h"
-ACE_RCSID(Muxing, Client_Task, "$Id$")
+
Client_Task::Client_Task (
CORBA::ORB_ptr corb,
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index db19df43db4..83fb42dfe08 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -22,7 +22,7 @@
#include "tao/debug.h"
#include "ace/Get_Opt.h"
-ACE_RCSID(Simple_Naming, client, "$Id$")
+
#if defined (_MSC_VER)
# pragma warning (disable : 4250)
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 6f0b6211149..601f2cac7bd 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -22,7 +22,7 @@
#include "tao/debug.h"
#include "ace/Get_Opt.h"
-ACE_RCSID(Simple_Naming, client, "$Id$")
+
#if defined (_MSC_VER)
# pragma warning (disable : 4250)
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 4ebf36f362b..91b296ff008 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -11,7 +11,7 @@
#include "ace/OS_NS_fcntl.h"
#include "ace/os_include/os_netdb.h"
-ACE_RCSID(Time_Service, Client_i, "$Id$")
+
// Constructor.
diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp
index 855b3ef59e4..463436ae292 100644
--- a/TAO/orbsvcs/tests/Time/client.cpp
+++ b/TAO/orbsvcs/tests/Time/client.cpp
@@ -3,7 +3,7 @@
#include "Client_i.h"
#include "ace/Log_Msg.h"
-ACE_RCSID(Time, client, "$Id$")
+
// This function runs the Time Service client test.
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 37d47ce97a9..670a64a50e2 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -4,7 +4,7 @@
#include "ace/INET_Addr.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID(Trading, Offer_Exporter, "$Id$")
+
TAO_Offer_Exporter::
TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 020b8a3357b..ac8b5a1014f 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -2,7 +2,7 @@
#include "Offer_Importer.h"
-ACE_RCSID(Trading, Offer_Importer, "$Id$")
+
TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
CORBA::Boolean verbose)
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 7c031fbd322..3de513e69a9 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -2,7 +2,7 @@
#include "Service_Type_Exporter.h"
-ACE_RCSID(Trading, Service_Type_Exporter, "$Id$")
+
TAO_Service_Type_Exporter::
TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index a7731f8777b..8e20d0f6d71 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -5,7 +5,7 @@
#include "Simple_Dynamic.h"
-ACE_RCSID(Trading, Simple_Dynamic, "$Id$")
+
template <class T>
TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 249235b8fb0..56617c9fdab 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -5,7 +5,7 @@
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID(Trading, TT_Info, "$Id$")
+
const char* TT_Info::INTERFACE_NAMES[] =
{
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index 967aa928e1f..e1200d35c19 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -3,7 +3,7 @@
#include "tao/Utils/ORB_Manager.h"
#include "Offer_Importer.h"
-ACE_RCSID(Trading, import_test, "$Id$")
+
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])