From c1df23e3b39bfebb5aecfbac7fee80672ff6bb94 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 11 Dec 2008 05:05:29 +0000 Subject: Thu Dec 11 5:05:57 UTC 2008 Johnny Willemsen --- flat/CIAO/ChangeLog | 13 +++++++++++++ .../simple_em_launcher.cpp | 7 ++++--- flat/CIAO/ccm/CCM_KeylessCCMHome.idl | 2 +- .../ccm/ComponentServer/CCM_ComponentServer.idl | 4 ++-- .../ComponentServer/CCM_ComponentServer_Client.idl | 12 ++++++------ .../ciao/Containers/Session/Session_Container.cpp | 21 +++++++++++---------- .../ciao/Containers/Session/Session_Container.h | 3 +-- 7 files changed, 38 insertions(+), 24 deletions(-) diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog index bbae1b3a943..8c95fd5cb15 100644 --- a/flat/CIAO/ChangeLog +++ b/flat/CIAO/ChangeLog @@ -1,3 +1,16 @@ +Thu Dec 11 5:05:57 UTC 2008 Johnny Willemsen + + * ccm/CCM_KeylessCCMHome.idl: + Updated include + + * ccm/ComponentServer/CCM_ComponentServer.idl: + * ccm/ComponentServer/CCM_ComponentServer_Client.idl: + * ciao/Containers/Session/Session_Container.h: + Layout changes + + * ciao/Containers/Session/Session_Container.cpp: + const/initialise pointer with 0 + Fri Nov 28 16:05:57 UTC 2008 Johnny Willemsen * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp index f7bfa3862c1..4da0a4512d8 100644 --- a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp +++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp @@ -6,6 +6,7 @@ */ #include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" #include "tao/ORB.h" #include "ciao/Logger/Logger_Service.h" #include "ciao/Logger/Log_Macros.h" @@ -98,19 +99,19 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy (); } - catch (Deployment::StopError &ex) + catch (const Deployment::StopError &ex) { ACE_ERROR ((LM_ERROR, "*** Caught StopError exception with name %s and reason %s\n", ex.name.in (), ex.reason.in ())); return -1; } - catch (Deployment::StartError &ex) + catch (const Deployment::StartError &ex) { ACE_ERROR ((LM_ERROR, "*** Caught StartError exception with name %s and reason %s\n", ex.name.in (), ex.reason.in ())); return -1; } - catch (CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { ACE_ERROR ((LM_ERROR, "*** Caught CORBA exception: %s\n", ex._info ().c_str ())); diff --git a/flat/CIAO/ccm/CCM_KeylessCCMHome.idl b/flat/CIAO/ccm/CCM_KeylessCCMHome.idl index 17756a03bd3..20ac16249f1 100644 --- a/flat/CIAO/ccm/CCM_KeylessCCMHome.idl +++ b/flat/CIAO/ccm/CCM_KeylessCCMHome.idl @@ -3,7 +3,7 @@ #if !defined (CCM_KEYLESSCCMHOME_IDL) #define CCM_KEYLESSCCMHOME_IDL -#include "ccm/CCM_Home.idl" +#include "ccm/CCM_Object.idl" module Components { diff --git a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl index bbcb1da0c79..78b8d77a2b9 100644 --- a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl +++ b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl @@ -22,7 +22,7 @@ module Components ServerActivator get_server_activator(); Container create_container(in ConfigValues config) - raises (::Components::CreateFailure, + raises (::Components::CreateFailure, ::Components::Deployment::InvalidConfiguration); void remove_container(in Container cref) raises (::Components::RemoveFailure); @@ -43,7 +43,7 @@ module Components CCMHome install_home(in UUID id, in string entrypt, in ConfigValues config) - raises (::Components::Deployment::UnknownImplId, + raises (::Components::Deployment::UnknownImplId, ::Components::Deployment::ImplEntryPointNotFound, ::Components::Deployment::InstallationFailure, ::Components::Deployment::InvalidConfiguration); diff --git a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl index 29b2285ecc5..58baafb189c 100644 --- a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl +++ b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl @@ -17,26 +17,26 @@ module Components interface ComponentInstallation { void install(in UUID implUUID, in Location component_loc) - raises (InvalidLocation, InstallationFailure); + raises (InvalidLocation, InstallationFailure); void replace(in UUID implUUID, in Location component_loc) - raises (InvalidLocation, InstallationFailure); + raises (InvalidLocation, InstallationFailure); void remove(in UUID implUUID) - raises (UnknownImplId, RemoveFailure); + raises (UnknownImplId, RemoveFailure); Location get_implementation(in UUID implUUID) - raises(UnknownImplId, InstallationFailure); + raises(UnknownImplId, InstallationFailure); }; interface ServerActivator { ComponentServer create_component_server(in ConfigValues config) - raises(::Components::CreateFailure, + raises(::Components::CreateFailure, ::Components::Deployment::InvalidConfiguration); void remove_component_server(in ComponentServer server) - raises(::Components::RemoveFailure); + raises(::Components::RemoveFailure); ComponentServers get_component_servers(); }; diff --git a/flat/CIAO/ciao/Containers/Session/Session_Container.cpp b/flat/CIAO/ciao/Containers/Session/Session_Container.cpp index dbdc4996224..1cfceb44083 100644 --- a/flat/CIAO/ciao/Containers/Session/Session_Container.cpp +++ b/flat/CIAO/ciao/Containers/Session/Session_Container.cpp @@ -173,7 +173,7 @@ namespace CIAO poa_manager.in (), policies); - Servant_Activator_i *sa; + Servant_Activator_i *sa = 0; ACE_NEW_THROW_EX (sa, Servant_Activator_i (this->orb_.in ()), CORBA::NO_MEMORY ()); @@ -241,7 +241,8 @@ namespace CIAO "Servant library [%C] with entrypoint [%C]\n", servant_artifact, servant_entrypoint)); - ACE_DLL executor_dll, servant_dll; + ACE_DLL executor_dll; + ACE_DLL servant_dll; if (primary_artifact == 0 || servant_artifact == 0) { @@ -385,8 +386,8 @@ namespace CIAO error += servant_artifact; } - CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_home - Error:%C\n", + CIAO_ERROR ((LM_ERROR, CLINFO + "Session_Container::ciao_install_home - Error:%C\n", error.c_str ())); throw Components::Deployment::ImplEntryPointNotFound (); @@ -411,7 +412,7 @@ namespace CIAO if (home_servant == 0) { - CIAO_ERROR ((LM_ERROR, CLINFO + CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::ciao_install_home - Home servant factory failed.\n")); throw Components::Deployment::InstallationFailure (); } @@ -684,13 +685,13 @@ namespace CIAO "Invoking CCM activate on provided component object reference.")); sess->activate_component (); } - catch (CIAO::InvalidComponent &) + catch (const CIAO::InvalidComponent &) { CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::activate_component - " "Failed to retrieve servant and/or cast to servant pointer.\n")); throw; } - catch (CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::activate_component - " "Caught CORBA exception while activating a component: %C\n", @@ -732,11 +733,11 @@ namespace CIAO "Invoking CCM activate on provided component object reference.")); sess->passivate_component (); } - catch (CIAO::InvalidComponent &) + catch (const CIAO::InvalidComponent &) { throw; } - catch (CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::passivate_component - " "Caught CORBA exception while passivating a component: %C\n", @@ -825,7 +826,7 @@ namespace CIAO oid = tmp_id._retn (); } - catch (CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::uninstall_servant - " "Caught CORBA exception while uninstalling servant: %C\n", diff --git a/flat/CIAO/ciao/Containers/Session/Session_Container.h b/flat/CIAO/ciao/Containers/Session/Session_Container.h index 3427f3164c2..00bd0f39ac4 100644 --- a/flat/CIAO/ciao/Containers/Session/Session_Container.h +++ b/flat/CIAO/ciao/Containers/Session/Session_Container.h @@ -103,7 +103,6 @@ namespace CIAO virtual ~Session_Container (void); - /** * @brief Simply installing a home executor into the component. * @@ -130,13 +129,13 @@ namespace CIAO const char *servant_entrypoint, const char *name); + /// Activate component virtual void activate_component (Components::CCMObject_ptr compref); virtual void passivate_component (Components::CCMObject_ptr compref); virtual void uninstall_component (Components::CCMObject_ptr compref); - /// Uninstall a servant virtual void uninstall_servant (PortableServer::Servant objref, Container_Types::OA_Type type, -- cgit v1.2.1