diff options
Diffstat (limited to 'TAO/tests/TransportCurrent')
15 files changed, 17 insertions, 71 deletions
diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp index 0697c11ac4c..b3f28bd21f5 100644 --- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp @@ -1,19 +1,16 @@ // -*- C++ -*- +// $Id$ #include "tao/TransportCurrent/TCC.h" #include "Current_Test_Impl.h" -ACE_RCSID (Transport_Current, - Current_Test_Impl, - "$Id$") - - Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - int do_collocated_calls) - : orb_ (CORBA::ORB::_duplicate (orb)) - , poa_ (PortableServer::POA::_duplicate (poa)) - , do_collocated_calls_ (do_collocated_calls) +Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + int do_collocated_calls) + : orb_ (CORBA::ORB::_duplicate (orb)) + , poa_ (PortableServer::POA::_duplicate (poa)) + , do_collocated_calls_ (do_collocated_calls) { } diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp index a11a01d1f00..c6d7ad97d0f 100644 --- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp +++ b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ #include "Server_Request_Interceptor.h" diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp index 1bc137d006e..a17fec6c9d2 100644 --- a/TAO/tests/TransportCurrent/Framework/Tester.cpp +++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp @@ -5,7 +5,6 @@ using namespace TAO; - /// Test referencing the TC data outside of the context of an upcall, /// or a client-side interceptor diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp index 6bb4bf2412f..062aa0107cb 100644 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ b/TAO/tests/TransportCurrent/Framework/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" @@ -10,10 +11,6 @@ #include "Server_Request_Interceptor.h" #include "Server_ORBInitializer.h" -ACE_RCSID (Transport_Current, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); int nthreads = 1; int use_collocated_call = 1; diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp index 5e6a3d92beb..0b5d3a458b2 100644 --- a/TAO/tests/TransportCurrent/Framework/simple.cpp +++ b/TAO/tests/TransportCurrent/Framework/simple.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "tao/ORB.h" #include "tao/Object.h" @@ -6,10 +7,6 @@ #include "ace/Service_Config.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (Transport_Current, - simple, - "$Id$") - int testCurrentORBInitializer (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp index c113ed14627..82f2f56d9ea 100644 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -1,15 +1,11 @@ // -*- C++ -*- +// $Id$ #include "tao/TransportCurrent/TC_IIOPC.h" #include "tao/TransportCurrent/TCC.h" #include "Current_Test_Impl.h" -ACE_RCSID (Transport_Current, - Current_Test_Impl, - "$Id$") - - Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, int do_collocated_calls) diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp index c4ed3e82c24..3005a704841 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ #include "IIOP_Server_Request_Interceptor.h" diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index a7d21f99423..b0918b36806 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp @@ -1,13 +1,10 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" #include "tao/ORB_Constants.h" #include "tao/TransportCurrent/TC_IIOPC.h" -ACE_RCSID (ForwardRequest, - Server_Request_Interceptor, - "$Id$") - #include "IIOP_Server_Request_Interceptor.h" namespace Test { @@ -162,8 +159,6 @@ namespace Test { && !has_remaining_endpoints; } - - void IIOP_Server_Request_Interceptor::inbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri) { @@ -216,11 +211,6 @@ namespace Test { this->pop_request_info (ACE_OS::atoi (buf)); } - - - - - void IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri) { @@ -241,7 +231,6 @@ namespace Test { } - void IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp index 7e7c5138f9b..5faa5e6ca69 100644 --- a/TAO/tests/TransportCurrent/IIOP/client.cpp +++ b/TAO/tests/TransportCurrent/IIOP/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/Task.h" @@ -13,10 +14,6 @@ #include "Client_ORBInitializer.h" -ACE_RCSID (IIOP, - client, - "$Id$") - // Prototype int diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp index ae2d595b403..420e2fec24b 100644 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ b/TAO/tests/TransportCurrent/IIOP/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" @@ -10,11 +11,6 @@ #include "Server_Request_Interceptor.h" #include "Server_ORBInitializer.h" - -ACE_RCSID (Transport_Current, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); int nthreads = 1; int use_collocated_call = 1; @@ -55,10 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } - - /// A helper class to encapsulate a task - class Worker : public ACE_Task_Base { public: @@ -72,16 +65,13 @@ private: /// Ctor - Worker::Worker (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { } - /// Test referencing the TC data *inside* the context of a client-side /// interceptor - int Worker::svc (void) { diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp index c2bf2000119..d137ab4288c 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" -ACE_RCSID (Current_Test_Lib, - Client_ORBInitializer, - "$Id$") - #include "Client_Request_Interceptor.h" #include "Client_ORBInitializer.h" diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp index 8a27b51a923..db233e7864e 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" -ACE_RCSID (ForwardRequest, - Client_Request_Interceptor, - "$Id$") - #include "Current_TestC.h" #include "Client_Request_Interceptor.h" #include "Client_ORBInitializer.h" diff --git a/TAO/tests/TransportCurrent/lib/Current_Test.idl b/TAO/tests/TransportCurrent/lib/Current_Test.idl index a7f00f7d29f..9d38734be71 100644 --- a/TAO/tests/TransportCurrent/lib/Current_Test.idl +++ b/TAO/tests/TransportCurrent/lib/Current_Test.idl @@ -13,8 +13,6 @@ */ //============================================================================= - - module Test { module Transport diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp index 8e866e97052..c8d3752852d 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" -ACE_RCSID (Current_Test_Lib, - Server_ORBInitializer, - "$Id$") - #include "Server_Request_Interceptor.h" #include "Server_ORBInitializer.h" diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp index 27b85d96434..13a739ca479 100644 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" -ACE_RCSID (Current_Test_Lib, - Server_Request_Interceptor, - "$Id$") - #include "Server_Request_Interceptor.h" #include "Server_ORBInitializer.h" |