diff options
Diffstat (limited to 'TAO/orbsvcs/tests')
30 files changed, 57 insertions, 64 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h index c09769d950c..0117cc448a6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h @@ -2,7 +2,6 @@ // $Id$ #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Flows_T.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h index 20bdbda0205..ad0cf76d51d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h @@ -42,7 +42,6 @@ public: virtual int set_protocol_object (const char *flowname, TAO_AV_Protocol_Object *object); protected: - TAO_ORB_Manager *orb_manager_; // FTP_Client_Flow_Handler *handler_; FTP_Client_Callback *callback_; }; @@ -64,7 +63,6 @@ public: private: Client *client_; // pointer to command handler object - TAO_ORB_Manager *orb_manager_; }; @@ -80,7 +78,6 @@ public: private: int parse_args (int argc, char **argv); int bind_to_server (const char *name); - TAO_ORB_Manager *orb_manager_; Endpoint_Reactive_Strategy endpoint_strategy_; AVStreams::MMDevice_var server_mmdevice_; TAO_MMDevice client_mmdevice_; diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index 4575366be4f..b06fe26b585 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -102,7 +102,7 @@ EC_Driver::run_init (int &argc, char* argv[] ACE_CHECK; if (this->parse_args (argc, argv)) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO)); if (this->verbose ()) @@ -120,18 +120,18 @@ EC_Driver::run_init (int &argc, char* argv[] } if (this->move_to_rt_class () == -1) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO)); this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocate_consumers () == -1) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); if (this->allocate_suppliers () == -1) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); this->connect_clients (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 5bc817e59d7..f60232ef9a2 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -16,7 +16,6 @@ #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/PortableGroupC.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Property_Set.h" // Use this macro at the beginning of CORBA methods diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index c18bbacf50e..e79d8756dc8 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -15,7 +15,6 @@ #include "FT_TestReplica_i.h" #include "FT_ReplicaFactory_i.h" -#include "tao/PortableServer/ORB_Manager.h" #include "tao/ORB_Constants.h" #include "FT_TestReplicaC.h" // FUZZ: disable check_for_streams_include @@ -78,7 +77,7 @@ namespace suicide (#value " in method " #method); \ ACE_THROW (FAULT_CODE ( \ CORBA::SystemException::_tao_minor_code ( \ - TAO_DEFAULT_MINOR_CODE, \ + TAO::VMCID, \ EFAULT), \ CORBA::COMPLETED_NO)); \ } else ; @@ -88,7 +87,7 @@ namespace suicide ("read-only method " #method); \ ACE_THROW (FAULT_CODE ( \ CORBA::SystemException::_tao_minor_code ( \ - TAO_DEFAULT_MINOR_CODE, \ + TAO::VMCID, \ EFAULT), \ CORBA::COMPLETED_NO)); \ } else ; @@ -98,7 +97,7 @@ namespace suicide (#value " in method " #method); \ ACE_THROW_RETURN (FAULT_CODE ( \ CORBA::SystemException::_tao_minor_code ( \ - TAO_DEFAULT_MINOR_CODE, \ + TAO::VMCID, \ EFAULT), \ CORBA::COMPLETED_NO), \ result); \ @@ -109,7 +108,7 @@ namespace suicide ("read-only method " #method); \ ACE_THROW_RETURN (FAULT_CODE ( \ CORBA::SystemException::_tao_minor_code ( \ - TAO_DEFAULT_MINOR_CODE, \ + TAO::VMCID, \ EFAULT), \ CORBA::COMPLETED_NO), \ result); \ diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index 2ed7b7baca0..3337f367c2a 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -4,7 +4,6 @@ #include "StubBatchConsumer.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubBatchConsumer::StubBatchConsumer () diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index a61f3ae1478..eae0bf303f5 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -4,7 +4,6 @@ #include "StubFaultAnalyzer.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index 3712953a2aa..a9ca2e66117 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -4,7 +4,6 @@ #include "StubFaultConsumer.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubFaultConsumer::StubFaultConsumer () diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index d59c37c9025..2417c974648 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -5,7 +5,6 @@ #include "StubFaultNotifier.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp index a1280eee3c5..a446d0d7eff 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp @@ -36,7 +36,7 @@ Server_ORBInitializer::post_init ( Server_Request_Interceptor, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp index e07dc2c309a..1b689bd3fba 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp @@ -32,7 +32,7 @@ Server_Request_Interceptor::forward_references ( if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2)) ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index 12e291c0f78..98925443c7d 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -3,6 +3,7 @@ #include "ace/OS_NS_sys_time.h" #include "PushConsumer.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "tao/PortableServer/PS_CurrentC.h" #include <stdio.h> ACE_RCSID (FtRtEvent, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 8c1b1757ecf..347af9f1e8c 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -8,6 +8,7 @@ #include "tao/MProfile.h" #include "tao/Stub.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "tao/PortableServer/PS_CurrentC.h" ACE_RCSID (FtRtEvent, PushSupplier, diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc index 0d1d684a15d..2ae37efe568 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc +++ b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc @@ -2,7 +2,7 @@ // // $Id$ -project(*Server): taoexe, naming, iortable, portableserver { +project(*Server): taoserver, naming, iortable { macros += TEST_OUTPUT_HAS_DLL=0 Source_Files { Test_Output.cpp @@ -16,7 +16,7 @@ project(*Server): taoexe, naming, iortable, portableserver { } } -project(*Client): taoexe { +project(*Client): taoclient { macros += TEST_OUTPUT_HAS_DLL=0 Source_Files { Test_Output.cpp diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index 8ab7c68c3d8..e3ba7544ee9 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -5,7 +5,7 @@ #include "tests/test_config.h" #include "ace/Get_Opt.h" -#include "tao/IORTable/IORTableC.h" +#include "tao/IORTable/IORTable.h" #include "orbsvcs/CosNamingC.h" ACE_RCSID (Hello, diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index 1e66342e764..7d7bdcee716 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -3,6 +3,7 @@ #include "server_i.h" #include "tao/IORTable/IORTable.h" +#include "tao/PortableServer/PS_CurrentC.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index c71f26760f2..49cf892be38 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/PortableGroup/MIOP.h" +#include "orbsvcs/PortableGroup/GOA.h" ACE_RCSID (McastHello, server, @@ -61,8 +62,8 @@ main (int argc, char *argv[]) orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableGroup::GOA_var root_poa = + PortableGroup::GOA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index 7ab11e5aec3..b5952bd09c7 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Notify, TAO_RT_Test_Filter, "$Id$") #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" -#include "tao/PortableServer/POA.h" +#include "tao/PortableServer/Root_POA.h" TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter (void) : expected_pool_id_ (0) @@ -161,7 +161,7 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_RT_Test_Filter (%x) ::match_structured (%t)\n", this)); - TAO_POA *poa = this->_default_POA ()->_tao_poa_downcast(); + TAO_Root_POA *poa = dynamic_cast<TAO_Root_POA*>(this->_default_POA ()); ACE_ASSERT (poa != 0); diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc index 4bc3c8bf1e4..53e3baba922 100644 --- a/TAO/orbsvcs/tests/Property/Property.mpc +++ b/TAO/orbsvcs/tests/Property/Property.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, property { +project(*server): namingexe, property, utils { Source_Files { server.cpp } } -project(*client): namingexe, property { +project(*client): namingexe, property, utils { Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 4845eb5a324..2d0f0760c99 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -29,7 +29,7 @@ #include "ace/Task.h" #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "orbsvcs/Property/CosPropertyService_i.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/Property/server.h b/TAO/orbsvcs/tests/Property/server.h index 0ddad8b9aae..42d21922d35 100644 --- a/TAO/orbsvcs/tests/Property/server.h +++ b/TAO/orbsvcs/tests/Property/server.h @@ -20,7 +20,7 @@ #ifndef COSPROPERTYSERVICE_SERVER_H #define COSPROPERTYSERVICE_SERVER_H -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "orbsvcs/Property/CosPropertyService_i.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 3d93dfff3bb..154ac5b6a8a 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -19,13 +19,12 @@ #include "test_objectS.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Server.h" -#include "tao/PortableServer/ORB_Manager.h" #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Simple_Naming, - client, +ACE_RCSID (Simple_Naming, + client, "$Id$") #if defined (_MSC_VER) @@ -104,7 +103,7 @@ main (int argc, ACE_TCHAR **argv) i = ACE_OS::atoi(get_opts.opt_arg ()); if (i<2) { - ACE_ERROR((LM_ERROR, + ACE_ERROR((LM_ERROR, ACE_LIB_TEXT ("Invalid breath, must be 2 or more\n"))); exit(1); } @@ -114,7 +113,7 @@ main (int argc, ACE_TCHAR **argv) i = ACE_OS::atoi(get_opts.opt_arg ()); if (i<2) { - ACE_ERROR((LM_ERROR, + ACE_ERROR((LM_ERROR, ACE_LIB_TEXT ("Invalid depth, must be 2 or more\n"))); exit(1); } @@ -124,7 +123,7 @@ main (int argc, ACE_TCHAR **argv) i = ACE_OS::atoi(get_opts.opt_arg ()); if (i<2) { - ACE_ERROR((LM_ERROR, + ACE_ERROR((LM_ERROR, ACE_LIB_TEXT ("Invalid breath, must be 2 or more\n"))); exit(1); } @@ -194,7 +193,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to resolve name servers")); return -1; } @@ -235,7 +234,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to create a lot of objects")); return -1; } @@ -263,7 +262,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to create deep context")); return -1; } @@ -289,7 +288,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to create wide context")); return -1; } @@ -317,7 +316,7 @@ main (int argc, ACE_TCHAR **argv) CORBA::Object_var result_obj_ref = root_context_1->resolve (wide2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); - CosNaming::NamingContext_var result_object = + CosNaming::NamingContext_var result_object = CosNaming::NamingContext::_narrow (result_obj_ref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); @@ -342,7 +341,7 @@ main (int argc, ACE_TCHAR **argv) } result_obj_ref = root_context_1->resolve (deep ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); - result_object = + result_object = CosNaming::NamingContext::_narrow (result_obj_ref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); @@ -359,7 +358,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to delete objects")); return -1; } @@ -392,7 +391,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to resolve object from redundant server")); return -1; } @@ -433,7 +432,7 @@ main (int argc, ACE_TCHAR **argv) CORBA::Object_var result_obj_ref = root_context_2->resolve (wide ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_h); - CosNaming::NamingContext_var result_object = + CosNaming::NamingContext_var result_object = CosNaming::NamingContext::_narrow (result_obj_ref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_h); @@ -446,7 +445,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to resolve wide context from redundant server")); return -1; } @@ -514,7 +513,7 @@ main (int argc, ACE_TCHAR **argv) CORBA::Object_var result_obj_ref = root_context_1->resolve (deep ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_k); - CosNaming::NamingContext_var result_object = + CosNaming::NamingContext_var result_object = CosNaming::NamingContext::_narrow (result_obj_ref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_k); @@ -529,7 +528,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to resolve deep context from redundant server")); return -1; } diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h index 15eb7fe577e..8b72d84d4cc 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h @@ -20,7 +20,7 @@ #include "test_objectS.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Client.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "ace/Task.h" class Naming_Test diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc index 97620a0feb0..22d615b4010 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Client) : namingexe, portableserver { +project(*Client) : namingexe, portableserver, utils { Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc index 97620a0feb0..0a4a4f0b63a 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc +++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Client) : namingexe, portableserver { +project(*Client) : namingexe, utils, portableserver { Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index 15eb7fe577e..8b72d84d4cc 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/client.h @@ -20,7 +20,7 @@ #include "test_objectS.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Client.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "ace/Task.h" class Naming_Test diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc index be9a73bffe7..c3bce6c79df 100644 --- a/TAO/orbsvcs/tests/Trading/Trading.mpc +++ b/TAO/orbsvcs/tests/Trading/Trading.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynamicany, portableserver { +project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, portableserver { sharedname = TTest idlflags += -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h dynamicflags = TAO_TTEST_BUILD_DLL @@ -23,7 +23,7 @@ project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynam } } -project(*export test): namingexe, trading_serv, dynamicany, portableserver { +project(*export test): namingexe, trading_serv, utils, portableserver { after += Trading_Test_Lib libs += TTest @@ -35,7 +35,7 @@ project(*export test): namingexe, trading_serv, dynamicany, portableserver { } } -project(*import test): namingexe, trading_serv, dynamicany, portableserver { +project(*import test): namingexe, trading_serv, utils, portableserver { after += Trading_Test_Lib libs += TTest @@ -47,7 +47,7 @@ project(*import test): namingexe, trading_serv, dynamicany, portableserver { } } -project(*colocated test): namingexe, trading_serv, dynamicany { +project(*colocated test): namingexe, trading_serv, utils { after += Trading_Test_Lib libs += TTest diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index aa780f7e187..95f0dcf7ec6 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -2,15 +2,15 @@ #include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "Offer_Exporter.h" #include "Offer_Importer.h" #include "Service_Type_Exporter.h" #include "orbsvcs/Trader/Trader.h" #include "orbsvcs/Trader/Service_Type_Repository.h" -ACE_RCSID (Trading, - colocated_test, +ACE_RCSID (Trading, + colocated_test, "$Id$") void diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 23fc4c88e83..9078aa74b23 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "Offer_Exporter.h" #include "Offer_Importer.h" #include "Service_Type_Exporter.h" @@ -8,8 +8,8 @@ #include "orbsvcs/Trader/Trader.h" #include "orbsvcs/Trader/Service_Type_Repository.h" -ACE_RCSID (Trading, - export_test, +ACE_RCSID (Trading, + export_test, "$Id$") int diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index 8c96bd0b963..f303d292998 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "Offer_Importer.h" ACE_RCSID(Trading, import_test, "$Id$") |