From 662c960007478d4fdd650b2a2b36aff426cd05d7 Mon Sep 17 00:00:00 2001 From: iliyan Date: Wed, 20 Dec 2006 16:32:29 +0000 Subject: ChangeLogTag: Wed Dec 20 16:22:29 UTC 2006 Iliyan Jeliazkov --- TAO/ChangeLog | 54 +++++++++++++++ TAO/MPC/config/tc.mpb | 7 ++ TAO/tao/TransportCurrent/Current_Loader.cpp | 78 +++++++++++----------- TAO/tao/TransportCurrent/Current_Loader.h | 7 +- TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp | 19 +++++- TAO/tao/TransportCurrent/IIOP_Current_Loader.h | 2 + TAO/tao/Transport_Selection_Guard.cpp | 6 +- .../TransportCurrent/Framework/Current_Test.idl | 2 +- TAO/tests/TransportCurrent/Framework/Framework.mpc | 2 + TAO/tests/TransportCurrent/Framework/Tester.cpp | 12 +++- TAO/tests/TransportCurrent/Framework/client.cpp | 2 +- TAO/tests/TransportCurrent/Framework/server.cpp | 9 --- .../TransportCurrent/IIOP/Current_Test_Impl.cpp | 8 +-- TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp | 11 +++ TAO/tests/TransportCurrent/IIOP/client_static.conf | 4 +- 15 files changed, 158 insertions(+), 65 deletions(-) create mode 100644 TAO/MPC/config/tc.mpb (limited to 'TAO') diff --git a/TAO/ChangeLog b/TAO/ChangeLog index de583be5b2e..c7f00be8ec2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,57 @@ +Wed Dec 20 16:22:29 UTC 2006 Iliyan Jeliazkov + + These are fixes correcting scoreboard issues pertaining to the + checkin from Tue Dec 19 22:09:34 UTC 2006. + + * MPC/config/tc.mpb: + + Moved from $ACE_ROOT/bin/MakeProjectCreator/config according to + the new project configuration layout. + + * tao/TransportCurrent/Current_Loader.h: + * tao/TransportCurrent/Current_Loader.cpp: + * tao/TransportCurrent/IIOP_Current_Loader.h: + * tao/TransportCurrent/IIOP_Current_Loader.cpp: + + * tao/Transport_Selection_Guard.cpp: + + Removed errand semicolons after definitions which were breaking + some of the scoreboard builds. + + * tests/TransportCurrent/Framework/Current_Test.idl: + + Fixed a FUZZ warning about mismatched @file. + + * tests/TransportCurrent/Framework/Framework.mpc: + + Added the current directory to the include path. + + * tests/TransportCurrent/Framework/Tester.cpp: + * tests/TransportCurrent/Framework/client.cpp: + * tests/TransportCurrent/Framework/server.cpp: + * tests/TransportCurrent/IIOP/IIOP_Tester.cpp: + * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp: + * tests/TransportCurrent/IIOP/client_static.conf: + + Fixing a service initialization problem encountered in static + builds that prevented the tests from runnig. Also fixed include + file locations. + +Wed Dec 20 15:28:24 UTC 2006 Iliyan Jeliazkov + + * MPC/config/tc.mpb: + + * tao/Transport_Selection_Guard.cpp: + + * tests/TransportCurrent/Framework/Current_Test.idl: + + * tests/TransportCurrent/Framework/Framework.mpc: + + * tests/TransportCurrent/Framework/server.cpp: + + * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp: + + Wed Dec 20 09:36:00 UTC 2006 Johnny Willemsen * tests/BiDirectional/BiDirectional.mpc: diff --git a/TAO/MPC/config/tc.mpb b/TAO/MPC/config/tc.mpb new file mode 100644 index 00000000000..fc9efc8b653 --- /dev/null +++ b/TAO/MPC/config/tc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project { + after += TC + libs += TAO_TC +} diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp index 04210f9ba21..c20e43fd34a 100644 --- a/TAO/tao/TransportCurrent/Current_Loader.cpp +++ b/TAO/tao/TransportCurrent/Current_Loader.cpp @@ -34,45 +34,45 @@ namespace TAO namespace Transport { - /// A helper method for obtaining access to the the Transport - /// Factory Manager instance. - - Current_Loader* - Current_Loader::instance (void) - { - Current_Loader *cl = - ACE_Dynamic_Service ::instance (ACE_TEXT ("TAO_Transport_Current_Loader")); - - if (cl == 0) -#if defined (TAO_AS_STATIC_LIBS) - { - if (TAO_debug_level > 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Unable to obtain Current::Loader instance: %m\n")), - 0); - return 0; - } -#else - { - // In case we build shared, try to load the appropriate library. - ACE_Service_Config::process_directive - (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader", - "TAO_TC", - "_make_TAO_Transport_Current_Loader", - "")); - cl = ACE_Dynamic_Service::instance (ACE_TEXT ("TAO_Transport_Current_Loader")); - } -#endif /* TAO_AS_STATIC_LIBS */ - - if (cl != 0) - return cl; - - if (TAO_debug_level > 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Unable to obtain Current::Loader instance: %m\n")), - 0); - return 0; - } +// /// A helper method for obtaining access to the the Transport +// /// Factory Manager instance. + +// Current_Loader* +// Current_Loader::instance (void) +// { +// Current_Loader *cl = +// ACE_Dynamic_Service ::instance (ACE_TEXT ("TAO_Transport_Current_Loader")); + +// if (cl == 0) +// #if defined (TAO_AS_STATIC_LIBS) +// { +// if (TAO_debug_level > 0) +// ACE_ERROR_RETURN ((LM_ERROR, +// ACE_TEXT ("(%P|%t) Unable to obtain Current::Loader instance: %m\n")), +// 0); +// return 0; +// } +// #else +// { +// // In case we build shared, try to load the appropriate library. +// ACE_Service_Config::process_directive +// (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader", +// "TAO_TC", +// "_make_TAO_Transport_Current_Loader", +// "")); +// cl = ACE_Dynamic_Service::instance (ACE_TEXT ("TAO_Transport_Current_Loader")); +// } +// #endif /* TAO_AS_STATIC_LIBS */ + +// if (cl != 0) +// return cl; + +// if (TAO_debug_level > 0) +// ACE_ERROR_RETURN ((LM_ERROR, +// ACE_TEXT ("(%P|%t) Unable to obtain Current::Loader instance: %m\n")), +// 0); +// return 0; +// } /// dtor diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h index bab40b4f003..d31a8a624ad 100644 --- a/TAO/tao/TransportCurrent/Current_Loader.h +++ b/TAO/tao/TransportCurrent/Current_Loader.h @@ -21,6 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Object.h" +#include "ace/Service_Config.h" #include "tao/Versioned_Namespace.h" #include "tao/TransportCurrent/Transport_Current_Export.h" @@ -39,9 +40,9 @@ namespace TAO { public: - /// A helper method for obtaining access to the the Transport - /// Factory Manager instance. - static Current_Loader* instance (void); +// /// A helper method for obtaining access to the the Transport +// /// Factory Manager instance. +// static Current_Loader* instance (void); public: diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp index b17da2f1a57..623cd2ed29d 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp +++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp @@ -55,13 +55,27 @@ namespace TAO return 0; } + + Current_Loader::Current_Loader () + { + } + + Current_Loader::~Current_Loader () + { + } + } } } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (TAO_AS_STATIC_LIBS) + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_REQUIRE (TAO_Transport_IIOP_Current_Loader); namespace TAO @@ -77,12 +91,13 @@ namespace TAO } } } + +TAO_END_VERSIONED_NAMESPACE_DECL + } #endif /* defined (TAO_AS_STATIC_LIBS) */ -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_Transport_IIOP_Current_Loader, ACE_TEXT ("TAO_Transport_IIOP_Current_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h index 7f49533fa03..2199de74781 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h +++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h @@ -35,6 +35,8 @@ namespace TAO public: /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); + virtual ~Current_Loader (); + Current_Loader (); }; } } diff --git a/TAO/tao/Transport_Selection_Guard.cpp b/TAO/tao/Transport_Selection_Guard.cpp index bd1164131df..6f29477d5c4 100644 --- a/TAO/tao/Transport_Selection_Guard.cpp +++ b/TAO/tao/Transport_Selection_Guard.cpp @@ -38,7 +38,7 @@ namespace TAO return 0; #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ - }; + } @@ -59,7 +59,7 @@ namespace TAO #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ - }; + } @@ -74,7 +74,7 @@ namespace TAO #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ this->curr_ = 0; - }; + } } /* namespace TAO */ diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test.idl b/TAO/tests/TransportCurrent/Framework/Current_Test.idl index 419be426991..65ef011bee4 100644 --- a/TAO/tests/TransportCurrent/Framework/Current_Test.idl +++ b/TAO/tests/TransportCurrent/Framework/Current_Test.idl @@ -2,7 +2,7 @@ //============================================================================= /** - * @file test.idl + * @file Current_Test.idl * * $Id$ * diff --git a/TAO/tests/TransportCurrent/Framework/Framework.mpc b/TAO/tests/TransportCurrent/Framework/Framework.mpc index 74ca4a0d856..c592eebbd5b 100644 --- a/TAO/tests/TransportCurrent/Framework/Framework.mpc +++ b/TAO/tests/TransportCurrent/Framework/Framework.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, tc, pi_server { + includes += . Source_Files { server.cpp Current_Test_Impl.cpp @@ -16,6 +17,7 @@ project(*Server): taoserver, tc, pi_server { project(*Client): taoclient, tc, pi, dynamicinterface { after += *Server + includes += . Source_Files { Client_Request_Interceptor.cpp client.cpp diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp index 183691c3f4c..37d6286a2c5 100644 --- a/TAO/tests/TransportCurrent/Framework/Tester.cpp +++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp @@ -1,7 +1,17 @@ -// $Id:$ +// $Id$ #include "tao/TransportCurrent/Transport_Current.h" +#if defined (TAO_AS_STATIC_LIBS) +# include "tao/TransportCurrent/Current_Loader.h" + +// Create an object that will insert the into the +// list of statically linked services that the +// will initialize at run-time. +ACE_STATIC_SVC_REQUIRE (TAO_Transport_Current_Loader); +#endif /* TAO_AS_STATIC_LIBS */ + + using namespace TAO; diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp index db18e0ddc54..cdae656bbb5 100644 --- a/TAO/tests/TransportCurrent/Framework/client.cpp +++ b/TAO/tests/TransportCurrent/Framework/client.cpp @@ -15,7 +15,7 @@ ACE_RCSID (PICurrent, client, - "$Id:$") + "$Id$") // Prototype diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp index 93bfcae4ac0..45e6220980c 100644 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ b/TAO/tests/TransportCurrent/Framework/server.cpp @@ -13,15 +13,6 @@ ACE_RCSID (Transport_Current, server, "$Id$") -#if defined (TAO_AS_STATIC_LIBS) - -// Create an object that will insert the into the -// list of statically linked services that the -// will initialize at run-time. -#include "orbsvcs/Transport_Current/Current_Loader.h" -ACE_STATIC_SVC_REQUIRE (TAO_Transport_Current_Loader); -#endif - const char *ior_output_file = "server.ior"; int nthreads = 1; int use_collocated_call = 1; diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp index 1001d1ea528..e22c5942c22 100644 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -1,13 +1,13 @@ // -*- C++ -*- -#include "Current_Test_Impl.h" +#include "tao/Transport_Current/TC_IIOPC.h" +#include "tao/Transport_Current/TCC.h" -#include "orbsvcs/Transport_Current/TC_IIOPC.h" -#include "orbsvcs/Transport_Current/TCC.h" +#include "Current_Test_Impl.h" ACE_RCSID (Transport_Current, Current_Test_Impl, - "$Id:$") + "$Id$") Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp index 24f0a23937c..297fcb02b3f 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp @@ -4,6 +4,17 @@ #include "tao/TransportCurrent/IIOP_Transport_Current.h" +#if defined (TAO_AS_STATIC_LIBS) +#include "tao/TransportCurrent/IIOP_Current_Loader.h" + +// Create an object that will insert the into the +// list of statically linked services that the +// will initialize at run-time. +ACE_STATIC_SVC_REQUIRE (TAO_Transport_Current_Loader); +ACE_STATIC_SVC_REQUIRE (TAO_Transport_IIOP_Current_Loader); +#endif /* TAO_AS_STATIC_LIBS */ + + using namespace TAO; diff --git a/TAO/tests/TransportCurrent/IIOP/client_static.conf b/TAO/tests/TransportCurrent/IIOP/client_static.conf index 42fd412dfca..56e191b9257 100644 --- a/TAO/tests/TransportCurrent/IIOP/client_static.conf +++ b/TAO/tests/TransportCurrent/IIOP/client_static.conf @@ -1,3 +1,3 @@ -#static TAO_Transport_Current_Loader "" -#static TAO_Transport_IIOP_Current_Loader "" +static TAO_Transport_Current_Loader "" +static TAO_Transport_IIOP_Current_Loader "" static Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive" -- cgit v1.2.1