diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-30 15:03:33 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-30 15:03:33 +0000 |
| commit | 7d4b39e39319db00a80b5d620b15af03e79ca820 (patch) | |
| tree | ce5a8bd143b27e61d2f6ee3acd06db681dd979fe | |
| parent | 4ec270fa032ffe6f7e066b4981aef3a0b313a844 (diff) | |
| download | ATCD-7d4b39e39319db00a80b5d620b15af03e79ca820.tar.gz | |
Sat Apr 30 09:58:05 2005 Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Container_Base.cpp | 6 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Container_Base.h | 9 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Home_Servant_Impl_T.cpp | 5 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Home_Servant_Impl_T.h | 4 |
5 files changed, 28 insertions, 7 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 38efcd75853..5eca0b521dc 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,14 @@ +Sat Apr 30 09:58:05 2005 Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> + + * ciao/Container_Base.cpp: + * ciao/Container_Base.h: + * ciao/Home_Servant_Impl_T.cpp: + * ciao/Home_Servant_Impl_T.h: + + Made changes to the old CIAO infrastructure to support + passing and storing of the component instance name from the + descriptor XML file and into the component instance. + Thu Apr 28 14:50:05 2005 Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu> * DAnCE/ciao/Dynamic_Component_Servant_T.cpp: diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp index abad0fa788a..72948bbc68c 100644 --- a/TAO/CIAO/ciao/Container_Base.cpp +++ b/TAO/CIAO/ciao/Container_Base.cpp @@ -237,7 +237,8 @@ namespace CIAO Session_Container::ciao_install_home (const char *exe_dll_name, const char *exe_entrypt, const char *sv_dll_name, - const char *sv_entrypt + const char *sv_entrypt, + const char *ins_name ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Components::Deployment::UnknownImplId, @@ -304,7 +305,8 @@ namespace CIAO Components::CCMHome::_nil ()); PortableServer::Servant home_servant = screator (home_executor.in (), - this + this, + ins_name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Components::CCMHome::_nil ()); diff --git a/TAO/CIAO/ciao/Container_Base.h b/TAO/CIAO/ciao/Container_Base.h index 2948491af58..8d45d794613 100644 --- a/TAO/CIAO/ciao/Container_Base.h +++ b/TAO/CIAO/ciao/Container_Base.h @@ -74,7 +74,8 @@ namespace CIAO (const char *exe_dll_name, const char *exe_entrypt, const char *sv_dll_name, - const char *sv_entrypt + const char *sv_entrypt, + const char *ins_name ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Components::Deployment::UnknownImplId, @@ -114,7 +115,8 @@ namespace CIAO typedef ::Components::HomeExecutorBase_ptr (*HomeFactory) (void); typedef ::PortableServer::Servant (*ServantFactory) (::Components::HomeExecutorBase_ptr p, - ::CIAO::Session_Container *c + ::CIAO::Session_Container *c, + const char *ins_name #if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) , CORBA::Environment & #endif @@ -176,7 +178,8 @@ namespace CIAO (const char *exe_dll_name, const char *exe_entrypt, const char *sv_dll_name, - const char *sv_entrypt + const char *sv_entrypt, + const char *ins_name ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Components::Deployment::UnknownImplId, diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp index f54a3c0a003..8385ddb91bd 100644 --- a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp +++ b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp @@ -24,9 +24,11 @@ namespace CIAO COMP_EXEC_VAR, COMP_SVNT>::Home_Servant_Impl ( EXEC * exe, - Session_Container * c + Session_Container * c, + const char *ins_name ) : Home_Servant_Impl_Base (c), + ins_name_ (ins_name), executor_ (EXEC::_duplicate (exe)) { } @@ -199,6 +201,7 @@ namespace CIAO ACE_NEW_RETURN (svt, COMP_SVNT (exe, home.in (), + this->ins_name_, this, this->container_), COMP::_nil ()); diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_T.h b/TAO/CIAO/ciao/Home_Servant_Impl_T.h index 8ff3e858990..eed5642f786 100644 --- a/TAO/CIAO/ciao/Home_Servant_Impl_T.h +++ b/TAO/CIAO/ciao/Home_Servant_Impl_T.h @@ -55,7 +55,8 @@ namespace CIAO { public: Home_Servant_Impl (EXEC * exe, - Session_Container * c); + Session_Container * c, + const char *ins_name); virtual ~Home_Servant_Impl (void); @@ -95,6 +96,7 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException)); protected: + const char *ins_name_; EXEC_VAR executor_; ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId, |