summaryrefslogtreecommitdiff
path: root/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp')
-rw-r--r--CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp59
1 files changed, 6 insertions, 53 deletions
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index afbb5c9bcc6..c0e85d79b4a 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -3,7 +3,7 @@
#include "NodeApplication_Impl.h"
#include "ace/SString.h"
#include "Container_Impl.h"
-#include "Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
#include "ciaosvcs/Events/CIAO_RTEC/CIAO_RTEventC.h"
#if !defined (__ACE_INLINE__)
@@ -17,7 +17,6 @@ CIAO::NodeApplication_Impl::~NodeApplication_Impl (void)
CORBA::Long
CIAO::NodeApplication_Impl::init ()
- ACE_THROW_SPEC ((CORBA::SystemException))
{
/// @todo initialize this NodeApplication properties
return 0;
@@ -27,7 +26,6 @@ CORBA::Long
CIAO::NodeApplication_Impl::create_all_containers (
const ::Deployment::ContainerImplementationInfos & container_infos
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// Create all the containers here based on the input node_impl_info.
CORBA::ULong const len = container_infos.length ();
@@ -61,9 +59,6 @@ CIAO::NodeApplication_Impl::finishLaunch (
const Deployment::Connections & providedReference,
CORBA::Boolean start,
CORBA::Boolean add_connection)
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::StartError,
- Deployment::InvalidConnection))
{
ACE_UNUSED_ARG (start);
@@ -77,9 +72,6 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
const Deployment::Connections & connections,
CORBA::Boolean start,
CORBA::Boolean add_connection)
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::StartError,
- Deployment::InvalidConnection))
{
ACE_UNUSED_ARG (start);
@@ -177,8 +169,6 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
void
CIAO::NodeApplication_Impl::ciao_preactivate ()
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::StartError))
{
Component_Iterator end = this->component_state_map_.end ();
for (Component_Iterator iter (this->component_state_map_.begin ());
@@ -196,8 +186,6 @@ CIAO::NodeApplication_Impl::ciao_preactivate ()
void
CIAO::NodeApplication_Impl::start ()
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::StartError))
{
Component_Iterator end = this->component_state_map_.end ();
for (Component_Iterator iter (this->component_state_map_.begin ());
@@ -215,8 +203,6 @@ CIAO::NodeApplication_Impl::start ()
void
CIAO::NodeApplication_Impl::ciao_postactivate ()
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::StartError))
{
Component_Iterator end = this->component_state_map_.end ();
for (Component_Iterator iter (this->component_state_map_.begin ());
@@ -234,8 +220,6 @@ CIAO::NodeApplication_Impl::ciao_postactivate ()
void
CIAO::NodeApplication_Impl::ciao_passivate ()
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::StopError))
{
Component_Iterator end = this->component_state_map_.end ();
for (Component_Iterator iter (this->component_state_map_.begin ());
@@ -252,11 +236,6 @@ CIAO::NodeApplication_Impl::ciao_passivate ()
Deployment::ComponentInfos *
CIAO::NodeApplication_Impl::install (
const ::Deployment::NodeImplementationInfo & node_impl_info)
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::UnknownImplId,
- Deployment::ImplEntryPointNotFound,
- Deployment::InstallationFailure,
- Components::InvalidConfiguration))
{
Deployment::ComponentInfos_var retv;
try
@@ -358,8 +337,6 @@ CIAO::NodeApplication_Impl::install (
void
CIAO::NodeApplication_Impl::remove_component (const char * inst_name)
- ACE_THROW_SPEC ((::CORBA::SystemException,
- ::Components::RemoveFailure))
{
ACE_DEBUG ((LM_DEBUG, "NA_I: removing component %s\n",
inst_name));
@@ -385,8 +362,6 @@ CIAO::NodeApplication_Impl::remove_component (const char * inst_name)
void
CIAO::NodeApplication_Impl::passivate_component (const char * name)
- ACE_THROW_SPEC ((::CORBA::SystemException,
- ::Components::RemoveFailure))
{
Component_State_Info comp_state;
@@ -411,8 +386,6 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name)
void
CIAO::NodeApplication_Impl::activate_component (const char * name)
- ACE_THROW_SPEC ((::CORBA::SystemException,
- ::Deployment::StartError))
{
Component_State_Info comp_state;
@@ -444,7 +417,6 @@ CIAO::NodeApplication_Impl::activate_component (const char * name)
void
CIAO::NodeApplication_Impl::remove ()
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// If we still have components installed, then do nothing
@@ -490,9 +462,6 @@ CIAO::NodeApplication_Impl::remove ()
::Deployment::Container_ptr
CIAO::NodeApplication_Impl::create_container (
const ::Deployment::Properties &properties)
- ACE_THROW_SPEC ((CORBA::SystemException,
- ::Components::CreateFailure,
- ::Components::InvalidConfiguration))
{
//if (CIAO::debug_level () > 1)
// ACE_DEBUG ((LM_DEBUG, "ENTERING: NodeApplication_Impl::create_container()\n"));
@@ -506,6 +475,7 @@ CIAO::NodeApplication_Impl::create_container (
CIAO::Container_Impl (this->orb_.in (),
this->poa_.in (),
this->get_objref (),
+ this->configurator_,
this->static_entrypts_maps_),
CORBA::NO_MEMORY ());
@@ -545,8 +515,6 @@ CIAO::NodeApplication_Impl::create_container (
// Remove a container interface.
void
CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref)
- ACE_THROW_SPEC ((CORBA::SystemException,
- ::Components::RemoveFailure))
{
ACE_DEBUG ((LM_DEBUG, "ENTERING: NodeApplication_Impl::remove_container()\n"));
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -576,7 +544,6 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref)
// Get containers
::Deployment::Containers *
CIAO::NodeApplication_Impl::get_containers ()
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return 0;
}
@@ -584,8 +551,6 @@ CIAO::NodeApplication_Impl::get_containers ()
CIAO::CIAO_Event_Service *
CIAO::NodeApplication_Impl::
install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info)
-ACE_THROW_SPEC ((::CORBA::SystemException,
- ::Deployment::InstallationFailure))
{
try
{
@@ -616,7 +581,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
if (retv == false)
{
ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n"));
- ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+ throw ::Deployment::InstallationFailure ();
}
}
@@ -629,7 +594,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
if (retv == false)
{
ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n"));
- ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+ throw ::Deployment::InstallationFailure ();
}
}
@@ -644,7 +609,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
if (retv == false)
{
ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n"));
- ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+ throw ::Deployment::InstallationFailure ();
}
}
}
@@ -653,7 +618,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("NodeApplication_Impl::finishLaunch\t\n");
- ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+ throw ::Deployment::InstallationFailure ();
}
}
@@ -684,8 +649,6 @@ handle_facet_receptable_connection (
Components::CCMObject_ptr comp,
const Deployment::Connection & connection,
CORBA::Boolean add_connection)
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::InvalidConnection))
{
if (CIAO::debug_level () > 11)
{
@@ -760,8 +723,6 @@ handle_emitter_consumer_connection (
Components::CCMObject_ptr comp,
const Deployment::Connection & connection,
CORBA::Boolean add_connection)
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::InvalidConnection))
{
Components::EventConsumerBase_var consumer =
Components::EventConsumerBase::_narrow (connection.endpoint.in ());
@@ -834,8 +795,6 @@ handle_publisher_consumer_connection (
Components::CCMObject_ptr comp,
const Deployment::Connection & connection,
CORBA::Boolean add_connection)
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::InvalidConnection))
{
Components::EventConsumerBase_var consumer =
Components::EventConsumerBase::_narrow (connection.endpoint.in ());
@@ -922,8 +881,6 @@ handle_publisher_es_connection (
Components::CCMObject_ptr comp,
const Deployment::Connection & connection,
CORBA::Boolean add_connection)
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::InvalidConnection))
{
if (! this->_is_publisher_es_conn (connection))
{
@@ -1017,8 +974,6 @@ CIAO::NodeApplication_Impl::
handle_es_consumer_connection (
const Deployment::Connection & connection,
CORBA::Boolean add_connection)
- ACE_THROW_SPEC ((CORBA::SystemException,
- Deployment::InvalidConnection))
{
if (! this->_is_es_consumer_conn (connection))
{
@@ -1131,8 +1086,6 @@ void
CIAO::NodeApplication_Impl::build_event_connection (
const Deployment::Connection & connection,
bool add_or_remove)
- ACE_THROW_SPEC ((Deployment::InvalidConnection,
- CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "CIAO::NodeApplication_Impl::build_connection ()!!!\n"));
View Lorry Controller Status