diff options
27 files changed, 18 insertions, 133 deletions
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp index 12bd4208dd6..ce3f466f560 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp @@ -9,12 +9,6 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (AMI_Iterator, - Iterator_Factory_i, - "$Id$") - - void Iterator_Factory_i::get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp index 32e79cf6724..e9280f93f83 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp @@ -10,12 +10,6 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (AMI_Iterator, - Iterator_Handler, - "$Id$") - - Iterator_Handler::Iterator_Handler (void) : file_ (ACE_sap_any_cast (const ACE_FILE_Addr &)), file_io_ (), diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index 9c9d3183828..87a83637077 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -9,10 +9,6 @@ #include "Web_ServerC.h" #include "Iterator_Handler.h" -ACE_RCSID (AMI_Iterator, - client, - "$Id$") - // Obtain reference to Iterator_Factory Web_Server::Iterator_Factory_ptr get_iterator (CORBA::ORB_ptr orb); diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp index 0dc4dae6f81..3f8ad1f65a4 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp @@ -8,10 +8,6 @@ #include "Iterator_Factory_i.h" -ACE_RCSID (AMI_Iterator, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index 7d2ce5f2f18..d89d9cd7370 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -10,17 +10,10 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (SMI_Iterator, - client, - "$Id$") - - // Retrieve the data from the server int retrieve_data (const char *content_type, Web_Server::Content_Iterator_ptr contents); - // Map content type to viewer. int external_viewer (const char *content_type, char *viewer, @@ -41,9 +34,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) -1); // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - "Mighty ORB"); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB"); // Get a reference to the Name Service. CORBA::Object_var obj = diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index 7b30c150c27..e7b1619be93 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -23,10 +23,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Concurrency_Service, - Concurrency_Service, - "$Id$") - // Default Constructor. Concurrency_Service::Concurrency_Service (void) diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp index aa454faf982..f7177bc7980 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp @@ -1,4 +1,3 @@ - // $Id$ #include "ace/Sched_Params.h" @@ -9,10 +8,6 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Scheduler_Factory.h" -ACE_RCSID (Dump_Schedule, - Dump_Schedule, - "$Id$") - // This program dumps the results of one scheduling in a C++ file. int diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index e6143e183ad..daaf6ff29a5 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -20,10 +20,6 @@ #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (Event_Service, - Event_Service, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { bool use_thread_per_consumer = false; diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp index bd2d2d8d059..59ca1982e61 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp @@ -13,10 +13,6 @@ #include "FT_FaultAnalyzer.h" -ACE_RCSID (FT_FaultAnalyzer, - FT_FaultAnalyzer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Default constructor. diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index af82077b9f5..16c935d118f 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -21,11 +21,6 @@ #include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h" #include "tao/debug.h" -ACE_RCSID (FT_FaultConsumer, - FT_FaultConsumer, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Default constructor. diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp index ac26ed56e19..4fe713cc68a 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp @@ -19,10 +19,6 @@ #include "ace/SString.h" -ACE_RCSID (FT_FaultEventDescriptor, - FT_FaultEventDescriptor, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor. diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp index 1d3f14c6732..75d1a7a6218 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp @@ -1,13 +1,9 @@ +// $Id$ + #include "FT_Property_Validator.h" #include "orbsvcs/PortableGroup/PG_Operators.h" #include "orbsvcs/FT_ReplicationManagerC.h" - -ACE_RCSID (PortableGroup, - FT_Property_Validator, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::FT_Property_Validator::FT_Property_Validator (void) diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index e47afa445b7..96e0a6416c0 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -31,11 +31,6 @@ #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h" -ACE_RCSID (FT_ReplicationManager, - FT_ReplicationManager, - "$Id$") - - // Use this macro at the beginning of CORBA methods // to aid in debugging. #define METHOD_ENTRY(name) \ diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index a017ad1b483..aa3e2e8e9c8 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -22,10 +22,6 @@ #include "tao/debug.h" #include <iostream> -ACE_RCSID (FT_ReplicationManagerFaultAnalyzer, - FT_ReplicationManagerFaultAnalyzer, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index 311a4876080..90786a10729 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -22,10 +22,6 @@ #include "Factory_Trader.h" #include "orbsvcs/CosTradingC.h" -ACE_RCSID (LifeCycle_Service, - Factory_Trader, - "$Id$") - // This const char * is used for adding a new type to the service repository // the added types will be subclasses of this. const char * Factory_Trader::GENERIC_FACTORY_INTERFACE_REPOSITORY_ID = diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp index 4a1dd636eeb..34ab729be84 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp @@ -18,10 +18,6 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" -ACE_RCSID (LifeCycle_Service, - LifeCycle_Service, - "$Id$") - Life_Cycle_Service_Server::Life_Cycle_Service_Server (void) : debug_level_ (1) { diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp index 198090406b5..c7212503fd7 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -19,10 +19,6 @@ #include "LifeCycle_Service_i.h" -ACE_RCSID (LifeCycle_Service, - LifeCycle_Service_i, - "$Id$") - // Constructor Life_Cycle_Service_i::Life_Cycle_Service_i (int debug_level) : factory_trader_ptr_ (0), diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp index bc99c5e9ed0..7ca6044c88c 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp @@ -1,14 +1,11 @@ +// $Id$ + #include "Basic_Logging_Service.h" #include "ace/OS_main.h" #include "orbsvcs/Shutdown_Utilities.h" #include "tao/debug.h" -ACE_RCSID (Basic_Logging_Service, - Basic_Logging_Server, - "$Id$") - - class Logging_Svc_Shutdown : public Shutdown_Functor { diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp index c10fdccfbe2..5df01ba1da6 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "Basic_Logging_Service.h" #include "ace/Get_Opt.h" #include "orbsvcs/Log/BasicLogFactory_i.h" @@ -5,11 +7,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (Basic_Logging_Service, - Basic_Logging_Service, - "$Id$") - - Basic_Logging_Service::Basic_Logging_Service (void) : service_name_ ("BasicLogFactory"), ior_file_name_ (0), diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp index 87cc3001423..a17b9eb00f1 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp @@ -1,14 +1,11 @@ +// $Id$ + #include "Event_Logging_Service.h" #include "ace/OS_main.h" #include "orbsvcs/Shutdown_Utilities.h" #include "tao/debug.h" -ACE_RCSID (Event_Logging_Service, - Event_Logging_Server, - "$Id$") - - class Logging_Svc_Shutdown : public Shutdown_Functor { diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp index 682a0c79ab9..4e0fa703fc0 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "Event_Logging_Service.h" #include "ace/Get_Opt.h" #include "orbsvcs/Log/EventLogFactory_i.h" @@ -6,11 +8,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (Event_Logging_Service, - Event_Logging_Service, - "$Id$") - - Event_Logging_Service::Event_Logging_Service (void) : service_name_ ("EventLogFactory"), ior_file_name_ (0), diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp index db653aadbbb..4d40592098a 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp @@ -1,14 +1,10 @@ //$Id$ + #include "Notify_Logging_Service.h" #include "ace/OS_main.h" #include "orbsvcs/Shutdown_Utilities.h" #include "tao/debug.h" -ACE_RCSID (Notify_Logging_Service, - Notify_Logging_Server, - "$Id$") - - class Logging_Svc_Shutdown : public Shutdown_Functor { diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index e165dee7c6b..8ffcc60902d 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "Notify_Logging_Service.h" #include "ace/Get_Opt.h" #include "tao/debug.h" @@ -6,11 +8,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (Notify_Logging_Service, - Notify_Logging_Service, - "$Id$") - - Notify_Logging_Service::Notify_Logging_Service (void) : service_name_ (NOTIFY_KEY), ior_file_name_ (0), diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp index d8abedffe36..533ff147b66 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "RTEvent_Logging_Service.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/OS_main.h" @@ -5,11 +7,6 @@ #include "orbsvcs/Shutdown_Utilities.h" #include "tao/debug.h" -ACE_RCSID (RTEvent_Logging_Service, - RTEvent_Logging_Server, - "$Id$") - - class Logging_Svc_Shutdown : public Shutdown_Functor { diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index 8078f8690ed..76f6a1b22bb 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -1,14 +1,11 @@ +// $Id$ + #include "RTEvent_Logging_Service.h" #include "tao/IORTable/IORTable.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (RTEvent_Logging_Service, - RTEvent_Logging_Service, - "$Id$") - - RTEvent_Logging_Service::RTEvent_Logging_Service (void) : service_name_ ("RTEventLogFactory"), ior_file_name_ (0), diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp index 07951b17a0e..eae63229c81 100644 --- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp +++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp @@ -26,11 +26,6 @@ #include "ace/Time_Value.h" #include "ace/Argv_Type_Converter.h" -ACE_RCSID (TAO_Service, - TAO_Service, - "$Id$") - - extern "C" void handler (int) { ACE_Service_Config::reconfig_occurred (1); diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp index 5809da7409e..e3fd27b471c 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp @@ -3,11 +3,6 @@ #include "Server_IORInterceptor.h" #include "Gateway_ObjRef_Factory.h" -ACE_RCSID (ORT, - Server_IORInterceptor, - "$Id$") - - Server_IORInterceptor:: Server_IORInterceptor (Gateway::Object_Factory_ptr factory) : gateway_object_factory_ (Gateway::Object_Factory::_duplicate (factory)) |