diff options
Diffstat (limited to 'CIAO/ciao/FTComponentServer')
4 files changed, 6 insertions, 5 deletions
diff --git a/CIAO/ciao/FTComponentServer/CIAO_ComponentServer.mpc b/CIAO/ciao/FTComponentServer/CIAO_ComponentServer.mpc index bc3fc300825..a94c69e67d1 100644 --- a/CIAO/ciao/FTComponentServer/CIAO_ComponentServer.mpc +++ b/CIAO/ciao/FTComponentServer/CIAO_ComponentServer.mpc @@ -60,7 +60,7 @@ project(CIAO_FTCS_Client_svnt) : ccm_svnt, ccm_componentserver_svnt, ciao_ft_com } } -project(CIAO_FTComponentServer_svnt) : ccm_componentserver_svnt, ciao_ft_componentserver_stub, portableserver, ciao_ft_componentserver_configurator, ciao_session_container, naming, ciao_server { +project(CIAO_FTComponentServer_svnt) : ccm_componentserver_svnt, ciao_ft_componentserver_stub, portableserver, ciao_ft_componentserver_configurator, ciao_ft_session_container, naming, ciao_server { dynamicflags = CIAO_FTCOMPONENTSERVER_SVNT_BUILD_DLL @@ -75,7 +75,7 @@ project(CIAO_FTComponentServer_svnt) : ccm_componentserver_svnt, ciao_ft_compone } } -project(CIAO_FTComponentServer_exe) : ccm_componentserver_svnt, portableserver, ciao_ft_componentserver_svnt, messaging, anytypecode, ciao_server, ciaoexe, ciao_session_container, ciao_ft_componentserver_configurator, rtcorba { +project(CIAO_FTComponentServer_exe) : ccm_componentserver_svnt, portableserver, ciao_ft_componentserver_svnt, messaging, anytypecode, ciao_server, ciaoexe, ciao_ft_session_container, ciao_ft_componentserver_configurator, pi_server, iorinterceptor {// , rtcorba exename = ciao_ft_componentserver libs += CIAO_Logger LWFT_StateSyncAgent LWFT_ReplicationManager LWFT_Client LWFT_Server macros += CIAO_BUILD_COMPONENTSERVER_EXE diff --git a/CIAO/ciao/FTComponentServer/CIAO_Container_Impl.cpp b/CIAO/ciao/FTComponentServer/CIAO_Container_Impl.cpp index 4d2b4e760eb..270e2faca0c 100644 --- a/CIAO/ciao/FTComponentServer/CIAO_Container_Impl.cpp +++ b/CIAO/ciao/FTComponentServer/CIAO_Container_Impl.cpp @@ -39,13 +39,13 @@ namespace CIAO if (this->static_entrypts_maps_ == 0) { CIAO_DEBUG((LM_DEBUG, CLINFO "CIAO_Container_i: creating Session container with dynamic linkage\n")); - this->container_ = new CIAO::Session_Container (this->orb_.in (), this, false, + this->container_ = new CIAO::FT_Session_Container (this->orb_.in (), this, false, 0, name, policies); } else { CIAO_DEBUG((LM_DEBUG, CLINFO "CIAO_Container_i: creating Session container with static linkage\n")); - this->container_ = new CIAO::Session_Container (this->orb_.in (), this, true, + this->container_ = new CIAO::FT_Session_Container (this->orb_.in (), this, true, this->static_entrypts_maps_, name, policies); } diff --git a/CIAO/ciao/FTComponentServer/CIAO_Container_Impl.h b/CIAO/ciao/FTComponentServer/CIAO_Container_Impl.h index 5811c5992f9..c12026b2a6f 100644 --- a/CIAO/ciao/FTComponentServer/CIAO_Container_Impl.h +++ b/CIAO/ciao/FTComponentServer/CIAO_Container_Impl.h @@ -12,7 +12,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ciao/Containers/Session/Session_Container.h" +#include "ciao/Containers/FTSession/FT_Session_Container.h" #include "CIAO_FTComponentServer_svnt_export.h" diff --git a/CIAO/ciao/FTComponentServer/CIAO_Properties.idl b/CIAO/ciao/FTComponentServer/CIAO_Properties.idl index d77b5c8b09b..17e79c7471d 100644 --- a/CIAO/ciao/FTComponentServer/CIAO_Properties.idl +++ b/CIAO/ciao/FTComponentServer/CIAO_Properties.idl @@ -22,6 +22,7 @@ module CIAO const string SERVER_TIMEOUT = "edu.vanderbilt.dre.CIAO.ServerTimeout"; const string SERVER_MULTITHREAD = "edu.vanderbilt.dre.CIAO.Multithreaded"; const string REGISTER_NAMING = "edu.vanderbilt.dre.CIAO.RegisterNaming"; + const string OBJECT_ID = "edu.vanderbilt.dre.CIAO.ObjectId"; }; }; |