diff options
Diffstat (limited to 'TAO/CIAO/DAnCE')
6 files changed, 22 insertions, 15 deletions
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index 5edb7a51b3a..0cd1d7954b2 100644 --- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -413,13 +413,13 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name "CIAO::NodeApplication_Impl::passivate_component, " "invalid instance [%s] \n", name)); - ACE_TRY_THROW (Deployment::StartError ()); + ACE_TRY_THROW (Components::RemoveFailure ()); } if (CORBA::is_nil (comp_state.objref_.in ())) { ACE_DEBUG ((LM_DEBUG, "comp is nil\n")); - throw Deployment::StartError (); + throw Components::RemoveFailure (); } comp_state.objref_->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -430,7 +430,7 @@ void CIAO::NodeApplication_Impl::activate_component (const char * name ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((::CORBA::SystemException, - ::Components::RemoveFailure)) + ::Deployment::StartError)) { Component_State_Info comp_state; @@ -438,7 +438,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name { ACE_ERROR ((LM_ERROR, "CIAO (%P|%t) - NodeApplication_Impl.cpp, " - "CIAO::NodeApplication_Impl::passivate_component, " + "CIAO::NodeApplication_Impl::activate_component, " "invalid instance [%s] \n", name)); ACE_TRY_THROW (Deployment::StartError ()); diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h index 8a08e3456c5..ee1878ff07d 100644 --- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h +++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h @@ -183,7 +183,7 @@ namespace CIAO virtual void activate_component (const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((::CORBA::SystemException, - ::Components::RemoveFailure)); + ::Deployment::StartError)); virtual void passivate_component (const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS) diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp index df31c704651..352a005515a 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp @@ -272,9 +272,11 @@ namespace CIAO // For svnt/exec artifacts for (CORBA::ULong j = 0; j < artifact_num; ++j) { - const Deployment::ArtifactDeploymentDescription & arti = + Deployment::ArtifactDeploymentDescription arti = this->plan_.artifact[ impl.artifactRef[j] ]; + // @Stoyan: Is there any particular reason the repository + // manager should only work on Windows? -Will #if defined (ACE_WIN32) || defined (ACE_WIN64) for (size_t loc_num = 0; loc_num < arti.location.length (); @@ -292,8 +294,11 @@ namespace CIAO "Containers_Info_Map::insert_instance_into_container -" "ERROR: Unable to resolve HTTP ref to location[%d] of %s\n", loc_num, arti.name.in ())); - - arti.location[loc_num] = CORBA::string_dup ("HTTP_failure"); + + // @Stoyan: This is an inappropriate response to + // this type of failure. Please throw an + // exception, Deployment::UnknownImplId would be appropriate. + arti.location[loc_num] = "HTTP_failure"; } else { diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h index 4fb23a46f19..a60cbe662b3 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h @@ -87,7 +87,10 @@ namespace CIAO * any references to HTTP URLs */ protected: - + + // @Stoyan - Please follow ACE coding guideines when naming your + //member variables. In particular, please use lower case and + //follow the name with a trailing underscore. //directory in which to download the libraries obtained via HTTP ACE_CString HTTP_DOWNLOAD_PATH; diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h index 84e50a5fabf..ea704259a0e 100644 --- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h +++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h @@ -201,10 +201,9 @@ namespace CIAO * @param available The available Properties */ - void CIAO::DomainDataManager:: - match_properties ( - ::Deployment::Properties deployed, - ::Deployment::SatisfierProperties& available); + void match_properties ( + ::Deployment::Properties deployed, + ::Deployment::SatisfierProperties& available); /// The different actiona that can take place diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc index b5a7aaa5458..07200eb0eca 100644 --- a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc +++ b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc @@ -22,7 +22,7 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub { project(CIAO_TargetManager_svnt) : ciao_servant_dnc { after += CIAO_TargetManager_stub sharedname = TargetManager_svnt - libs += TargetManager_stub + libs += TargetManager_stub NodeManager_stub idlflags += -Wb,export_macro=TARGETMANAGER_SVNT_Export -Wb,export_include=TargetManager_svnt_export.h dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL @@ -47,7 +47,7 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc { project(CIAO_TargetManager_exec) : ciao_servant_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc { after += CIAO_TargetManager_svnt sharedname = TargetManager_exec - libs += TargetManager_stub TargetManager_svnt + libs += TargetManager_stub TargetManager_svnt NodeManager_stub idlflags += -Wb,export_macro=TARGETMANAGER_EXEC_Export -Wb,export_include=TargetManager_exec_export.h dynamicflags = TARGETMANAGER_EXEC_BUILD_DLL |