diff options
Diffstat (limited to 'TAO/examples')
63 files changed, 179 insertions, 155 deletions
diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp index 17b74ff11fa..5b8d094b4d3 100644 --- a/TAO/examples/Advanced/ch_18/server.cpp +++ b/TAO/examples/Advanced/ch_18/server.cpp @@ -25,7 +25,7 @@ #include "server.h" #include <algorithm> #include "icp.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" const char * Controller_oid = "Controller"; const unsigned int DeviceLocator_impl::MAX_EQ_SIZE = 100; diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc index 7f62ba20434..e4df81125a3 100644 --- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc +++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Callback_Quoter notifier): namingexe, naming_serv { +project(Callback_Quoter notifier): namingexe { Source_Files { Notifier_i.cpp Notifier_Input_Handler.cpp @@ -9,7 +9,7 @@ project(Callback_Quoter notifier): namingexe, naming_serv { } } -project(Callback_Quoter consumer): namingexe, portableserver { +project(Callback_Quoter consumer): namingexe { Source_Files { Consumer_Input_Handler.cpp Consumer_Signal_Handler.cpp @@ -19,7 +19,7 @@ project(Callback_Quoter consumer): namingexe, portableserver { } } -project(Callback_Quoter supplier): namingexe, portableserver { +project(Callback_Quoter supplier): namingexe { Source_Files { Supplier_i.cpp Supplier_Timer_Handler.cpp diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h index 9a0cd8b6c22..cc0646c0ef2 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.h +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h @@ -31,8 +31,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Consumer_Input_Handler.h" #include "Consumer_Signal_Handler.h" diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h index 9f5279a815b..6e126029194 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h @@ -22,8 +22,8 @@ #include "Notifier_i.h" #include "NotifierS.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/CosNamingS.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/CosNamingS.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class Notifier_Input_Handler : public ACE_Event_Handler { diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h index 2753e58c776..cae78aa15d9 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.h +++ b/TAO/examples/Callback_Quoter/Supplier_i.h @@ -19,8 +19,8 @@ #ifndef SUPPLIER_I_H #define SUPPLIER_I_H -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Reactor.h" #include "ace/Read_Buffer.h" #include "NotifierC.h" diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index 4f4368cca67..7a5969d2c29 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -5,7 +5,7 @@ #include "ace/Process_Manager.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Web_ServerC.h" #include "Iterator_Handler.h" diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp index a1c2d6de7e5..e1f4fa883e0 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp @@ -3,7 +3,7 @@ // Ossama Othman <ossama@uci.edu> -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Web_ServerS.h" #include "Iterator_Factory_i.h" diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 986c828875a..2daf289a7ff 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp @@ -5,7 +5,7 @@ #include "ace/Process_Manager.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Push_Web_ServerC.h" #include "Push_Iterator_Handler.h" diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp index 83388bc3fb9..2f83bff364b 100644 --- a/TAO/examples/Content_Server/AMI_Observer/server.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp @@ -3,7 +3,7 @@ // Ossama Othman <ossama@uci.edu> -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Push_Web_ServerS.h" #include "Push_Iterator_Factory_i.h" diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc index 02d4eecf462..fd7509be985 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc +++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): namingexe, portableserver { +project(*Server): namingexe { Source_Files { Content_Iterator_i.cpp Iterator_Factory_i.cpp diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index a5ec056cc20..fe5151af49a 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -5,7 +5,7 @@ #include "ace/FILE_Connector.h" #include "ace/Process_Manager.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Web_ServerC.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp index 701dccbeac0..f72546b7767 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp @@ -3,7 +3,7 @@ // Ossama Othman <ossama@uci.edu> -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Web_ServerS.h" #include "Iterator_Factory_i.h" diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h index b7bee482f35..2df1a0b799f 100644 --- a/TAO/examples/Event_Comm/Consumer_Handler.h +++ b/TAO/examples/Event_Comm/Consumer_Handler.h @@ -23,8 +23,8 @@ #define _CONSUMER_HANDLER_H #include "Event_Comm_i.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" class Consumer_Handler { diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc index fd6298eee08..65a948f7185 100644 --- a/TAO/examples/Event_Comm/Event_Comm.mpc +++ b/TAO/examples/Event_Comm/Event_Comm.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*notifier): namingexe, naming_serv { +project(*notifier): namingexe { Source_Files { Event_Comm_i.cpp Notifier_Server.cpp @@ -9,7 +9,7 @@ project(*notifier): namingexe, naming_serv { } } -project(*consumer): namingexe, portableserver { +project(*consumer): namingexe { Source_Files { Consumer_Input_Handler.cpp Consumer_Handler.cpp @@ -18,7 +18,7 @@ project(*consumer): namingexe, portableserver { } } -project(*supplier): namingexe, portableserver { +project(*supplier): namingexe { Source_Files { Event_Comm_i.cpp Supplier_Input_Handler.cpp diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h index 103664a4756..6a13a2485d0 100644 --- a/TAO/examples/Event_Comm/Notifier_Handler.h +++ b/TAO/examples/Event_Comm/Notifier_Handler.h @@ -24,8 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" class Notifier_Handler { diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h index bbb1880c33a..3be60e4bc63 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.h +++ b/TAO/examples/Event_Comm/Notifier_Server.h @@ -19,8 +19,8 @@ #include "Event_Comm_i.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/CosNamingS.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/CosNamingS.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class Notifier_Server { diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index 81e8d8b0d83..7b8721e8014 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -7,7 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "MUF_Scheduler.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" ACE_RCSID(MT_Server, client, "$Id$") diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc index 3fa7f6dcd1e..91fc9b26f27 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc @@ -9,8 +9,9 @@ project(muf_server): kokyu_dsrt_scheduler_server { } } -project(muf_client): orbsvcsexe, svc_utils, kokyu_dsrt_scheduler_client { +project(muf_client): orbsvcsexe, kokyu_dsrt_scheduler_client { exename = muf_client + libs += TAO_Svc_Utils Source_Files { testC.cpp client.cpp diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc index 84bdfb0f588..4be2d6c7ce4 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc @@ -1,8 +1,8 @@ // -*- MPC -*- // $Id$ -project(*balancer): taoexe, portableserver, minimum_corba { - avoids += repo +project(*balancer): taoexe, portableserver { + avoids += minimum_corba repo exename = load_balancer IDL_Files { @@ -17,8 +17,8 @@ project(*balancer): taoexe, portableserver, minimum_corba { } } -project(*server): taoserver, minimum_corba { - avoids += repo +project(*server): taoserver { + avoids += minimum_corba repo Source_Files { IdentityC.cpp @@ -29,8 +29,8 @@ project(*server): taoserver, minimum_corba { } } -project(*client): taoclient, portableserver, minimum_corba { - avoids += repo +project(*client): taoclient, portableserver { + avoids += minimum_corba repo exename = client Source_Files { diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc index 60513e19345..41fae6859b0 100644 --- a/TAO/examples/Logging/Logging.mpc +++ b/TAO/examples/Logging/Logging.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Service): namingexe, naming_serv, lifecycle { +project(*Service): namingexe, lifecycle { Source_Files { Logger_i.cpp Logging_Service.cpp diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h index e0916ad81ed..9d7e8e01dc2 100644 --- a/TAO/examples/Logging/Logging_Service_i.h +++ b/TAO/examples/Logging/Logging_Service_i.h @@ -32,8 +32,8 @@ #include "ace/Log_Msg.h" #include "ace/OS.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #include "Logger_i.h" #include "LoggerS.h" #include "LoggerC.h" diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index d04a9f713e7..6aaad74b114 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -2,7 +2,7 @@ #include "LoggerC.h" #include "Logging_Test_i.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/debug.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h index 781c55a7b4f..753b0cd7bc0 100644 --- a/TAO/examples/Logging/Logging_Test_i.h +++ b/TAO/examples/Logging/Logging_Test_i.h @@ -28,9 +28,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "LoggerC.h" -#include "orbsvcs/Naming/Naming_Client.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class Logger_Client { diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc index ce1d87be55f..f38edeefc8c 100644 --- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc +++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*server): taoexe, portableserver, valuetype, minimum_corba { +project(*server): taoexe, portableserver, valuetype { + avoids += minimum_corba Source_Files { Server_i.cpp Event_Types_impl.cpp @@ -10,7 +11,8 @@ project(*server): taoexe, portableserver, valuetype, minimum_corba { } } -project(*client): taoexe, portableserver, valuetype, minimum_corba { +project(*client): taoexe, portableserver, valuetype { + avoids += minimum_corba Source_Files { Client_i.cpp Event_Types_impl.cpp diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc index 7f01d95962a..92e0254b024 100644 --- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc +++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver { + avoids += minimum_corba includes += ../Generic_Servant libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc index 04d3e67fc42..19d9e4f61a2 100644 --- a/TAO/examples/POA/DSI/POA_DSI.mpc +++ b/TAO/examples/POA/DSI/POA_DSI.mpc @@ -1,11 +1,13 @@ //$Id$ -project(*Client) : taoexe, messaging, portableserver, minimum_corba { +project(*Client) : taoexe, messaging, portableserver { + avoids += minimum_corba source_files { client.cpp } } -project(*Server) : taoexe, messaging, portableserver, dynamicinterface, minimum_corba { +project(*Server) : taoexe, messaging, portableserver, dynamicinterface{ + avoids += minimum_corba source_files { Database_i.cpp server.cpp diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc index 779807622d3..dd0c0d645cd 100644 --- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc +++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc @@ -1,13 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Client) : taoexe, portableserver, minimum_corba { +project(*Client) : taoexe, portableserver { + avoids += minimum_corba source_files { client.cpp } } -project(*Server) : taoexe, portableserver, minimum_corba { +project(*Server) : taoexe, portableserver { + avoids += minimum_corba source_files { File_i.cpp server.cpp diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc index 7f01d95962a..92e0254b024 100644 --- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc +++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver { + avoids += minimum_corba includes += ../Generic_Servant libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc index e5743eb768c..e2176127181 100644 --- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc +++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc @@ -1,6 +1,7 @@ // -*- MPC -*- // $Id$ -project: taoexe, portableserver, minimum_corba { +project: taoexe, portableserver { + avoids += minimum_corba } diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc index 6356aeab319..e8b34068166 100644 --- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc +++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc @@ -1,13 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Client) : taoexe, portableserver, minimum_corba { +project(*Client) : taoexe, portableserver { + avoids += minimum_corba source_files { client.cpp } } -project(*Server) : taoexe, portableserver, minimum_corba { +project(*Server) : taoexe, portableserver { + avoids += minimum_corba source_files { test_i.cpp server.cpp diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc index 0cc793eef25..5ddbc1753a3 100644 --- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc +++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc @@ -1,5 +1,6 @@ // $Id$ -project(*lib): taolib_with_idl, portableserver, minimum_corba { +project(*lib): taolib_with_idl, portableserver { + avoids += minimum_corba sharedname = Generic_Servant dynamicflags = GENERIC_SERVANT_BUILD_DLL idlflags += -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h @@ -8,7 +9,8 @@ project(*lib): taolib_with_idl, portableserver, minimum_corba { } } -project(*client): taoexe, portableserver, minimum_corba { +project(*client): taoexe, portableserver { + avoids += minimum_corba after += *lib libs += Generic_Servant idl_files { diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc index 5fb4927d770..08d63c26e51 100644 --- a/TAO/examples/POA/Loader/POA_Loader.mpc +++ b/TAO/examples/POA/Loader/POA_Loader.mpc @@ -1,5 +1,6 @@ // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver { + avoids += minimum_corba Source_Files { server.cpp Servant_Activator.cpp diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc index b330e9a825f..de7282249a6 100644 --- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc +++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc @@ -1,3 +1,4 @@ //$Id$ -project : taoexe, portableserver, minimum_corba { +project : taoexe, portableserver { + avoids += minimum_corba } diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc index 57a09f749b8..04ca8b96d72 100644 --- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc +++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver { + avoids += minimum_corba includes += ../Generic_Servant libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc index 843c856715b..6c3c72f5505 100644 --- a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc +++ b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver { + avoids += minimum_corba Source_Files { server.cpp Servant_Activator.cpp diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc index 368e062cbc6..d1e881a3dab 100644 --- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc +++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc @@ -1,5 +1,8 @@ // -*- MPC -*- // $Id$ -project: taoexe, portableserver, bidir_giop, minimum_corba { +project: taoexe, portableserver, bidir_giop { + + avoids += minimum_corba } + diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc index 0b54971c2cb..6f42aaf7f48 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc +++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver { + avoids += minimum_corba includes += ../Generic_Servant libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc index e517831c421..e921c19724a 100644 --- a/TAO/examples/POA/TIE/POA_TIE.mpc +++ b/TAO/examples/POA/TIE/POA_TIE.mpc @@ -1,14 +1,16 @@ // -*- MPC -*- // $Id$ -project(*Client) : taoexe, portableserver, minimum_corba { +project(*Client) : taoexe, portableserver { + avoids += minimum_corba source_files { client.cpp testC.cpp } } -project(*Server) : taoexe, portableserver, minimum_corba { +project(*Server) : taoexe, portableserver { + avoids += minimum_corba source_files { test_i.cpp server.cpp diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 28a01e93b28..8ac9cf12210 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -168,19 +168,14 @@ Client::svc (void) //ACE_DEBUG ((LM_DEBUG, "...finished\n")); long dur = measured.sec () * 1000000 + measured.usec (); - if (dur == 0) - ACE_DEBUG ((LM_DEBUG, "Time not measurable, calculation skipped\n")); - else - { - ACE_DEBUG ((LM_DEBUG, - "Time for %u Msgs: %u usec \n", - this->niterations_, - dur)); - - ACE_DEBUG ((LM_DEBUG, "Time for 1 Msg: %u usec, %u calls/sec\n", - dur / this->niterations_, - 1000000 / (dur / this->niterations_))); - } + ACE_DEBUG ((LM_DEBUG, + "Time for %u Msgs: %u usec \n", + this->niterations_, + measured.sec () * 1000000 + measured.usec ())); + + ACE_DEBUG ((LM_DEBUG, "Time for 1 Msg: %u usec, %u calls/sec\n", + dur / this->niterations_, + 1000000 / (dur / this->niterations_))); server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp index 12516fcb83a..340bb6d7e78 100644 --- a/TAO/examples/Quoter/Generic_Factory.cpp +++ b/TAO/examples/Quoter/Generic_Factory.cpp @@ -15,7 +15,7 @@ #include "Generic_Factory.h" -#include "orbsvcs/LifeCycleServiceC.h" +#include "orbsvcs/orbsvcs/LifeCycleServiceC.h" ACE_RCSID (Quoter, Generic_Factory, diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc index f972a2040d5..c48f1565830 100644 --- a/TAO/examples/Quoter/Quoter.mpc +++ b/TAO/examples/Quoter/Quoter.mpc @@ -4,7 +4,8 @@ // todo : Once MPC is used for everything, we should consider // removing the includes += lines below, and updating // the source code instead. -project(*server): namingexe, lifecycle, minimum_corba { +project(*server): namingexe, lifecycle { + avoids += minimum_corba idlflags += -I../../orbsvcs/orbsvcs includes += ../../orbsvcs/orbsvcs Source_Files { @@ -13,7 +14,8 @@ project(*server): namingexe, lifecycle, minimum_corba { } } -project(*client): namingexe, lifecycle, minimum_corba { +project(*client): namingexe, lifecycle { + avoids += minimum_corba idlflags += -I../../orbsvcs/orbsvcs includes += ../../orbsvcs/orbsvcs Source_Files { @@ -21,7 +23,8 @@ project(*client): namingexe, lifecycle, minimum_corba { } } -project(*Factory Finder): namingexe, lifecycle, minimum_corba { +project(*Factory Finder): namingexe, lifecycle { + avoids += minimum_corba idlflags += -I../../orbsvcs/orbsvcs includes += ../../orbsvcs/orbsvcs Source_Files { @@ -30,7 +33,8 @@ project(*Factory Finder): namingexe, lifecycle, minimum_corba { } } -project(*Generic Factory): namingexe, lifecycle, minimum_corba { +project(*Generic Factory): namingexe, lifecycle { + avoids += minimum_corba idlflags += -I../../orbsvcs/orbsvcs includes += ../../orbsvcs/orbsvcs Source_Files { diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index 7dec1d90a22..be51846ebe7 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -2,7 +2,7 @@ #include "ace/Read_Buffer.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "client.h" diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h index d5014c872c8..f171180c031 100644 --- a/TAO/examples/Quoter/client.h +++ b/TAO/examples/Quoter/client.h @@ -28,7 +28,7 @@ #include "QuoterC.h" -#include "orbsvcs/CosLifeCycleC.h" +#include "orbsvcs/orbsvcs/CosLifeCycleC.h" #include "ace/Task.h" #include "ace/Thread_Manager.h" diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h index 880be8f44c6..1b3362e8c1d 100644 --- a/TAO/examples/Quoter/server.h +++ b/TAO/examples/Quoter/server.h @@ -28,8 +28,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Log_Msg.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #include "tao/PortableServer/ORB_Manager.h" #include "Quoter_i.h" #include "QuoterC.h" diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h index ea5cef35093..699bc523440 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.h +++ b/TAO/examples/RTCORBA/Activity/Activity.h @@ -18,7 +18,7 @@ #include "ace/Singleton.h" #include "ace/Sched_Params.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "activity_export.h" diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index 5b333145f0b..fa71c73a8f7 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -13,7 +13,7 @@ #ifndef BUILDER_H #define BUILDER_H -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/RTPortableServer/RTPortableServer.h" class Periodic_Task; diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h index f5263b88645..5a889cc0a29 100644 --- a/TAO/examples/RTScheduling/DT_Creator.h +++ b/TAO/examples/RTScheduling/DT_Creator.h @@ -2,7 +2,7 @@ #ifndef DT_CREATOR_H #define DT_CREATOR_H -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Service_Config.h" #include "ace/Service_Object.h" #include "tao/RTScheduling/RTScheduler.h" diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.cpp b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp index 2e9d20ec627..e6c3d1e3742 100644 --- a/TAO/examples/RTScheduling/MIF_SchedulingC.cpp +++ b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp @@ -56,7 +56,7 @@ namespace TAO // Traits specializations for MIF_Scheduling::SegmentSchedulingParameterPolicy. MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr -TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::duplicate ( +TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::tao_duplicate ( MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p ) { @@ -64,7 +64,7 @@ TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::duplicate } void -TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::release ( +TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::tao_release ( MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p ) { @@ -72,13 +72,13 @@ TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::release ( } MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr -TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::nil (void) +TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::tao_nil (void) { return MIF_Scheduling::SegmentSchedulingParameterPolicy::_nil (); } CORBA::Boolean -TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::marshal ( +TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::tao_marshal ( MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -200,14 +200,14 @@ static const CORBA::Long _oc_MIF_Scheduling_SegmentSchedulingParameterPolicy[] = ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:MIF_Scheduling/SegmentSchedulingParameterPolicy:1.0 33, - ACE_NTOHL (0x5365676d), - ACE_NTOHL (0x656e7453), - ACE_NTOHL (0x63686564), - ACE_NTOHL (0x756c696e), - ACE_NTOHL (0x67506172), - ACE_NTOHL (0x616d6574), - ACE_NTOHL (0x6572506f), - ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x5365676d), + ACE_NTOHL (0x656e7453), + ACE_NTOHL (0x63686564), + ACE_NTOHL (0x756c696e), + ACE_NTOHL (0x67506172), + ACE_NTOHL (0x616d6574), + ACE_NTOHL (0x6572506f), + ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = SegmentSchedulingParameterPolicy }; @@ -231,7 +231,7 @@ namespace MIF_Scheduling // Traits specializations for MIF_Scheduling::MIF_Scheduler. MIF_Scheduling::MIF_Scheduler_ptr -TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::duplicate ( +TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::tao_duplicate ( MIF_Scheduling::MIF_Scheduler_ptr p ) { @@ -239,7 +239,7 @@ TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::duplicate ( } void -TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::release ( +TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::tao_release ( MIF_Scheduling::MIF_Scheduler_ptr p ) { @@ -247,13 +247,13 @@ TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::release ( } MIF_Scheduling::MIF_Scheduler_ptr -TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::nil (void) +TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::tao_nil (void) { return MIF_Scheduling::MIF_Scheduler::_nil (); } CORBA::Boolean -TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::marshal ( +TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::tao_marshal ( MIF_Scheduling::MIF_Scheduler_ptr p, TAO_OutputCDR & cdr ) @@ -262,7 +262,7 @@ TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*MIF_Scheduling__TAO_MIF_Scheduler_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -273,7 +273,7 @@ MIF_Scheduling::MIF_Scheduler::MIF_Scheduler (void) MIF_Scheduling::MIF_Scheduler::~MIF_Scheduler (void) {} -void +void MIF_Scheduling::MIF_Scheduler::_tao_any_destructor (void *_tao_void_pointer) { MIF_Scheduler *_tao_tmp_pointer = @@ -291,10 +291,10 @@ MIF_Scheduling::MIF_Scheduler::_narrow ( { return MIF_Scheduler::_nil (); } - + MIF_Scheduler_ptr proxy = dynamic_cast<MIF_Scheduler_ptr> (_tao_objref); - + return MIF_Scheduler::_duplicate (proxy); } @@ -305,7 +305,7 @@ MIF_Scheduling::MIF_Scheduler::_duplicate (MIF_Scheduler_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -360,20 +360,20 @@ static const CORBA::Long _oc_MIF_Scheduling_MIF_Scheduler[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x4d49465f), - ACE_NTOHL (0x53636865), - ACE_NTOHL (0x64756c69), - ACE_NTOHL (0x6e672f4d), - ACE_NTOHL (0x49465f53), - ACE_NTOHL (0x63686564), - ACE_NTOHL (0x756c6572), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x4d49465f), + ACE_NTOHL (0x53636865), + ACE_NTOHL (0x64756c69), + ACE_NTOHL (0x6e672f4d), + ACE_NTOHL (0x49465f53), + ACE_NTOHL (0x63686564), + ACE_NTOHL (0x756c6572), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:MIF_Scheduling/MIF_Scheduler:1.0 14, - ACE_NTOHL (0x4d49465f), - ACE_NTOHL (0x53636865), - ACE_NTOHL (0x64756c65), + ACE_NTOHL (0x4d49465f), + ACE_NTOHL (0x53636865), + ACE_NTOHL (0x64756c65), ACE_NTOHL (0x72000000), // name = MIF_Scheduler }; @@ -543,7 +543,7 @@ operator>>= ( TAO_Objref_Var_T< MIF_Scheduling::SegmentSchedulingParameterPolicy >; - + template class TAO_Objref_Out_T< MIF_Scheduling::SegmentSchedulingParameterPolicy @@ -563,7 +563,7 @@ operator>>= ( TAO_Objref_Var_T< MIF_Scheduling::MIF_Scheduler >; - + template class TAO_Objref_Out_T< MIF_Scheduling::MIF_Scheduler @@ -585,7 +585,7 @@ operator>>= ( TAO_Objref_Var_T< \ MIF_Scheduling::SegmentSchedulingParameterPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ MIF_Scheduling::SegmentSchedulingParameterPolicy @@ -605,7 +605,7 @@ operator>>= ( TAO_Objref_Var_T< \ MIF_Scheduling::MIF_Scheduler > - + # pragma instantiate \ TAO_Objref_Out_T< \ MIF_Scheduling::MIF_Scheduler @@ -616,4 +616,5 @@ operator>>= ( MIF_Scheduling::MIF_Scheduler \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.h b/TAO/examples/RTScheduling/MIF_SchedulingC.h index fd67d8171a8..11e0aeb9d27 100644 --- a/TAO/examples/RTScheduling/MIF_SchedulingC.h +++ b/TAO/examples/RTScheduling/MIF_SchedulingC.h @@ -299,14 +299,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy> { - static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr duplicate ( + static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr tao_duplicate ( MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr ); - static void release ( + static void tao_release ( MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr ); - static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr nil (void); - static CORBA::Boolean marshal ( + static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -320,14 +320,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct Objref_Traits<MIF_Scheduling::MIF_Scheduler> { - static MIF_Scheduling::MIF_Scheduler_ptr duplicate ( + static MIF_Scheduling::MIF_Scheduler_ptr tao_duplicate ( MIF_Scheduling::MIF_Scheduler_ptr ); - static void release ( + static void tao_release ( MIF_Scheduling::MIF_Scheduler_ptr ); - static MIF_Scheduling::MIF_Scheduler_ptr nil (void); - static CORBA::Boolean marshal ( + static MIF_Scheduling::MIF_Scheduler_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( MIF_Scheduling::MIF_Scheduler_ptr p, TAO_OutputCDR & cdr ); @@ -376,3 +376,4 @@ namespace TAO #endif /* __BORLANDC__ */ #endif /* ifndef */ + diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h index 7a77efe0117..4a717c0a367 100644 --- a/TAO/examples/RTScheduling/Starter.h +++ b/TAO/examples/RTScheduling/Starter.h @@ -2,8 +2,7 @@ #ifndef STARTER_H #define STARTER_H -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #include "SynchC.h" #include "ace/SString.h" #include "ace/Hash_Map_Manager.h" diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h index 543f6dca5e0..bf6ba78109f 100644 --- a/TAO/examples/Simple/Simple_util.h +++ b/TAO/examples/Simple/Simple_util.h @@ -20,8 +20,7 @@ #define TAO_UTIL_H #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc index 600979a6a74..de802cc0313 100644 --- a/TAO/examples/Simple/bank/bank.mpc +++ b/TAO/examples/Simple/bank/bank.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, naming_serv { +project(*server): namingexe { Source_Files { Account_i.cpp AccountManager_i.cpp @@ -10,7 +10,7 @@ project(*server): namingexe, naming_serv { } } -project(*client): namingexe, naming_serv { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc index 737aaab2d22..5a9f45c9660 100644 --- a/TAO/examples/Simple/echo/echo.mpc +++ b/TAO/examples/Simple/echo/echo.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, naming_serv { +project(*server): namingexe { Source_Files { Echo_i.cpp ../Simple_util.cpp @@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv { } } -project(*client): namingexe, naming_serv { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc index 32af3e12220..b7c562c0efb 100644 --- a/TAO/examples/Simple/grid/grid.mpc +++ b/TAO/examples/Simple/grid/grid.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, naming_serv { +project(*server): namingexe { Source_Files { Grid_i.cpp server.cpp @@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv { } } -project(*client): namingexe, naming_serv { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/Simple/time-date/Simple_time_date.mpc b/TAO/examples/Simple/time-date/Simple_time_date.mpc index 7eaefad4fc4..5069c2e7c66 100644 --- a/TAO/examples/Simple/time-date/Simple_time_date.mpc +++ b/TAO/examples/Simple/time-date/Simple_time_date.mpc @@ -26,7 +26,7 @@ project(*server): taoserver { } } -project(*client): taoclient, iortable, namingexe, portableserver { +project(*client): taoclient, namingexe { after += *lib libs += Time_Date libpaths += . diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc index bab89530e80..0de1921511b 100644 --- a/TAO/examples/Simple/time/time.mpc +++ b/TAO/examples/Simple/time/time.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, naming_serv { +project(*server): namingexe { Source_Files { Time_i.cpp server.cpp @@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv { } } -project(*client): namingexe, naming_serv { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index d3f8aae7059..64597a89f24 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -26,8 +26,8 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "tao/PortableServer/ORB_Manager.h" diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc index 1bdbc4e848d..7eaef3102a4 100644 --- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc +++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc @@ -1,6 +1,7 @@ // $Id$ -project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client, minimum_corba { +project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client { + avoids += minimum_corba exename = create_tc Source_Files { testC.cpp diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc index e461065f445..4b0eab8fac7 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc +++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc @@ -1,21 +1,21 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, portableserver { +project(*server): namingexe { Source_Files { status_i.cpp server.cpp } } -project(*client): namingexe, portableserver { +project(*client): namingexe { Source_Files { ior_corbaloc_client_i.cpp client.cpp } } -project(*corbaname client): namingexe, portableserver { +project(*corbaname client): namingexe { Source_Files { status_i.cpp corbaname_client.cpp diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h index 5595ed23148..d27b2152df3 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h +++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h @@ -23,7 +23,7 @@ #define IOR_CORBALOC_CLIENT_I_H #include "corbalocC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/SString.h" diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp index b5351d69be2..415daf348c1 100644 --- a/TAO/examples/ior_corbaloc/server.cpp +++ b/TAO/examples/ior_corbaloc/server.cpp @@ -3,7 +3,7 @@ #include "status_i.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" int main (int argc, char* argv[]) { diff --git a/TAO/examples/mfc/client.mpc b/TAO/examples/mfc/client.mpc index 1769261ac85..03acd5782c3 100644 --- a/TAO/examples/mfc/client.mpc +++ b/TAO/examples/mfc/client.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(MFC client): namingexe, portableserver { +project(MFC client): namingexe { idlflags += -Wb,pch_include=StdAfx.h Source_Files { diff --git a/TAO/examples/mfc/server.mpc b/TAO/examples/mfc/server.mpc index 9b8ccc137f2..fa12033db6d 100644 --- a/TAO/examples/mfc/server.mpc +++ b/TAO/examples/mfc/server.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(MFC Server): namingexe, portableserver, ace_mfc { +project(MFC Server): namingexe, ace_mfc { exename = server pch_header = StdAfx.h pch_source = StdAfx.cpp |