diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-08 19:09:19 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-08 19:09:19 +0000 |
| commit | 4f868b54247e4eb6acd5f7fb5160fff283acc3cb (patch) | |
| tree | 5c5a6816014d5b1473d3009623cf689447b3a471 /TAO | |
| parent | 5f5c0f6911ad2bbb27f7141d1033113a1a58c1d6 (diff) | |
| download | ATCD-4f868b54247e4eb6acd5f7fb5160fff283acc3cb.tar.gz | |
Zapped RCSID
Diffstat (limited to 'TAO')
214 files changed, 175 insertions, 1004 deletions
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp index a9083012a71..95c22c1a3c9 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp @@ -9,10 +9,6 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" -ACE_RCSID (CosEvent_Service, - CosEvent_Service, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index 5a5b6fb35d6..e5d5ca95c44 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -13,10 +13,6 @@ #include "orbsvcs/FtRtEvent/Utils/Log.h" #include "ace/OS_main.h" -ACE_RCSID (Event_Service, - FT_EventService, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { FT_EventService event_service; diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index fdcc8f6e225..c3fbcce5f76 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -7,11 +7,6 @@ #include "ace/SOCK_Stream.h" #include "orbsvcs/FtRtEvent/Utils/UUID.h" -ACE_RCSID (Factory_Service, - EventChannelFactory_i, - "$Id$") - - const int WAIT_FOR_REGISTRATION_TIME = 10; //sec const int MAX_ID_STRING = 10; diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index 505122dd7d9..862d36c2877 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -5,10 +5,6 @@ #include "ace/SString.h" #include "ace/Get_Opt.h" -ACE_RCSID (Factory_Service, - FTRTEC_Factory_Service, - "$Id$") - namespace { ACE_CString id, kind; ACE_TString output; diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp index 42dc5aada48..1aae289ca4e 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp @@ -11,10 +11,6 @@ /// include this file to statically linked with Transaction Depth #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" -ACE_RCSID (Gateway_Service, - FTRTEC_Gateway_Service, - "$Id$") - namespace { CORBA::ORB_var orb; FtRtecEventChannelAdmin::EventChannel_var ftec; diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp index 80dbe39c996..548a5188d00 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp @@ -5,10 +5,6 @@ #include "tao/Environment.h" #include "orbsvcs/Shutdown_Utilities.h" -ACE_RCSID (IFR_Service, - IFR_Server, - "$Id$") - class IFR_Service_Shutdown_Functor : public Shutdown_Functor { public: diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index 6b375411a02..ebcfa6933dc 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -11,10 +11,6 @@ #include "tao/ORB_Core.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (IFR_Service, - IFR_Service, - "$Id$") - IFR_Service::IFR_Service (void) { } diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp index 7b7772027f4..de1670fbbcb 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -76,10 +76,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ifr_removing_visitor.h" #include "ifr_adding_visitor.h" -ACE_RCSID (be, - be_produce, - "$Id$") - // Clean up before exit, whether successful or not. TAO_IFR_BE_Export void BE_cleanup (void) diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp index 0dca03be5c2..52c791072d7 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp @@ -12,10 +12,6 @@ #include "ifr_adding_visitor_structure.h" #include "ifr_adding_visitor_union.h" -ACE_RCSID (IFR_Service, - ifr_adding_visitor_exception, - "$Id$") - ifr_adding_visitor_exception::ifr_adding_visitor_exception ( AST_Decl *scope, bool in_reopened diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp index cc872100e0e..4ac03717560 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp @@ -13,10 +13,6 @@ #include "utl_strlist.h" #include "nr_extern.h" -ACE_RCSID (IFR_Service, - ifr_adding_visitor_operation, - "$Id$") - ifr_adding_visitor_operation::ifr_adding_visitor_operation (AST_Decl *scope) : ifr_adding_visitor (scope), index_ (0) diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp index 5d2abc71809..74a8b36f80d 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp @@ -10,10 +10,6 @@ #include "ifr_adding_visitor_structure.h" #include "ifr_adding_visitor_union.h" -ACE_RCSID (IFR_Service, - ifr_adding_visitor_structure, - "$Id$") - ifr_adding_visitor_structure::ifr_adding_visitor_structure (AST_Decl *scope) : ifr_adding_visitor (scope) { @@ -140,7 +136,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) dummyMembers.length (0); CORBA::Container_ptr current_scope = CORBA::Container::_nil (); - + if (be_global->ifr_scopes ().top (current_scope) != 0) { ACE_ERROR_RETURN (( @@ -208,7 +204,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) // entries referencing the UnionDef will stay valid. // Also we know node->ifr_fwd_added_ is true. struct_def = CORBA::StructDef::_narrow (prev_def.in ()); - + if (be_global->ifr_scopes ().push (struct_def.in ()) != 0) { ACE_ERROR_RETURN (( @@ -230,7 +226,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) ACE_TEXT (" visit_scope failed\n")), -1); } - + this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in ()); CORBA::Container_ptr used_scope = diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp index dc0e8abe288..b331f4ef0a2 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp @@ -14,10 +14,6 @@ #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" -ACE_RCSID (IFR_Service, - ifr_adding_visitor_union, - "$Id$") - ifr_adding_visitor_union::ifr_adding_visitor_union (AST_Decl *scope) : ifr_adding_visitor (scope) { @@ -340,7 +336,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) CORBA::UnionMemberSeq dummyMembers; dummyMembers.length (0); CORBA::Container_ptr current_scope = CORBA::Container::_nil (); - + if (be_global->ifr_scopes ().top (current_scope) != 0) { ACE_ERROR_RETURN (( @@ -350,7 +346,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) ACE_TEXT (" scope stack is empty\n")), -1); } - + // First create the named union without any members. union_def = current_scope->create_union ( @@ -409,7 +405,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) // Also we know node->ifr_fwd_added_ is true. union_def = CORBA::UnionDef::_narrow (prev_def.in ()); union_def->discriminator_type_def (this->ir_current_.in ()); - + if (be_global->ifr_scopes ().push (union_def.in ()) != 0) { ACE_ERROR_RETURN (( @@ -431,7 +427,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) ACE_TEXT (" visit_scope failed\n")), -1); } - + this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in ()); CORBA::Container_ptr used_scope = diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp index 0a6d92ee0c8..1dd38fffbe3 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp @@ -5,10 +5,6 @@ #include "utl_scope.h" #include "ast_root.h" -ACE_RCSID (IFR_Service, - ifr_removing_visitor, - "$Id$") - ifr_removing_visitor::ifr_removing_visitor (void) { } diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index 7cbe66f8a76..f65379351a6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -13,10 +13,6 @@ #include "ace/OS_NS_strings.h" #include "ace/Log_Msg.h" -ACE_RCSID (ImplRepo_Service, - Activator_Options, - "$Id$") - #if defined (ACE_WIN32) static const HKEY SERVICE_REG_ROOT = HKEY_LOCAL_MACHINE; // This string must agree with the one used in Activator_NT_Service.h diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index 88408d3108e..91e58910634 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -13,11 +13,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (ImplRepo_Service, - Options, - "$Id$") - - #if defined (ACE_WIN32) static const HKEY SERVICE_REG_ROOT = HKEY_LOCAL_MACHINE; // This string must agree with the one used in Locator_NT_Service.h diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index 9f150cd7159..237047cce37 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -1,9 +1,8 @@ -#include "Signal_Handler.h" +// $Id$ +#include "Signal_Handler.h" #include "orbsvcs/LoadBalancing/LB_LoadManager.h" - #include "tao/ORB_Core.h" - #include "ace/Get_Opt.h" #include "ace/OS_main.h" #include "ace/OS_NS_strings.h" @@ -14,15 +13,9 @@ # include "ace/Signal.h" #endif /* linux && ACE_HAS_THREADS */ - -ACE_RCSID (LoadBalancer, - LoadBalancer, - "$Id$") - - static const ACE_TCHAR *lm_ior_file = ACE_TEXT("lm.ior"); static int ping_timeout_milliseconds = 2000; -static int ping_interval_seconds = 0; +static int ping_interval_seconds = 0; void usage (const ACE_TCHAR * cmd) diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index 838c077e17e..25c8834dc18 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "Push_Handler.h" #include "Monitor_Signal_Handler.h" @@ -11,12 +13,6 @@ #include "ace/OS_main.h" #include "ace/OS_NS_strings.h" - -ACE_RCSID (LoadBalancer, - LoadMonitor, - "$Id$") - - static const ACE_TCHAR * location_id = 0; static const ACE_TCHAR * location_kind = 0; static const ACE_TCHAR * mtype = ACE_TEXT("CPU"); diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp index 1d333942057..985cf5267be 100644 --- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp @@ -1,10 +1,6 @@ -#include "Monitor_Signal_Handler.h" - - -ACE_RCSID (LoadBalancer, - Monitor_Signal_Handler, - "$Id$") +// $Id$ +#include "Monitor_Signal_Handler.h" TAO_LB_Monitor_Signal_Handler::TAO_LB_Monitor_Signal_Handler ( CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp index f63d8e11bc4..a11f4723eeb 100644 --- a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp @@ -1,13 +1,8 @@ -#include "Push_Handler.h" +// $Id$ +#include "Push_Handler.h" #include "tao/debug.h" - -ACE_RCSID (LoadBalancing, - Push_Handler, - "$Id$") - - TAO_LB_Push_Handler::TAO_LB_Push_Handler ( CosLoadBalancing::LoadMonitor_ptr monitor, const PortableGroup::Location & location, diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp index 24fda5bcdea..dc1f3acf257 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp @@ -1,13 +1,9 @@ -#include "Signal_Handler.h" +// $Id$ +#include "Signal_Handler.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" -ACE_RCSID (LoadBalancer, - Signal_Handler, - "$Id$") - - TAO_LB_Signal_Handler::TAO_LB_Signal_Handler (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) : diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp index e90926cd1fa..a4c7b10405d 100644 --- a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp +++ b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "PSDL_Interface_Visitor.h" #include "PSDL_Stream.h" -ACE_RCSID (PSS, - PSDL_Interface_Visitor, - "$Id$") - TAO_PSDL_Interface_Visitor::TAO_PSDL_Interface_Visitor (void) : forward_dcl_ (0), interface_name_ () diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index 84294849ce7..edea11d22e7 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -10,10 +10,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (Scheduling_Service, - Scheduling_Service, - "$Id$") - // Default Constructor. TAO_Scheduling_Service::TAO_Scheduling_Service (void) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp index 88faddf22e0..2376ebf01d5 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp @@ -1,15 +1,9 @@ -#include "ORBInitializer.h" +// $Id$ +#include "ORBInitializer.h" #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" - #include "tao/ORB_Constants.h" - -ACE_RCSID (CPU_Loaded, - ORBInitializer, - "$Id$") - - ORBInitializer::ORBInitializer (void) : load_alert_ () { diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp index 4ac4714e6a4..eb1cdae5378 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp @@ -1,14 +1,9 @@ -// // $Id$ -// + #include "Roundtrip.h" #include "ace/OS_NS_stdio.h" #include "ace/ACE.h" -ACE_RCSID(LoadBalancing, - Roundtrip, - "$Id$") - Roundtrip::Roundtrip (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), count_ (0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index de5c83a8867..ce7c5785626 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -10,10 +10,6 @@ #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(LoadBalancing, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp index 5c189e8c0af..64b74b48366 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "ORBInitializer.h" #include "ServerRequestInterceptor.h" @@ -6,10 +8,6 @@ #include "tao/ORB_Constants.h" -ACE_RCSID (LoadBalancing, - ORBInitializer, - "$Id$") - ORBInitializer::ORBInitializer (void) : load_alert_ (), interceptor_ (0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp index 686a1545115..a2d731ec00a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp @@ -4,10 +4,6 @@ #include "ace/OS_NS_sys_time.h" #include "tao/ORB_Constants.h" -ACE_RCSID (LoadBalancing, - RPS_Monitor, - "$Id$") - RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor) : location_ (1), interceptor_ (interceptor), diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp index abf3b4db251..7fba1a65442 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp @@ -1,14 +1,9 @@ -// // $Id$ -// + #include "Roundtrip.h" #include "ace/OS_NS_stdio.h" #include "ace/ACE.h" -ACE_RCSID(LoadBalancing, - Roundtrip, - "$Id$") - Roundtrip::Roundtrip (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), count_ (0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp index fa7f88a1ce8..9acee119ccd 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp @@ -1,8 +1,6 @@ -#include "ServerRequestInterceptor.h" +// $Id$ -ACE_RCSID (LoadBalancing, - ServerRequestInterceptor, - "$Id$") +#include "ServerRequestInterceptor.h" ServerRequestInterceptor::ServerRequestInterceptor (void) : request_count_ (0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp index 917377f31c8..fcbbcfcb9d4 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp @@ -11,10 +11,6 @@ #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(LoadBalancing, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index 1c9af24ed06..d0e545c7c58 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -12,10 +12,6 @@ #include "tao/ORBInitializer_Registry.h" #include "tao/Strategies/advanced_resource.h" -ACE_RCSID (LoadBalancing, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); CORBA::Float reject_threshold = 0; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp index 6bd62249ff8..bdf46f6f0bb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp @@ -14,10 +14,6 @@ #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (TAO_PERF_RTEC_Federated_Roundtrip, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int iterations = 10000; int nthreads = 1; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp index 538c0ed5471..d45fea1df25 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp @@ -1,13 +1,8 @@ -// // $Id$ -// + #include "Roundtrip.h" #include "ace/High_Res_Timer.h" -ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Baseline, - Roundtrip, - "$Id$") - Roundtrip::Roundtrip (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , gsf_ (ACE_High_Res_Timer::calibrate ()) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp index 91f36dea63a..5ae3ab1372e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp @@ -20,10 +20,6 @@ #include "ace/Barrier.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (TAO_RTEC_PERF_RTCORBA_Baseline, - client, - "$Id$") - class Roundtrip_Task : public ACE_Task_Base { public: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp index 69ea18b3656..e67561d865e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp @@ -14,10 +14,6 @@ #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int use_rt_corba = 0; int nthreads = 0; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp index 8ac7e2263f2..5aa0fa496d7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp @@ -1,14 +1,9 @@ -// // $Id$ -// + #include "Callback.h" #include "Implicit_Deactivator.h" #include "ace/OS_NS_time.h" -ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, - Callback, - "$Id$") - Callback::Callback (int iterations, PortableServer::POA_ptr poa) : sample_history_ (iterations) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp index 3bfa987de59..b4197076226 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp @@ -1,13 +1,8 @@ -// // $Id$ -// + #include "Session.h" #include "Implicit_Deactivator.h" -ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, - Session, - "$Id$") - Session::Session (Test::Callback_ptr cb, PortableServer::POA_ptr poa) : cb_ (Test::Callback::_duplicate (cb)) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp index 20de05953e5..b661e16884b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp @@ -1,14 +1,9 @@ -// // $Id$ -// + #include "Session_Factory.h" #include "Session.h" #include "Servant_var.h" -ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, - Session_Factory, - "$Id$") - Session_Factory::Session_Factory (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp index 21ba728121e..947b298cb46 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp @@ -26,10 +26,6 @@ #include "ace/Barrier.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline, - client, - "$Id$") - class Roundtrip_Task : public ACE_Task_Base { public: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp index 8ca08730ef7..16bfdb13969 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp @@ -17,10 +17,6 @@ #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int use_rt_corba = 0; int nthreads = 0; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index 1c7b871c3fb..0b0b7e4cbe7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -19,10 +19,6 @@ #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (TAO_PERF_RTEC_Roundtrip, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int use_rt_corba = 0; int nthreads = 0; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp index a76fc1f6064..33c6ed0bd3e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp @@ -15,10 +15,6 @@ #include "ace/OS_NS_unistd.h" #include "tao/orbconf.h" -ACE_RCSID (TAO_RTEC_PERF_TCP_Baseline, - client, - "$Id$") - ACE_TCHAR const *hi_endpoint = ACE_TEXT ("localhost:12345"); ACE_TCHAR const *lo_endpoint = ACE_TEXT ("localhost:23456"); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp index d2ec3272b97..e209a072994 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp @@ -11,10 +11,6 @@ #include "ace/TP_Reactor.h" #include "ace/Get_Opt.h" -ACE_RCSID (TAO_PERF_RTEC_TCP_Baseline, - server, - "$Id$") - int use_rt = 0; int nthreads = 1; ACE_TCHAR const * hi_endpoint = ACE_TEXT ("localhost:12345"); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp index 402c9187779..957979b3786 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp @@ -13,10 +13,6 @@ #include "Client_Group.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - Client_Group, - "$Id$") - void Client_Group::init (CORBA::Long experiment_id, CORBA::Long base_event_type, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp index 1e78be0907e..dfd42c0630b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp @@ -11,10 +11,6 @@ #include "ace/Log_Msg.h" #include "ace/OS.h" -ACE_RCSID (TAO_PERF_RTEC, - Client_Options, - "$Id$") - Client_Options::Client_Options (int &argc, ACE_TCHAR *argv[]) : ior (ACE_TEXT("file://test.ior")) , iterations (1000) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp index d2c71bd2cb9..f0762588e6f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp @@ -13,10 +13,6 @@ #include "Client_Pair.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - Client_Pair, - "$Id$") - void Client_Pair::init (CORBA::Long experiment_id, CORBA::Long base_event_type, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp index 9045c8ee020..6d588f69a1c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp @@ -11,10 +11,6 @@ #include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (TAO_PERF_RTEC, - Consumer, - "$Id$") - Consumer::Consumer (CORBA::Long experiment_id, CORBA::Long event_type, CORBA::ULong iterations, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index 189ae8297ee..42e5a867ce4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -18,10 +18,6 @@ #include "ace/Basic_Stats.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (TAO_RTEC_Perf, - Control, - "$Id$") - Control::Control (size_t peers_expected, size_t iterations, int do_dump_history, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp index 6657f5294fd..78ee7c5fa8d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp @@ -12,10 +12,6 @@ #include "EC_Destroyer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - EC_Destroyer, - "$Id$") - EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec) : ec_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp index c97cc03f939..ce11922f158 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp @@ -10,10 +10,6 @@ #include "Auto_Disconnect.h" #include "Implicit_Deactivator.h" -ACE_RCSID (TAO_RTEC_Perf, - Loopback, - "$Id$") - Loopback::Loopback (CORBA::Long experiment_id, CORBA::Long base_event_type, PortableServer::POA_ptr supplier_poa, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp index 2fd3d0911e3..20f6b7d5a07 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp @@ -10,10 +10,6 @@ #include "Implicit_Deactivator.h" #include "orbsvcs/Event_Service_Constants.h" -ACE_RCSID (PERF_RTEC, - Loopback_Consumer, - "$Id$") - Loopback_Consumer:: Loopback_Consumer (CORBA::Long experiment_id, CORBA::Long event_type, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp index cde25535480..96cb7b8f762 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp @@ -13,10 +13,6 @@ #include "Loopback_Pair.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - Loopback_Pair, - "$Id$") - void Loopback_Pair::init (CORBA::Long experiment_id, CORBA::Long base_event_type, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp index 02a00e848fa..4e9560dd25b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp @@ -9,10 +9,6 @@ #include "Loopback_Supplier.h" #include "Implicit_Deactivator.h" -ACE_RCSID (TAO_PERF_RTEC, - Loopback_Supplier, - "$Id$") - Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id, CORBA::Long response_type, PortableServer::POA_ptr poa) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp index 9150dbcf94c..ed37ad358a2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp @@ -12,10 +12,6 @@ #include "ORB_Holder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - ORB_Holder, - "$Id$") - ORB_Holder::ORB_Holder (int &argc, ACE_TCHAR *argv[], const char *orb_id) : orb_ (CORBA::ORB_init (argc, argv, orb_id)) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp index 2071b0a718e..820e0ec31fa 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp @@ -11,6 +11,3 @@ #include "ORB_Shutdown.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - ORB_Shutdown, - "$Id$") diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp index 4723f9ae360..920f5c3fcb1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp @@ -12,10 +12,6 @@ #include "ORB_Task.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - ORB_Task, - "$Id$") - ORB_Task::ORB_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp index d4e996064cd..2a130c4e3a9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp @@ -12,10 +12,6 @@ #include "ORB_Task_Activator.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - ORB_Task_Activator, - "$Id$") - ORB_Task_Activator::~ORB_Task_Activator (void) { if (this->task_ == 0) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp index 4ca0fac10f4..8aeefc70de5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp @@ -18,10 +18,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Gateway_IIOP.h" -ACE_RCSID (TAO_RTEC_Perf, - Peer_Base, - "$Id$") - Peer_Base::Peer_Base (CORBA::ORB_ptr orb, RTServer_Setup &rtserver_setup) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp index cb603af9459..87fb9af468f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp @@ -15,10 +15,6 @@ #include "PriorityBand_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - PriorityBand_Setup, - "$Id$") - PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb, const RTCORBA_Setup &rtcorba_setup) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp index 6c49ea4b684..3c4f495bb3a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp @@ -16,10 +16,6 @@ #include "RTCORBA_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - RTCORBA_Setup, - "$Id$") - RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb, const RT_Class &rtclass, int nthreads) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp index a9bc97712f4..f95f88653a4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp @@ -16,10 +16,6 @@ #include "RTClient_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - RTClient_Setup, - "$Id$") - RTClient_Setup::RTClient_Setup (int use_rt_corba, CORBA::ORB_ptr orb, const RT_Class &rt_class, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp index 6b843e524bf..53f0bdce60b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp @@ -15,10 +15,6 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (TAO_PERF_RTEC, - RTEC_Initializer, - "$Id$") - TAO_EC_Event_Channel * RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa, PortableServer::POA_ptr supplier_poa, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp index 985b07682cf..a43595cff10 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp @@ -17,10 +17,6 @@ #include "RTPOA_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - RTPOA_Setup, - "$Id$") - RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb, const RTCORBA_Setup &rtcorba_setup) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp index 1ea7d0eee78..df2bef5b36f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp @@ -16,10 +16,6 @@ #include "RTServer_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - RTServer_Setup, - "$Id$") - RTServer_Setup::RTServer_Setup (int use_rt_corba, CORBA::ORB_ptr orb, const RT_Class &rt_class, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp index 65abada52e8..81f33b8e8ad 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp @@ -15,10 +15,6 @@ #include "RT_Class.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - RT_Class, - "$Id$") - RT_Class::RT_Class (void) : prc_sched_class_ (ACE_SCHED_FIFO) , thr_sched_class_ (THR_SCHED_FIFO) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp index ef58db60e53..2bccf6c5217 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp @@ -13,10 +13,6 @@ #include "ace/Barrier.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (TAO_PERF_RTEC, - Send_Task, - "$Id$") - Send_Task::Send_Task (void) : iterations_ (0) , period_in_usecs_ (0) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp index 6b8779e632e..c27da909e78 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp @@ -12,10 +12,6 @@ #include "Send_Task_Stopper.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - Send_Task_Stopper, - "$Id$") - Send_Task_Stopper::~Send_Task_Stopper (void) { if (this->task_ == 0) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp index 4763b3abcd1..cdb96845dd8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp @@ -9,10 +9,6 @@ #include "Supplier.h" #include "Implicit_Deactivator.h" -ACE_RCSID (TAO_PERF_RTEC, - Supplier, - "$Id$") - Supplier::Supplier (CORBA::Long experiment_id, CORBA::Long event_type, CORBA::Long event_range, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp index 7ef6f47af0b..0bcb54cf650 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp @@ -14,10 +14,6 @@ #include "SyncScope_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - SyncScope_Setup, - "$Id$") - SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb, Messaging::SyncScope value) { diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp index b4bcbcaeda5..b5d5b8e6d6e 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp @@ -1,3 +1,4 @@ +// $Id$ // -*- C++ -*- #include "ServerRequest_Interceptor.h" @@ -11,10 +12,6 @@ #include "ace/OS_NS_string.h" #include "Hello.h" -ACE_RCSID (FaultTolerance, - TAO249_ServerRequest_Interceptor, - "$Id$") - TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void) : orb_ (0), client_id_ (0) diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp index a98700b1e51..655ddbf58fb 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ServerRequest_Interceptor2.h" #include "orbsvcs/FT_CORBA_ORBC.h" @@ -14,10 +15,6 @@ #include "Hello.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (FaultTolerance, - TAO249_ServerRequest_Interceptor2, - "$Id$") - TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void) : orb_ (0), client_id_ (0) diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp index 8c84289abfd..3453ac0d035 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp @@ -11,10 +11,6 @@ #include "tao/PI/PI.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp index 55ce7d5c579..d678aaedb73 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp @@ -9,10 +9,6 @@ #include "tao/PI/PI.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT(""); CORBA::ULong my_id_number = 0; diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp index 7d862a52fd9..d5170de178d 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp @@ -1,6 +1,4 @@ -// // $Id$ -// #include "TestImpl.h" #include "ace/Get_Opt.h" @@ -9,10 +7,6 @@ #include "tao/IORTable/IORTable.h" #include "Server_Task.h" -ACE_RCSID (Hello, - server, - "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp index ae73a73eefd..567d1fd0e70 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp @@ -1,11 +1,6 @@ -// // $Id$ -// -#include "NsShutdown.h" -ACE_RCSID(Hello, - NsShutdown, - "$Id$") +#include "NsShutdown.h" NsShutdown::NsShutdown (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp index 62d2fa1b2ec..e4bc728b877 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ServerRequest_Interceptor.h" #include "orbsvcs/FT_CORBA_ORBC.h" @@ -11,10 +12,6 @@ #include "ace/OS_NS_string.h" #include "Hello.h" -ACE_RCSID (FaultTolerance, - TAO249_ServerRequest_Interceptor, - "$Id$") - TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void) : orb_ (0), client_id_ (0) diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp index cb35a50ec49..3cff3e94133 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp @@ -11,10 +11,6 @@ #include "tao/PI/PI.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp index 95d61429e99..d124faebff9 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp index ae73a73eefd..567d1fd0e70 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp @@ -1,11 +1,6 @@ -// // $Id$ -// -#include "NsShutdown.h" -ACE_RCSID(Hello, - NsShutdown, - "$Id$") +#include "NsShutdown.h" NsShutdown::NsShutdown (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp index 768850a5536..95e4325db81 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp @@ -1,17 +1,11 @@ -// // $Id$ -// + #include "Server_Task.h" #include "TestS.h" #include "Hello.h" #include "ace/Manual_Event.h" -ACE_RCSID(Collocated_Test, - Server_Task, - "$Id$") - - Server_Task::Server_Task (CosNaming::NamingContext_ptr root_context, CORBA::ORB_ptr sorb, ACE_Manual_Event &me, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 4853c5b86f0..e2bde895acb 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -7,10 +7,6 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" -ACE_RCSID (CEC_Tests, - Disconnect, - "$Id$") - static void run_test (PortableServer::POA_ptr poa, int use_callbacks); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index d321d47a740..b17aca95c9e 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -7,10 +7,6 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" -ACE_RCSID (CEC_Tests, - MT_Disconnect, - "$Id$") - static void run_test (PortableServer::POA_ptr poa, int use_callbacks); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index 1a73a9003b2..d3d9825a637 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -6,10 +6,6 @@ #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (CEC_Tests_Basic, - Pull_Push_Event, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index 7e1783336a1..415f034369c 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -6,10 +6,6 @@ #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (CEC_Tests_Basic, - Push_Event, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index 75f4e5fcd15..5f04dc9119c 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -7,10 +7,6 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (CEC_Tests, - Random, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp index 02f0eb83977..fa4eba583c6 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -5,10 +5,6 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" -ACE_RCSID( CEC_Tests_Basic, - Shutdown, - "$Id$") - static void run_test (PortableServer::POA_ptr poa, int with_callbacks); diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index e2dad9a73b6..ea62af82c6a 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -18,10 +18,6 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Custom_Marshal, - ECM_Consumer, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp index 723910ec736..f4bbba4a267 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp @@ -4,10 +4,6 @@ #include "AddrServer.h" #include "ace/INET_Addr.h" -ACE_RCSID(EC_MT_Mcast, - AddrServer, - "$Id$") - AddrServer::AddrServer (const ACE_INET_Addr& addr) { #if defined (ACE_HAS_IPV6) diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp index 2d48ae0266f..4f6034189b0 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp @@ -5,10 +5,6 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -ACE_RCSID(EC_MT_Mcast, - Consumer, - "$Id$") - Consumer::Consumer (void) : event_count_ (0) { diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index dda31a733bb..a73d888a15c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -16,10 +16,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_MT_Mcast, - MCast, - "$Id$") - const ACE_TCHAR *udp_mcast_address = ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001"); diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp index ff590115fb7..ad2d5afda4c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp @@ -5,10 +5,6 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -ACE_RCSID(EC_MT_Mcast, - Supplier, - "$Id$") - Supplier::Supplier (void) { } diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 75d1ae02c5d..4b165cc3bb2 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -23,10 +23,6 @@ #include "EC_Mcast.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (EC_Mcast, - EC_Mcast, - "$Id$") - ECM_Driver::ECM_Driver (void) : event_period_ (250000), event_count_ (100), diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index ce33914cfba..343347d6b78 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -27,10 +27,6 @@ # include <sys/lwp.h> /* for _lwp_self */ #endif /* sun */ -ACE_RCSID (EC_Multiple, - EC_Multiple, - "$Id$") - Test_ECG::Test_ECG (void) : lcl_name_ ("Test_ECG"), rmt_name_ (""), diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 3357ec50f68..99b7357252a 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -16,10 +16,6 @@ #include "ace/ACE.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Throughput, - ECT_Supplier, - "$Id$") - Test_Supplier::Test_Supplier (ECT_Driver *driver) : driver_ (driver), supplier_ (this), diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 3cafc9acc7f..09ff18e842e 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -16,10 +16,6 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Throughput, - ECT_Supplier_Driver, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 35422a94695..bc35adba8ca 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -10,10 +10,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Atomic_Reconnect, - "$Id$") - const int event_type = 20; const int event_source = 10; diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 4eb3e8d4968..e12521fccba 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -8,10 +8,6 @@ #include "ace/Arg_Shifter.h" #include "ace/INET_Addr.h" -ACE_RCSID (EC_Tests_Basic, - BCast, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index 29ab5292c67..86be16f5328 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -8,10 +8,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Bitmask, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index e0297bb91d2..1607d15d60c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -7,10 +7,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Complex, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index 52b1b07b4a9..0714f229a4a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -10,10 +10,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Control, - "$Id$") - const int event_type = 20; const int event_source = 10; diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index 87a6716299c..cb3153210b4 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -8,10 +8,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Disconnect, - "$Id$") - static void run_test (PortableServer::POA_ptr poa, int use_callbacks); diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index 8f11228326e..f112f9f6d9a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -8,10 +8,6 @@ #include "orbsvcs/Event/EC_Default_Factory.h" #include "orbsvcs/Event/EC_Gateway_IIOP.h" -ACE_RCSID (EC_Tests, - Gateway, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index fa4957da024..a447a99d4a2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -9,10 +9,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - MT_Disconnect, - "$Id$") - static void run_test (PortableServer::POA_ptr poa, int use_callbacks); diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index 0de338ee369..0ec7aaa6dfe 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -8,10 +8,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Negation, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 1b0a42e01f1..8696235debf 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -8,10 +8,6 @@ #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" -ACE_RCSID (EC_Tests_Basic, - Observer, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 8cba24c7e04..77a600c59ef 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -9,10 +9,6 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Tests, - Random, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index bf88d4568a3..31e4d1de658 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -7,10 +7,6 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" -ACE_RCSID (EC_Tests_Basic, - Reconnect, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index 21978e810d8..0dd7e45e059 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -8,12 +8,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Timeout, - "$Id$") - -// **************************************************************** - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index 366be7854f9..3dc6d2d4c6a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -7,10 +7,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Wildcard, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 1b1145d67dc..91e0b6738a3 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -8,10 +8,6 @@ #include "ace/High_Res_Timer.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (EC_Tests_Performance, - Connect, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index 6b240c1f941..56f18c95d59 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -8,10 +8,6 @@ #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" -ACE_RCSID (EC_Tests_Performance, - Inversion, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index c3babe4dd4e..dddde59bcfa 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -6,10 +6,6 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" -ACE_RCSID (EC_Tests_Performance, - Throughput, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp index 362b64604a6..89dd8c30951 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp @@ -6,10 +6,6 @@ #include "TestC.h" -ACE_RCSID (EC_Examples, - Consumer, - "$Id$") - Consumer::Consumer (bool valuetype) : event_count_ (0), valuetype_ (valuetype) diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp index 72c83e70cdc..1138ba409f4 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp @@ -4,10 +4,6 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - Supplier::Supplier (bool valuetype) : valuetype_ (valuetype), event_count_ (0) { } diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp index 0eac152ebb1..a1423099d47 100644 --- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp @@ -1,6 +1,5 @@ // $Id$ - #include "Consumer.h" #include "AddrServer.h" #include "orbsvcs/Event_Service_Constants.h" @@ -14,10 +13,6 @@ #include "ace/OS_NS_unistd.h" #include "TestC.h" -ACE_RCSID (EC_Examples, - MCast, - "$Id$") - const ACE_TCHAR *udp_mcast_address = ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001"); diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp index c0ac8a4a6f5..0299d102065 100644 --- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp @@ -1,6 +1,5 @@ // $Id$ - #include "Supplier.h" #include "AddrServer.h" #include "orbsvcs/Event_Service_Constants.h" @@ -13,10 +12,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Examples, - MCast, - "$Id$") - const ACE_TCHAR *udp_mcast_address = ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001"); diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index 8494bae5c9a..afc80cd72de 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -6,10 +6,6 @@ #include "tao/debug.h" -ACE_RCSID (EC_Tests, - EC_Consumer, - "$Id$") - EC_Consumer::EC_Consumer (EC_Driver *driver, void *cookie) : driver_ (driver), diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 0ce3c6e4be9..35da042eb61 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -4,10 +4,6 @@ #include "orbsvcs/Event_Utilities.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Tests, - EC_Count_Supplier, - "$Id$") - EC_Counting_Supplier::EC_Counting_Supplier (void) : event_count (0), disconnect_count (0), diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index 7e68e48dc01..d7f95265e8d 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -7,10 +7,6 @@ #include "tao/debug.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Tests, - EC_Supplier, - "$Id$") - EC_Supplier::EC_Supplier (EC_Driver *driver, void* cookie) : driver_ (driver), diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index 742f0526599..453afb72657 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -6,10 +6,6 @@ #include "tao/IORTable/IORTable.h" #include "orbsvcs/CosNamingC.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp index 504f91cd53d..3aca07a2229 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/Argv_Type_Converter.h" -ACE_RCSID(Bug_689_Regression, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior"); int diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp index 43174ea972c..281198fb5f3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp @@ -8,10 +8,6 @@ #include "bug_689_regression_i.h" -ACE_RCSID (Bug_689_Regression, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); int diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp index 948d9e7102f..b54d49e1e3d 100755 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp @@ -9,9 +9,6 @@ #include "ORB_Task.h" #include "tao/Environment.h" -ACE_RCSID (ReconnectServer, - ORB_Task, "$Id$") - ORB_Task::ORB_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp index 7bfd7b75f2f..dec10fef0a1 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp @@ -4,10 +4,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (ImplRepo, - airplane_client, - "$Id$") - // This function runs the test. int diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp index 34a220acb2b..a10f3868cab 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp @@ -5,13 +5,8 @@ #include "tao/debug.h" #include "ace/OS_NS_time.h" -ACE_RCSID (ImplRepo, - airplane_i, - "$Id$") - // Constructor - - Airplane_i::Airplane_i () +Airplane_i::Airplane_i () { // Seed the random number generator ACE_OS::srand (static_cast<u_int> (ACE_OS::time (0L))); diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp index 55b71a4297e..a7323cc4414 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp @@ -2,10 +2,6 @@ #include "airplane_server_i.h" -ACE_RCSID (ImplRepo, - airplane_server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index 9ed10ba34ef..58dd5d3959e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -12,10 +12,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (ImplRepo, - airplane_server_i, - "$Id$") - // The server name of the Aiprlane Server const char SERVER_NAME[] = "airplane_server"; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp index 2951b0b1106..dc1cbfb2509 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp @@ -4,10 +4,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (ImplRepo, - nestea_client, - "$Id$") - // This function runs the test. int diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp index e50a8aa33f6..c579d5e1fc3 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp @@ -3,10 +3,6 @@ #include "ifr_dii_client.h" -ACE_RCSID (Application_Test, - client, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index 06b8431f84c..34200e8cd66 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -4,10 +4,6 @@ #include "ifr_dii_client.h" #include "ace/Get_Opt.h" -ACE_RCSID (Application_Test, - ifr_dii_client, - "$Id$") - IFR_DII_Client::IFR_DII_Client (void) : namespace_name (CORBA::string_dup ("warehouse")), interface_name (CORBA::string_dup ("inventory")), @@ -88,7 +84,7 @@ IFR_DII_Client::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt opts (argc, argv, ACE_TEXT("k:nd")); int c; - + while ((c = opts ()) != -1) switch (c) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp index 08a803ea8d8..f8ba51d221b 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp @@ -5,12 +5,6 @@ #include "ace/SString.h" - -ACE_RCSID (Application_Test, - test_i, - "$Id$") - - CORBA::Boolean inventory_i::getCDinfo (const char * artist, char *& title, diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp index f43536c1139..a4e9f470c67 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp @@ -3,10 +3,6 @@ #include "idl3_client.h" -ACE_RCSID (Application_Test, - client, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp index 28de390cbe2..5bb899c36d5 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp @@ -6,10 +6,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Application_Test, - ifr_dii_client, - "$Id$") - // All the magic quantities are here at the top. const char *COMPONENT_ID = "IDL:mod/test_component:1.0"; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp index 9709b6e5e76..261138e3244 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp @@ -6,10 +6,6 @@ #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/ORB.h" -ACE_RCSID (IFR_Inheritance_Test, - main, - "$Id$") - void printContents (const CORBA::ContainedSeq& cont) { try diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index afb0049f33a..dd6fac0acb6 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -9,10 +9,6 @@ #include "ace/Get_Opt.h" #include "ace/SString.h" -ACE_RCSID (IFR_Test, - Admin_Client, - "$Id$") - Admin_Client::Admin_Client (void) : debug_ (0), all_tests_ (1), diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp index 3c1af54c6b7..eec00db242d 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp @@ -3,10 +3,6 @@ #include "Admin_Client.h" -ACE_RCSID (IFR_Test, - client, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Admin_Client admin_client; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp index bf95c26b6c8..8369b482eb0 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -8,10 +8,6 @@ #include "ace/Throughput_Stats.h" #include "ace/Sample_History.h" -ACE_RCSID (Latency_Test, - Latency_Query_Client, - "$Id$") - const CORBA::ULong DEFAULT_NUMCALLS = 20000; Latency_Query_Client::Latency_Query_Client (void) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp index 3561ace0f15..4e919008a6b 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp @@ -3,17 +3,12 @@ #include "Latency_Query_Client.h" -ACE_RCSID (Latency__Test, - client, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Latency_Query_Client client; - int retval = client.init (argc, - argv); + int retval = client.init (argc, argv); if (retval == -1) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp index 77a52ea4f66..e55bfc1f40e 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp @@ -3,10 +3,6 @@ #include "Ptest.h" -ACE_RCSID (Persistence_Test, - test, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Ptest ptest; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp index f6b1b39ac23..8d733337167 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp @@ -1,12 +1,8 @@ +// $Id$ + #include "Basic.h" #include "LB_server.h" - -ACE_RCSID (Application_Controlled, - Basic, - "$Id$") - - Basic::Basic (CORBA::Object_ptr object_group, CosLoadBalancing::LoadManager_ptr lm, CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp index aedbaa8910d..abe6bf3f1a4 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp @@ -1,13 +1,11 @@ +// $Id$ + #include "LB_server.h" #include "Basic.h" #include "TestC.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Application_Controlled, - LB_server, - "$Id$") - LB_server::LB_server (int argc, ACE_TCHAR **argv) : argc_ (argc) , argv_ (argv) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp index 738a237d01f..b0c229bc527 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID (Application_Controlled, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior"); int diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp index d03bc0f5895..88bc5f6819e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "LB_server.h" #include "Basic.h" -ACE_RCSID (Application_Controlled, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp index e876ece085c..2a897201d84 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp @@ -1,12 +1,9 @@ +// $Id$ + #include "Basic.h" #include "LB_server.h" #include "ace/OS.h" - -ACE_RCSID (DeadMemberDetection_App_Ctrl, - Basic, - "$Id$") - extern int pong_delay; Basic::Basic (int server_id) @@ -29,7 +26,7 @@ Basic::Basic (CORBA::Object_ptr object_group, /// Default _non_existent: always returns false. -CORBA::Boolean +CORBA::Boolean Basic::_non_existent (void) { if (pong_delay > 0) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp index 3841887fb5f..c0aede26ecc 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp @@ -1,13 +1,11 @@ +// $Id$ + #include "LB_server.h" #include "Basic.h" #include "TestC.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (DeadMemberDetection_App_Ctrl, - LB_server, - "$Id$") - extern const ACE_TCHAR *group_file; extern const ACE_TCHAR *group_ior; extern const ACE_TCHAR *direct_obj_file; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp index 5d68484928e..619fd6688cb 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp @@ -1,12 +1,10 @@ +// $Id$ + #include "TestC.h" #include "ace/Get_Opt.h" #include "ace/OS.h" #include "ace/Vector_T.h" -ACE_RCSID (DeadMemberDetection_App_Ctrl, - client, - "$Id$") - const ACE_TCHAR *group_file = ACE_TEXT("group.ior"); const ACE_TCHAR *group_ior = ACE_TEXT("file://group.ior"); const ACE_TCHAR *direct_obj_file = ACE_TEXT("direct_obj2.ior"); @@ -52,8 +50,8 @@ parse_args (int argc, ACE_TCHAR *argv[]) -int dead_member_rr_test (CORBA::ORB_ptr orb, - const ACE_TCHAR *group_ior, +int dead_member_rr_test (CORBA::ORB_ptr orb, + const ACE_TCHAR *group_ior, Test::Basic_ptr direct_basic) { int status = 0; @@ -92,7 +90,7 @@ int dead_member_rr_test (CORBA::ORB_ptr orb, basic->exit (); } - else + else direct_basic->exit (); if (iter == 3) @@ -125,8 +123,8 @@ int dead_member_rr_test (CORBA::ORB_ptr orb, } -int hang_member_rr_test (CORBA::ORB_ptr orb, - const ACE_TCHAR *group_ior, +int hang_member_rr_test (CORBA::ORB_ptr orb, + const ACE_TCHAR *group_ior, Test::Basic_ptr /*direct_basic*/) { int status = 0; @@ -186,7 +184,7 @@ int hang_member_rr_test (CORBA::ORB_ptr orb, catch (const ::CORBA::COMM_FAILURE& /*ex*/) { // It is possible that the LB has not detected the server 2 exit as it hangs - // and returns the reference to the hang server(server 2) for 4th iteration. + // and returns the reference to the hang server(server 2) for 4th iteration. // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions. if (iter != 3) { @@ -214,8 +212,8 @@ int hang_member_rr_test (CORBA::ORB_ptr orb, } -int dead_member_rand_test (CORBA::ORB_ptr orb, - const ACE_TCHAR *group_ior, +int dead_member_rand_test (CORBA::ORB_ptr orb, + const ACE_TCHAR *group_ior, Test::Basic_ptr /*direct_basic*/) { int status = 0; @@ -247,7 +245,7 @@ int dead_member_rand_test (CORBA::ORB_ptr orb, ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Client request handled by object at <%s>\n", the_string.in ())); - // Any picked member will not be picked again since they exit right after + // Any picked member will not be picked again since they exit right after // this request. for (size_t j = 0; j < locations.size (); ++j) { @@ -255,8 +253,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb, { status = 1; } - } - + } + if (status == 0) locations.push_back (the_string.in ()); @@ -291,8 +289,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb, } -int hang_member_rand_test (CORBA::ORB_ptr orb, - const ACE_TCHAR *group_ior, +int hang_member_rand_test (CORBA::ORB_ptr orb, + const ACE_TCHAR *group_ior, Test::Basic_ptr /*direct_basic*/) { int status = 0; @@ -330,11 +328,11 @@ int hang_member_rand_test (CORBA::ORB_ptr orb, { status = 1; } - } - + } + if (status == 0) locations.push_back (the_string.in ()); - + if (iter == 3) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Request %d should not complete\n"), iter)); @@ -359,7 +357,7 @@ int hang_member_rand_test (CORBA::ORB_ptr orb, catch (const ::CORBA::COMM_FAILURE& /*ex*/) { // It is possible that the LB has not detected the server 2 exit as it hangs - // and returns the reference to the hang server(server 2) for 4th iteration. + // and returns the reference to the hang server(server 2) for 4th iteration. // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions. if (iter != 3) { @@ -439,7 +437,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) else status = dead_member_rand_test (orb.in (), group_ior, direct_basic.in ()); else - { + { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Invalid strategy \n"))); status = 1; } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp index c3a2cc28124..ac22738cf2f 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp @@ -1,13 +1,11 @@ +// $Id$ + #include "LB_server.h" #include "Basic.h" #include "ace/Get_Opt.h" #include "ace/OS.h" #include "ace/Task.h" -ACE_RCSID (DeadMemberDetection_App_Ctrl, - server, - "$Id$") - const ACE_TCHAR *group_file = ACE_TEXT("group.ior"); const ACE_TCHAR *group_ior = ACE_TEXT("file://group.ior"); @@ -82,7 +80,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; const char ** location = 0; - + switch (server_id) { case 1: @@ -115,7 +113,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server_id), 1); PortableServer::ServantBase_var owner_transfer(basic_servant); - + if (lb_server.register_servant (basic_servant, *location) == -1) { (void) lb_server.destroy (); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp index 66afe43d0b1..9f58115f761 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp @@ -1,12 +1,10 @@ +// $Id$ + #include "Factory.h" #include "Simple.h" #include "TestC.h" -ACE_RCSID (DeadMemberDetection_Inf_Ctrl, - Factory, - "$Id$") - Factory::Factory (int id) : id_ (id) { @@ -95,7 +93,7 @@ Factory::delete_object ( } -CORBA::Object_ptr +CORBA::Object_ptr Factory::get_object () const { return this->obj_.in (); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp index dea1b129921..24553e7f9eb 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp @@ -1,9 +1,6 @@ // -*- C++ -*- +// $Id$ #include "Factory_Map.h" -ACE_RCSID (DeadMemberDetection_Inf_Ctrl, - Factory_Map, - "$Id$") - diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp index 1dbc2b3c9bd..3b9f3ed923c 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp @@ -1,5 +1,4 @@ +// $Id$ + #include "Factory_Struct.h" -ACE_RCSID (DeadMemberDetection_Inf_Ctrl, - Factory_Struct, - "$Id$") diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp index a2ce2a65d0e..46c36bbfabc 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "LB_Factory_Server.h" #include "Simple.h" #include "Factory.h" @@ -6,10 +8,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" -ACE_RCSID (DeadMemberDetection_Inf_Ctrl, - LB_Factory_Server, - "$Id$") - const ACE_TCHAR* factory1_file = ACE_TEXT ("factory1.ior"); const ACE_TCHAR* factory2_file = ACE_TEXT ("factory2.ior"); const ACE_TCHAR* factory3_file = ACE_TEXT ("factory3.ior"); @@ -164,16 +162,16 @@ LB_Factory_Server::init (void) " (%P|%t) Unable to get Load Manager Reference\n"), 1); - + Factory* servant = new Factory(server_id_); PortableServer::ServantBase_var owner_transfer(servant); obj = servant->_this (); - PortableGroup::GenericFactory_var factory_obj + PortableGroup::GenericFactory_var factory_obj = PortableGroup::GenericFactory::_narrow (obj.in ()); CORBA::String_var ior = this->orb_->object_to_string (factory_obj.in ()); - this->write_ior_to_file (ior.in (), + this->write_ior_to_file (ior.in (), ACE_TEXT_ALWAYS_CHAR (this->factory_ior_file_.c_str ())); if (this->server_id_ == 2) @@ -188,7 +186,7 @@ LB_Factory_Server::init (void) CORBA::Object_var obj = simple_servant->_this (); CORBA::String_var ior = this->orb_->object_to_string (obj.in ()); - this->write_ior_to_file (ior.in (), + this->write_ior_to_file (ior.in (), ACE_TEXT_ALWAYS_CHAR (direct_obj2_file)); } } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp index 0a9e7731251..42fe4d1e0d8 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "LB_server.h" #include "Simple.h" #include "Factory.h" @@ -6,10 +8,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" -ACE_RCSID (DeadMemberDetection_Inf_Ctrl, - LB_server, - "$Id$") - const char *location1 = "MyLocation 1"; const char *location2 = "MyLocation 2"; const char *location3 = "MyLocation 3"; @@ -184,15 +182,15 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2, const char const char *repository_id = "IDL:Test/Simple:1.0"; CORBA::Object_var obj = this->orb_->string_to_object (factory1_ior); - PortableGroup::GenericFactory_var factory1_obj = + PortableGroup::GenericFactory_var factory1_obj = PortableGroup::GenericFactory::_narrow (obj.in ()); obj = this->orb_->string_to_object (factory2_ior); - PortableGroup::GenericFactory_var factory2_obj = + PortableGroup::GenericFactory_var factory2_obj = PortableGroup::GenericFactory::_narrow (obj.in ()); obj = this->orb_->string_to_object (factory3_ior); - PortableGroup::GenericFactory_var factory3_obj = + PortableGroup::GenericFactory_var factory3_obj = PortableGroup::GenericFactory::_narrow (obj.in ()); PortableGroup::FactoriesValue factory_infos; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp index 37b7d6b5046..2f944107d78 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp @@ -1,11 +1,8 @@ +// $Id$ + #include "Simple.h" #include "ace/OS.h" - -ACE_RCSID (DeadMemberDetection_Inf_Ctrl, - Simple, - "$Id$") - extern int pong_delay; const char *location1 = "MyLocation 1"; @@ -18,7 +15,7 @@ Simple::Simple (int server_id) } /// Default _non_existent: always returns false. -CORBA::Boolean +CORBA::Boolean Simple::_non_existent (void) { if (pong_delay > 0) @@ -53,7 +50,7 @@ Simple::get_string (void) } } -void +void Simple::exit (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Simple::exit server %d exit \n", diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp index 065d913e181..fd86fa9214c 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp @@ -1,14 +1,10 @@ +// $Id$ + #include "TestC.h" #include "ace/Get_Opt.h" #include "ace/OS.h" #include "ace/Vector_T.h" - -ACE_RCSID (DeadMemberDetection_Inf_Ctrl, - client, - "$Id$") - - const ACE_TCHAR* group_ior = ACE_TEXT ("file:://group.ior"); const ACE_TCHAR* direct_obj2_ior = ACE_TEXT ("file://direct_obj2.ior"); @@ -50,8 +46,8 @@ parse_args (int argc, ACE_TCHAR *argv[]) } -int dead_member_rr_test (CORBA::ORB_ptr orb, - const ACE_TCHAR* group_ior, +int dead_member_rr_test (CORBA::ORB_ptr orb, + const ACE_TCHAR* group_ior, Test::Simple_ptr direct_simple) { int status = 0; @@ -90,7 +86,7 @@ int dead_member_rr_test (CORBA::ORB_ptr orb, simple->exit (); } - else + else direct_simple->exit (); if (iter == 3) @@ -123,8 +119,8 @@ int dead_member_rr_test (CORBA::ORB_ptr orb, } -int hang_member_rr_test (CORBA::ORB_ptr orb, - const ACE_TCHAR* group_ior, +int hang_member_rr_test (CORBA::ORB_ptr orb, + const ACE_TCHAR* group_ior, Test::Simple_ptr /*direct_simple*/) { int status = 0; @@ -185,7 +181,7 @@ int hang_member_rr_test (CORBA::ORB_ptr orb, catch (const ::CORBA::COMM_FAILURE& /*ex*/) { // It is possible that the LB has not detected the server 2 exit as it hangs - // and returns the reference to the hang server(server 2) for 4th iteration. + // and returns the reference to the hang server(server 2) for 4th iteration. // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions. if (iter != 3) { @@ -208,13 +204,13 @@ int hang_member_rr_test (CORBA::ORB_ptr orb, throw; } } - + return status; } -int dead_member_rand_test (CORBA::ORB_ptr orb, - const ACE_TCHAR* group_ior, +int dead_member_rand_test (CORBA::ORB_ptr orb, + const ACE_TCHAR* group_ior, Test::Simple_ptr /*direct_simple*/) { int status = 0; @@ -246,7 +242,7 @@ int dead_member_rand_test (CORBA::ORB_ptr orb, ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client request handled by object at <%s>\n", the_string.in ())); - // Any picked member will not be picked again since they exit right after + // Any picked member will not be picked again since they exit right after // this request. for (size_t j = 0; j < locations.size (); ++j) { @@ -254,8 +250,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb, { status = 1; } - } - + } + if (status == 0) locations.push_back (the_string.in ()); @@ -290,8 +286,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb, } -int hang_member_rand_test (CORBA::ORB_ptr orb, - const ACE_TCHAR* group_ior, +int hang_member_rand_test (CORBA::ORB_ptr orb, + const ACE_TCHAR* group_ior, Test::Simple_ptr /*direct_simple*/) { int status = 0; @@ -329,11 +325,11 @@ int hang_member_rand_test (CORBA::ORB_ptr orb, { status = 1; } - } - + } + if (status == 0) locations.push_back (the_string.in ()); - + if (iter == 3) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Request %d should not complete\n"), iter)); @@ -358,7 +354,7 @@ int hang_member_rand_test (CORBA::ORB_ptr orb, catch (const ::CORBA::COMM_FAILURE& /*ex*/) { // It is possible that the LB has not detected the server 2 exit as it hangs - // and returns the reference to the hang server(server 2) for 4th iteration. + // and returns the reference to the hang server(server 2) for 4th iteration. // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions. if (iter != 3) { @@ -426,7 +422,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) else status = dead_member_rand_test (orb.in (),group_ior, direct_simple.in ()); else - { + { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Invalid strategy \n"))); status = 1; } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp index 0695d186eb7..e7b491f6c55 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "LB_Factory_Server.h" #include "Factory.h" #include "Simple.h" -ACE_RCSID (DeadMemberDetection_Inf_Ctrl, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp index 154eb412484..2158e314e99 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "LB_server.h" #include "Factory.h" #include "Simple.h" -ACE_RCSID (Infrastructure_Controlled, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp index 6e0079fac75..5615e8b55cb 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp @@ -1,12 +1,10 @@ +// $Id$ + #include "Factory.h" #include "Simple.h" #include "TestC.h" -ACE_RCSID (Infrastructure_Controlled, - Factory, - "$Id$") - Factory::Factory (void) { this->fcid_ = 0; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp index 375784f2fd3..99a52abe6ae 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp @@ -1,9 +1,5 @@ // -*- C++ -*- +// $Id$ #include "Factory_Map.h" - -ACE_RCSID (Infrastructure_Controlled, - Factory_Map, - "$Id$") - diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp index 4459fe3e227..3b9f3ed923c 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp @@ -1,5 +1,4 @@ +// $Id$ + #include "Factory_Struct.h" -ACE_RCSID (Infrastructure_Controlled, - Factory_Struct, - "$Id$") diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp index 86b6fd95662..f2e627497e7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "LB_server.h" #include "Simple.h" #include "Factory.h" @@ -5,10 +7,6 @@ #include "TestC.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Infrastructure_Controlled, - LB_server, - "$Id$") - LB_server::LB_server (int argc, ACE_TCHAR **argv) : argc_ (argc) , argv_ (argv) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp index 1b3a9a3a99a..22d5988dafb 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp @@ -1,10 +1,6 @@ -#include "Simple.h" - - -ACE_RCSID (Infrastructure_Controlled, - Simple, - "$Id$") +// $Id$ +#include "Simple.h" Simple::Simple (void) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp index ac7013e0e2e..fc484ac1ad7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp @@ -1,12 +1,8 @@ +// $Id$ + #include "TestC.h" #include "ace/Get_Opt.h" - -ACE_RCSID (Infrastructure_Controlled, - client, - "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior"); int diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp index 844e2ebe789..85c32ae81d4 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "LB_server.h" #include "Factory.h" #include "Simple.h" -ACE_RCSID (Infrastructure_Controlled, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp index dee11993c13..abf25b3e295 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp @@ -1,12 +1,8 @@ +// $Id$ + #include "Basic.h" #include "LB_server.h" - -ACE_RCSID (Application_Controlled, - Basic, - "$Id$") - - Basic::Basic (CORBA::Object_ptr object_group, CosLoadBalancing::LoadManager_ptr lm, CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp index d60e020d6f5..1f3f96e5155 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "LB_server.h" #include "Basic.h" #include "Simple.h" @@ -5,10 +7,6 @@ #include "TestC.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Application_Controlled, - LB_server, - "$Id$") - LB_server::LB_server (int argc, ACE_TCHAR **argv) : argc_ (argc) , argv_ (argv) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp index 323bbfa3662..6e779f63ad8 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp @@ -1,12 +1,8 @@ +// $Id$ + #include "Simple.h" #include "LB_server.h" - -ACE_RCSID (Application_Controlled, - Simple, - "$Id$") - - Simple::Simple (CORBA::Object_ptr object_group, CosLoadBalancing::LoadManager_ptr lm, CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp index 10414746f55..6aeca31a7e0 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "LB_server.h" #include "Basic.h" #include "Simple.h" -ACE_RCSID (Manage_object_group, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp index 3efdbb0d9e3..f3b3f015ab1 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp @@ -5,10 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (CPU, - client, - "$Id$") - const ACE_TCHAR *location = ACE_TEXT("MyLocation"); const int MAX_RETRIES = 10; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index 6f494c4f02b..cde5ca524e4 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "Basic_Log_Test.h" #include "tao/debug.h" @@ -8,15 +10,9 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (Basic_Log_Test, - Basic_Log_Test, - "$Id$") - - const char* BasicLog_Test::basic_log_factory_name_= "BasicLogFactory"; const char* BasicLog_Test::naming_sevice_name_ = "NameService"; - BasicLog_Test::BasicLog_Test(void) : logServiceIor_ (0) { diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp index f0336387ac3..e6eeab1c93c 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "Basic_Log_Test.h" #include "ace/Log_Msg.h" #include "ace/OS_main.h" -ACE_RCSID (Basic_Log_Test, - client, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index c09b7a55253..ab59035712b 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -6,10 +6,6 @@ #include "orbsvcs/PortableGroup/MIOP.h" #include "orbsvcs/PortableGroup/GOA.h" -ACE_RCSID (McastHello, - server, - "$Id$") - static const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); // Use a multicast address in the administrative "site local" range, 239.255.0.0 to diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index 6ca0434e2b7..290f38aded1 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -7,10 +7,6 @@ #include "orbsvcs/CosNotifyCommC.h" #include "IdAssignment.h" -ACE_RCSID (Notify_Tests, - IdAssignment, - "$Id$") - IdAssignment::IdAssignment (void) : iter_ (3), ec_count_ (3), diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 4bb5813dbb1..2de58de6f29 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -9,10 +9,6 @@ #include "LifeCycle.h" -ACE_RCSID (Notify_Tests, - LifeCycle, - "$Id$") - LifeCycle::LifeCycle (void) : count_ (10) { diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp index 79f179f8bfb..f0975c3e583 100644 --- a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp +++ b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp @@ -6,10 +6,6 @@ #include "tao/PortableServer/POAC.h" #include "tao/PortableServer/POAManagerC.h" -ACE_RCSID (Validate_Client, - gen_data, - "$Id$") - const ACE_TCHAR *output_filename = ACE_TEXT ("persistence.notify.xml"); // must be char @@ -176,8 +172,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) output_file), 1); const char * dummy_consumer_proxy = ior.in(); - - ACE_OS::fprintf (output_file, format, + + ACE_OS::fprintf (output_file, format, dummy_consumer_proxy, dummy_consumer_proxy, dummy_consumer_proxy, dummy_consumer_proxy); ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 7c1933fb08c..afe3264bded 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -3,11 +3,6 @@ #include "Activation_Manager.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" - -ACE_RCSID (lib, - TAO_Activation_Manager, - "$Id$") - #include "LookupManager.h" #include "Command_Builder.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index fb95de7463a..346a41a23e8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp @@ -1,11 +1,6 @@ // $Id$ #include "Notify_Test_Client.h" - -ACE_RCSID (lib, - Notify_Test_Client, - "$Id$") - #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory" #define NAMING_SERVICE_NAME "NameService" diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp index d60d6a1cfbf..032255f285c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -1,11 +1,6 @@ // $Id$ #include "Options_Parser.h" - -ACE_RCSID (lib, - TAO_Options_Parser, - "$Id$") - #include "orbsvcs/NotifyExtC.h" #include "tao/debug.h" #include "ace/Log_Msg.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp index f4b14d6cdf8..2012aeebbb3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp @@ -6,10 +6,6 @@ #include "Peer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (lib, - TAO_Peer, - "$Id$") - #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp index 2f54bdbbf88..62a30ea9a2a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp @@ -5,10 +5,6 @@ #include "Peer_T.h" -ACE_RCSID (Notify, - TAO_Notify_Tests_Peer_T, - "$Id$") - #include "ace/Arg_Shifter.h" #include "Name.h" #include "LookupManager.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index 8c9797dce3b..0f81dbae0ec 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -13,10 +13,6 @@ #include "LookupManager.h" #include "Priority_Mapping.h" -ACE_RCSID (RT_Notify, - TAO_Notify_Tests_Periodic_Consumer, - "$Id$") - int WARMUP_COUNT = 10; TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer (void) diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index 366c24113e5..beb4edbb007 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -1,11 +1,6 @@ // $Id$ #include "Periodic_Consumer_Command.h" - -ACE_RCSID (lib, - TAO_Periodic_Consumer_Command, - "$Id$") - #include "LookupManager.h" #include "Name.h" #include "Periodic_Consumer.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index 7aab7760d8e..eea04d1e903 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -15,10 +15,6 @@ #include "LookupManager.h" #include "Priority_Mapping.h" -ACE_RCSID (RT_Notify, - TAO_Notify_Tests_Periodic_Supplier, - "$Id$") - TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void) : barrier_ (0), priority_ (0), diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 946f81ebda9..a7b182245c9 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -1,11 +1,6 @@ // $Id$ #include "Periodic_Supplier_Command.h" - -ACE_RCSID (lib, - TAO_Periodic_Supplier_Command, - "$Id$") - #include "LookupManager.h" #include "Name.h" #include "Periodic_Supplier.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 081af8ac861..e02c7b18110 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -7,10 +7,6 @@ #include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" -ACE_RCSID (Notify, - RedGreen_Test, - "$Id$") - #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory" #define NAMING_SERVICE_NAME "NameService" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 845f2830de4..f8c152bd297 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -12,10 +12,6 @@ #include "orbsvcs/Notify/Service.h" #include "orbsvcs/Time_Utilities.h" -ACE_RCSID (Notify_Tests, - Throughput, - "$Id$") - /***************************************************************************/ Throughput_StructuredPushConsumer::Throughput_StructuredPushConsumer ( diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 263084c4d5f..f54ada2e199 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -2,12 +2,6 @@ // ============================================================================ // -// = LIBRARY -// TAO/orbsvcs/Naming_Service/ -// -// = FILENAME -// client.cpp -// // = DESCRIPTION // This class implements a CORBA client for a redundant CosNaming // Service using stubs generated by the TAO ORB IDL compiler. @@ -23,10 +17,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Simple_Naming, - client, - "$Id$") - #if defined (_MSC_VER) # pragma warning (disable : 4250) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index b0567d8321c..0667203a972 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -6,10 +6,6 @@ # include <quantify.h> #endif /* ACE_HAS_QUANTIFY */ -ACE_RCSID (Sched, - DynSched_Test, - "$Id$") - // period times, in 100 nanoseconds #define ONE_HZ 10000000 #define FIVE_HZ 2000000 diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp index 4cea1fa04b9..ea411dbe319 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp @@ -1,12 +1,8 @@ // -*- C++ -*- +// $Id$ #include "TX_Object_i.h" -ACE_RCSID (Big_Request, - TX_Object_i, - "$Id$") - - TX_Object_i::TX_Object_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), data_ () diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp index 2a79ca57c78..e9b453b271a 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp @@ -1,13 +1,11 @@ +// $Id$ + #include "TX_ObjectC.h" #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_string.h" #include "ace/Get_Opt.h" #include "ace/SString.h" -ACE_RCSID (Big_Request, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); const char *cert_file = "cacert.pem"; long number_iterations = 1; diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp index a535b6b2e50..50b514f9a71 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp @@ -1,3 +1,4 @@ +// $Id$ #include "TX_Object_i.h" #include "ace/Get_Opt.h" @@ -6,10 +7,6 @@ #include "ace/SString.h" #include "ace/Task.h" -ACE_RCSID (Big_Request, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = 0; const char *cert_file = "cacert.pem"; diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp index afb59f51dc3..be296431912 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp @@ -1,15 +1,10 @@ // -*- C++ -*- +// $Id$ #include "Foo_i.h" - #include "ace/OS_NS_string.h" -ACE_RCSID (Bug_1107_Regression, - Foo_i, - "$Id$") - - Foo_i::Foo_i (CORBA::ORB_ptr orb, SecurityLevel3::SecurityCurrent_ptr current) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp index 49e36cbd76e..c371e4229a0 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" @@ -6,10 +7,6 @@ #include "orbsvcs/SecurityC.h" #include "ace/SString.h" -ACE_RCSID (Bug_1107_Regression, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); const char *cert_file = "cacert.pem"; diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp index 7ddd787fc56..9c9152c9900 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "Foo_i.h" #include "ace/SString.h" -ACE_RCSID (Bug_1107_Regression, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = 0; const char *cert_file = "cacert.pem"; diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp index 69b4693c129..a45e7478e04 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp @@ -1,16 +1,12 @@ +// $Id$ + #include "ace/Log_Msg.h" #include "serverC.h" #include "client_i.h" #include "ace/SString.h" #include "ace/Get_Opt.h" -ACE_RCSID (Callback, - client, - "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior"); - const ACE_TCHAR *cert_file = ACE_TEXT ("cacert.pem"); int diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp index e91058cf879..eea77b0a2cb 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "ace/Log_Msg.h" #include "client_i.h" -ACE_RCSID (Callback, - client_i, - "$Id$") - client_i::client_i (server_ptr s) : server_ (server::_duplicate (s)) { diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp index 3da387d4370..33325e51ce8 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp @@ -1,13 +1,11 @@ +// $Id$ + #include "ace/Log_Msg.h" #include "server_i.h" #include "ace/OS_NS_stdio.h" #include "ace/SString.h" #include "ace/Get_Opt.h" -ACE_RCSID (Callback, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); const ACE_TCHAR *cert_file = ACE_TEXT("cacert.pem"); diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp index 873cf521f55..2b5031d8560 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp @@ -1,8 +1,6 @@ -#include "server_i.h" +// $Id$ -ACE_RCSID (Callback, - server_i, - "$Id$") +#include "server_i.h" server_i::server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp index 387181cca2a..fb9be959bbb 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp @@ -6,10 +6,6 @@ #include "ace/SString.h" #include "testC.h" -ACE_RCSID (Send_File, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); const char *cert_file = "cacert.pem"; diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp index 1be2a7de439..b7f8958acd2 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp @@ -6,10 +6,6 @@ #include "ace/SString.h" #include "test_i.h" -ACE_RCSID (Send_File, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = 0; const char *cert_file = "cacert.pem"; diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp index 225c91d9abd..137ca4f0ec5 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp @@ -6,10 +6,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Send_File, - test_i, - "$Id$") - void Simple_Server_i::send_line (const char *) { diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp index ba8e1b90c52..98af071916a 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp @@ -12,10 +12,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (MT_IIOP_SSL, - test_i, - "$Id$") - void Simple_Server_i::ping (void) { diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp index 634b0fd9e27..ed3db5f624d 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp @@ -7,10 +7,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (MT_Server, - test_i, - "$Id$") - CORBA::Long Simple_Server_i::test_method (CORBA::Long x) { diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp index 38c87f1c0f5..9c380971bc5 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "Foo_i.h" #include "ace/SString.h" -ACE_RCSID (Secure_Invocation, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = 0; const char *cert_file = "cacert.pem"; diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp index e40e0f69e13..df429bfaeb2 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp @@ -1,15 +1,9 @@ // -*- C++ -*- +// $Id$ #include "Foo_i.h" - #include "ace/OS_NS_string.h" - -ACE_RCSID (Secure_Invocation, - Foo_i, - "$Id$") - - Foo_i::Foo_i (CORBA::ORB_ptr orb, SecurityLevel3::SecurityCurrent_ptr current) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index 1ee4e0773e2..b75bcf6cb57 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" @@ -6,10 +7,6 @@ #include "orbsvcs/SecurityC.h" #include "ace/SString.h" -ACE_RCSID (Secure_Invocation, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); const char *cert_file = "cacert.pem"; diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp index 723915cf2c1..f39a5eccca6 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "Foo_i.h" #include "ace/SString.h" -ACE_RCSID (Secure_Invocation, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = 0; const char *cert_file = "cacert.pem"; diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp index aa1368d5e67..ccaf134b109 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp @@ -1,15 +1,9 @@ // -*- C++ -*- +// $Id$ #include "Foo_i.h" - #include "ace/OS_NS_string.h" - -ACE_RCSID (Secure_Invocation, - Foo_i, - "$Id$") - - Foo_i::Foo_i (CORBA::ORB_ptr orb, SecurityLevel3::SecurityCurrent_ptr current) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp index 2973a2fcb41..2e77ad1b931 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp @@ -1,17 +1,12 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/SString.h" - #include "orbsvcs/SecurityC.h" - #include "FooC.h" #include "constants.h" -ACE_RCSID (Secure_Invocation, - client, - "$Id$") - bool shutdown_server = true; class ClientTest diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp index 2615b696aa4..523c8fc8148 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include <ace/SString.h> #include <ace/ARGV.h> @@ -9,10 +10,6 @@ #include "Foo_i.h" #include "constants.h" -ACE_RCSID (Secure_Invocation, - server, - "$Id$") - /* This tests the ability to use the SecurityManager/AccessDecision tools to permit unsecured access to specific object references, while all other diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 5278a192b6b..884e1caff30 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -9,10 +9,6 @@ #include "orbsvcs/Trader/Trader.h" #include "orbsvcs/Trader/Service_Type_Repository.h" -ACE_RCSID (Trading, - colocated_test, - "$Id$") - void parse_args (int argc, ACE_TCHAR *argv[], CORBA::Boolean& verbose) diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 6be271ef53e..5ed77a2cbc3 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -9,10 +9,6 @@ #include "orbsvcs/Trader/Service_Type_Repository.h" #include "ace/Get_Opt.h" -ACE_RCSID (Trading, - export_test, - "$Id$") - const ACE_TCHAR *done_file = ACE_TEXT("export_test_ready"); int diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp index 75926732c39..6240aaf0ada 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp @@ -30,10 +30,6 @@ #include "ace/Log_Msg.h" #include "ace/CORBA_macros.h" -ACE_RCSID (tests_svc_loader, - tests_svc_loader, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv []) { try diff --git a/TAO/tests/Bug_1020_Regression/Server_i.cpp b/TAO/tests/Bug_1020_Regression/Server_i.cpp index b8d26e2843a..7ba4adf2e3e 100644 --- a/TAO/tests/Bug_1020_Regression/Server_i.cpp +++ b/TAO/tests/Bug_1020_Regression/Server_i.cpp @@ -1,9 +1,8 @@ +// $Id$ + #include "Server_i.h" #include "Server_Task.h" -ACE_RCSID (Bug_1230_Regression, - Server, "$Id$") - Server::Server(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp index c668c137df4..34ee5e982f1 100644 --- a/TAO/tests/Bug_1020_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Regression/server.cpp @@ -7,10 +7,6 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" -ACE_RCSID (Bug_1230_Regression, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); #if defined (ACE_OPENVMS) |