diff options
37 files changed, 138 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog index 54b32745452..1b9dd862a18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Mon Jun 20 10:46:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/portableserver.mpb: + The portableserver library is not dependent on pi anymore. + The new pi_server library is dependent. + + * bin/MakeProjectCreator/config/ftrtevent.mpb: + * bin/MakeProjectCreator/config/ftrteventchannel.mpb: + * bin/MakeProjectCreator/config/ifrservice.mpb: + These projects use functionality of pi_server, so added that + as base project + + * bin/MakeProjectCreator/config/rtportableserver.mpb: + * bin/MakeProjectCreator/config/messaging.mpb: + Added pi as base project, this was implicitly in the past because + portableserver was based on pi. + Fri Jun 17 17:37:53 2005 Emre Turkay <turkaye@dre.vanderbilt.edu> * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb: diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d5b4f5ddd6e..11679ed34de 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,83 @@ +Mon Jun 20 10:46:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/PI_Server.mpc: + New MPC file to build the new PI_Server library + + * examples/POA/DSI/Database_i.h: + * examples/POA/Default_Servant/File_i.cpp: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp: + * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp: + * orbsvcs/orbsvcs/IFRService/Repository_i.h: + * orbsvcs/tests/FtRtEvent/PushConsumer.cpp: + * orbsvcs/tests/FtRtEvent/PushSupplier.cpp: + * orbsvcs/tests/ImplRepo/scale/server_i.cpp: + * tests/Collocation_Opportunities/Collocation_Opportunities.cpp: + * tests/File_IO/File_i.cpp: + * tests/ORT/ServerRequestInterceptor.h: + * tests/POA/Current/Current.cpp: + * tests/POA/Persistent_ID/server.cpp: + * tests/POA/Policies/Policies.cpp: + Added include of tao/PI_Server/PI_Server.h because of the + pi_server refactoring. This is needed because these files + use functionality that is now in the pi_server lib + + * tests/File_IO/File_IO.mpc: + * tests/ORT/ORT.mpc: + * tests/POA/Current/Current.mpc: + * tests/POA/Persistent_ID/Persistent_ID.mpc: + * tests/POA/Policies/Policies.mpc: + * tests/Portable_Interceptors/AMI/PI_AMI.mpc: + * tests/Collocation_Opportunities/Collocation_Opportunities.mpc: + * examples/POA/DSI/POA_DSI.mpc: + * examples/POA/Default_Servant/POA_Default_Servant.mpc: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/orbsvcs/FtRtEvent.mpc: + * orbsvcs/orbsvcs/IFRService.mpc: + * orbsvcs/tests/ImplRepo/scale/scaletest.mpc: + Added pi_server as base project + + * tao/Messaging.mpc: + Added pi as base project, messaging needs pi stuff + + * tao/PortableServer.mpc: + PortableServer is not dependent on pi anymore + + * tao/TAO_Internal.cpp: + If the PI_Server_Loader is available, initialize it, this way + we get the needed services available + + * tao/PortableServer/Object_Adapter_Factory.{cpp,h}: + No need to register the ORBInitializer, this is now in the pi_server + library + + * tao/PortableServer/POA_Current_Impl.{h,cpp}: + Removed exception throw spec and environment macros. These are + coming from POA::Curent but are not used here and just make + things dependent on IDL generated code which it doesn't need + to be. + + * tao/RTPortableServer/RT_Object_Adapter_Factory.{h,cpp}: + No need to register POA::Current, this is in the pi_server lib. + Also the adapter can be derived from TAO_Adapter_Factory + + * tao/PortableServer/POA_Current.cpp + * tao/PortableServer/POA_Current.h + * tao/PortableServer/POA_Current.inl + * tao/PortableServer/PS_Current.pidl + * tao/PortableServer/PS_CurrentA.cpp + * tao/PortableServer/PS_CurrentC.cpp + * tao/PortableServer/PS_CurrentC.h + * tao/PortableServer/Policy_Creator_T.h + * tao/PortableServer/PortableServer_ORBInitializer.cpp + * tao/PortableServer/PortableServer_ORBInitializer.h + * tao/PortableServer/PortableServer_PolicyFactory.cpp + * tao/PortableServer/PortableServer_PolicyFactory.h + Removed these files, they are now in the pi_server library. + If you included one of these files or used the functionality + of the classes in one of these files, include + tao/PI_Server/PI_Server.h and link the new pi_server library. + Sat Jun 18 18:53:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/CORBA_String.{h,inl}: diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h index 70a0f306963..54e75e931f3 100644 --- a/TAO/examples/POA/DSI/Database_i.h +++ b/TAO/examples/POA/DSI/Database_i.h @@ -7,7 +7,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/DynamicInterface/Dynamic_Implementation.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" #include "ace/Singleton.h" #include "ace/Malloc.h" diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc index 62a433a23c3..ba33f8216d3 100644 --- a/TAO/examples/POA/DSI/POA_DSI.mpc +++ b/TAO/examples/POA/DSI/POA_DSI.mpc @@ -6,7 +6,7 @@ project(*Client) : taoclient, messaging, minimum_corba { } } -project(*Server) : taoserver, messaging, dynamicinterface, minimum_corba { +project(*Server) : taoserver, messaging, dynamicinterface, pi_server, minimum_corba { source_files { Database_i.cpp server.cpp diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp index 56145e39158..71efe4a6b34 100644 --- a/TAO/examples/POA/Default_Servant/File_i.cpp +++ b/TAO/examples/POA/Default_Servant/File_i.cpp @@ -18,7 +18,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" ACE_RCSID(Default_Servant, File_i, "$Id$") diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc index 52883cadbcd..49da2f6992a 100644 --- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc +++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc @@ -8,7 +8,7 @@ project(*Client) : taoclient, minimum_corba { } } -project(*Server) : taoserver, minimum_corba { +project(*Server) : taoserver, pi_server, minimum_corba { source_files { File_i.cpp server.cpp diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index a5678ee4b49..5c55b1630af 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -18,7 +18,7 @@ #include "tao/Object_KeyC.h" #include "tao/ORB_Constants.h" -#include "tao/PortableServer/POA_Current.h" +#include "tao/PI_Server/PI_Server.h" #include "tao/PortableServer/POA_Current_Impl.h" /** diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index d8cd2047ceb..5231a4c382f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -65,7 +65,7 @@ project(ImR_Activator) : orbsvcslib, core, acexml, minimum_corba, valuetype, por } } -project(ImR_Locator) : orbsvcslib, core, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml, imr_client { +project(ImR_Locator) : orbsvcslib, core, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml, pi_server, imr_client { sharedname = TAO_ImR_Locator dynamicflags = LOCATOR_BUILD_DLL after += ImR_Locator_IDL ImR_Activator_IDL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index f1068579605..0e36ebdd7cd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba { +project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server, ami { sharedname = TAO_FtRtEvent idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h @@ -9,7 +9,6 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimu tagchecks = FtRtEvent IDL_Files { - idlflags += -GC FTRT.idl FtRtecEventComm.idl FTRT_GroupManager.idl @@ -59,7 +58,7 @@ project (FTRT_ClientORB) : messaging, orbsvcslib, core { } } -project (FTRT_EventChannel) : orbsvcslib, core, ftrtevent, rtevent_serv, utils, corba_messaging { +project (FTRT_EventChannel) : orbsvcslib, core, ftrtevent, rtevent_serv, utils, pi_server, corba_messaging { sharedname = TAO_FTRT_EventChannel dynamicflags = TAO_FTRTEC_BUILD_DLL tagchecks = FTRT_EventChannel diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index b835b0e4ab6..145521d51af 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -4,7 +4,7 @@ #include "Update_Manager.h" #include "AMI_Primary_Replication_Strategy.h" #include "../Utils/resolve_init.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" ACE_RCSID (EventChannel, UpdateableHandler, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 9db2b2cb14b..c3990fd3177 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -4,7 +4,7 @@ #include "resolve_init.h" #include "orbsvcs/FtRtecEventCommS.h" #include "tao/ORB_Core.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" ACE_RCSID (Utils, FTEC_Gateway, diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index 2cd7439e464..d1c9375adaa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, minimum_corba { +project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, pi_server, minimum_corba { sharedname = TAO_IFRService dynamicflags = TAO_IFRSERVICE_BUILD_DLL tagchecks += IFRService diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 40a6ad707df..c9b85b4a2bd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -13,7 +13,6 @@ #include "ace/Lock_Adapter_T.h" #include "ace/SString.h" - ACE_RCSID (IFR_Service, Repository_i, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index b90d4f2259a..520a3e38e55 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -35,7 +35,7 @@ #include "IFR_macro.h" #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" #include "tao/CORBA_String.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" class IFR_Servant_Factory; diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index 98925443c7d..b91f4c5e7b6 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -3,7 +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 "tao/PI_Server/PI_Server.h" #include <stdio.h> ACE_RCSID (FtRtEvent, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 347af9f1e8c..db5905c7d0f 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -8,7 +8,7 @@ #include "tao/MProfile.h" #include "tao/Stub.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" ACE_RCSID (FtRtEvent, PushSupplier, diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc index e48c599e972..9bfa04029b5 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { +project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, pi_server, imr_client { IDL_Files { test.idl } diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index cf8deee844e..b8028055ac3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -3,7 +3,7 @@ #include "server_i.h" #include "tao/IORTable/IORTable.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" #include "tao/PortableServer/Root_POA.h" #include "tao/ImR_Client/ImR_Client.h" diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 8ac82ecaa4e..2e4059c9d73 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -3,7 +3,8 @@ #include "testS.h" #include "ace/Task.h" #include "tao/PortableServer/Object_Adapter.h" -#include "tao/PortableServer/POA_Current.h" +#include "tao/PI_Server/PI_Server.h" +#include "tao/PI_Server/POA_Current.h" #include "tao/PortableServer/POA_Current_Impl.h" ACE_RCSID(Collocation_Opportunities, Collocation_Opportunities, "$Id$") diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc index 6abbe5ef004..97060558b60 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(Collocation Opportunities): taoserver { +project(Collocation Opportunities): taoserver, pi_server { exename = Collocation_Opportunities } diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc index fd2f6728b1e..1a48ef667d1 100644 --- a/TAO/tests/File_IO/File_IO.mpc +++ b/TAO/tests/File_IO/File_IO.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba { +project(*Server): taoserver, pi_server, minimum_corba { Source_Files { File_i.cpp server.cpp diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index c41f1b0d538..43d517304b2 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -18,7 +18,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" ACE_RCSID(Default_Servant, File_i, "File_i.cpp,v 1.14 2001/03/04 19:27:53 irfan Exp") diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc index c20b88c114f..9c288c29f52 100644 --- a/TAO/tests/ORT/ORT.mpc +++ b/TAO/tests/ORT/ORT.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, interceptors { +project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server, interceptors { IDL_Files { ORT_test.idl ObjectReferenceFactory.idl diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h index 2ed5ff811d1..d46cf2612d3 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.h +++ b/TAO/tests/ORT/ServerRequestInterceptor.h @@ -27,7 +27,7 @@ #include "tao/CORBA_String.h" #include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" #if defined(_MSC_VER) diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp index d5364eef459..781f03e9e22 100644 --- a/TAO/tests/POA/Current/Current.cpp +++ b/TAO/tests/POA/Current/Current.cpp @@ -19,7 +19,7 @@ #include "tao/ORB.h" #include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/POA/Current/Current.mpc b/TAO/tests/POA/Current/Current.mpc index 8b143029fd2..49fcc0fc6a3 100644 --- a/TAO/tests/POA/Current/Current.mpc +++ b/TAO/tests/POA/Current/Current.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver { +project(POA*): taoexe, portableserver, pi_server { } diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc index 89672d7e32a..decda43041e 100644 --- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc +++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc @@ -1,13 +1,14 @@ // -*- MPC -*- // $Id$ -project(POA_server*): taoexe, portableserver { +project(POA_server*): taoserver, pi_server { Source_Files { server.cpp } } -project(POA_client*): taoexe, portableserver { +project(POA_client*): taoserver { + exename = client Source_Files { client.cpp } diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index b972141b428..8a28b12dd3f 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -20,7 +20,7 @@ #include "ace/SString.h" #include "testS.h" #include "ace/OS_NS_stdio.h" -#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PI_Server/PI_Server.h" ACE_RCSID(Explicit_Activation, server, "$Id$") diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp index cc25f6679b9..77a64c760c1 100644 --- a/TAO/tests/POA/Policies/Policies.cpp +++ b/TAO/tests/POA/Policies/Policies.cpp @@ -21,6 +21,7 @@ #include "tao/ORB.h" #include "tao/Any.h" #include "tao/PortableServer/PortableServer.h" +#include "tao/PI_Server/PI_Server.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc index 8b143029fd2..49fcc0fc6a3 100644 --- a/TAO/tests/POA/Policies/Policies.mpc +++ b/TAO/tests/POA/Policies/Policies.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver { +project(POA*): taoexe, portableserver, pi_server { } diff --git a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc index 45450026f7b..b5ba7c2e4b8 100644 --- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc +++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Client) : messaging, taoserver, ami { +project(*Client) : messaging, taoserver, ami, interceptors { exename = client source_files { client.cpp @@ -11,8 +11,8 @@ project(*Client) : messaging, taoserver, ami { } } -project(*server) : messaging, taoserver, ami { - exename = server +project(*server) : messaging, taoserver, ami, interceptors { + exename = server source_files { server.cpp Server_Interceptor.cpp diff --git a/bin/MakeProjectCreator/config/ftrtevent.mpb b/bin/MakeProjectCreator/config/ftrtevent.mpb index 3310bc40113..a165bf52c67 100644 --- a/bin/MakeProjectCreator/config/ftrtevent.mpb +++ b/bin/MakeProjectCreator/config/ftrtevent.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ftorbutils, rtevent_serv, naming, messaging, minimum_corba { +project : ftorbutils, rtevent_serv, naming, messaging, pi_server, minimum_corba { after += FtRtEvent libs += TAO_FtRtEvent tagchecks += FtRtEvent diff --git a/bin/MakeProjectCreator/config/ftrteventchannel.mpb b/bin/MakeProjectCreator/config/ftrteventchannel.mpb index 3af417f8f1e..36b2fb92a02 100644 --- a/bin/MakeProjectCreator/config/ftrteventchannel.mpb +++ b/bin/MakeProjectCreator/config/ftrteventchannel.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ftrtevent, utils, corba_messaging { +project : ftrtevent, utils, corba_messaging, pi_server { after += FTRT_EventChannel libs += TAO_FTRT_EventChannel includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel diff --git a/bin/MakeProjectCreator/config/ifrservice.mpb b/bin/MakeProjectCreator/config/ifrservice.mpb index 0e0ffc4e67b..c8494b989b0 100644 --- a/bin/MakeProjectCreator/config/ifrservice.mpb +++ b/bin/MakeProjectCreator/config/ifrservice.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : iortable, svc_utils, typecodefactory, minimum_corba { +project : iortable, svc_utils, typecodefactory, pi_server, minimum_corba { after += IFRService libs += TAO_IFRService tagchecks += IFRService diff --git a/bin/MakeProjectCreator/config/messaging.mpb b/bin/MakeProjectCreator/config/messaging.mpb index 28a962e1b46..886265898a4 100644 --- a/bin/MakeProjectCreator/config/messaging.mpb +++ b/bin/MakeProjectCreator/config/messaging.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : valuetype, portableserver, corba_messaging { +project : valuetype, portableserver, pi, corba_messaging { after += Messaging libs += TAO_Messaging } diff --git a/bin/MakeProjectCreator/config/portableserver.mpb b/bin/MakeProjectCreator/config/portableserver.mpb index 9f556ae121b..484d7aa83c2 100644 --- a/bin/MakeProjectCreator/config/portableserver.mpb +++ b/bin/MakeProjectCreator/config/portableserver.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taolib, pi { +project : taolib { after += PortableServer libs += TAO_PortableServer } diff --git a/bin/MakeProjectCreator/config/rtportableserver.mpb b/bin/MakeProjectCreator/config/rtportableserver.mpb index af208951320..ee3d17fe942 100644 --- a/bin/MakeProjectCreator/config/rtportableserver.mpb +++ b/bin/MakeProjectCreator/config/rtportableserver.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : portableserver, rtcorba { - after += RTPortableServer +project : pi, portableserver, rtcorba { + after += RTPortableServer libs += TAO_RTPortableServer } |