From 15c2afa4927017f9c189a72818f7b167bd15f08d Mon Sep 17 00:00:00 2001 From: dengg Date: Tue, 15 Nov 2005 06:45:00 +0000 Subject: Mon Nov 14 22:43:09 2005 Gan Deng + + * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp + * DAnCE/ExecutionManager/Execution_Manager_Impl.h + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h + * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp + * ciao/Deployment.idl + + Fixed some errors and warnings on the builds. + Mon Nov 14 11:05:12 UTC 2005 Johnny Willemsen * examples/Display/RateGen/RateGen_exec.h: diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp index d6193ec9b68..be2fb9aaa12 100644 --- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp +++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp @@ -183,14 +183,14 @@ namespace CIAO Execution_Manager_Impl::perform_redeployment ( const Deployment::DeploymentPlan & plan ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::PlanError, - Deployment::InstallationFailure, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InvalidConnection, + ACE_THROW_SPEC ((::CORBA::SystemException, + ::Deployment::PlanError, + ::Deployment::InstallationFailure, + ::Deployment::UnknownImplId, + ::Deployment::ImplEntryPointNotFound, + ::Deployment::InvalidConnection, + ::Deployment::InvalidProperty, ::Components::RemoveFailure)) - { CIAO_TRACE ("CIAO::Execution_Manager_Impl::perform_redeployment"); diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h index 2e699a9f316..d30ae85db9f 100644 --- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h +++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h @@ -81,12 +81,13 @@ namespace CIAO perform_redeployment ( const Deployment::DeploymentPlan & plan ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::PlanError, - Deployment::InstallationFailure, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InvalidConnection, + ACE_THROW_SPEC ((::CORBA::SystemException, + ::Deployment::PlanError, + ::Deployment::InstallationFailure, + ::Deployment::UnknownImplId, + ::Deployment::ImplEntryPointNotFound, + ::Deployment::InvalidConnection, + ::Deployment::InvalidProperty, ::Components::RemoveFailure)); protected: diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp index e03c0a63744..370de3ff7b0 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp @@ -293,13 +293,14 @@ perform_redeployment (const Deployment::Properties & configProperty, Deployment::Connections_out providedReference, CORBA::Boolean start ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((Deployment::InstallationFailure, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InvalidConnection, - Deployment::InvalidProperty, - ::Components::RemoveFailure)) - + ACE_THROW_SPEC ((::CORBA::SystemException, + ::Deployment::PlanError, + ::Deployment::InstallationFailure, + ::Deployment::UnknownImplId, + ::Deployment::ImplEntryPointNotFound, + ::Deployment::InvalidConnection, + ::Deployment::InvalidProperty, + ::Components::RemoveFailure)) { CIAO_TRACE ("CIAO::NodeApplicationManager_Impl_Base::perform_redeployment"); diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h index b93959b5193..f7a672a6386 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h @@ -73,11 +73,13 @@ namespace CIAO Deployment::Connections_out providedReference, CORBA::Boolean start ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - Deployment::InstallationFailure, - Deployment::UnknownImplId, - Deployment::ImplEntryPointNotFound, - Deployment::InvalidConnection, + ACE_THROW_SPEC ((::CORBA::SystemException, + ::Deployment::PlanError, + ::Deployment::InstallationFailure, + ::Deployment::UnknownImplId, + ::Deployment::ImplEntryPointNotFound, + ::Deployment::InvalidConnection, + ::Deployment::InvalidProperty, ::Components::RemoveFailure)); /** diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp new file mode 100644 index 00000000000..81a9ed3a390 --- /dev/null +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp @@ -0,0 +1,165 @@ +// $Id$ + +#include "Deployment_CoreC.h" +#include "Client_init.h" +#include "NodeAppTest_RoundTripC.h" +#include "ace/Get_Opt.h" +#include "assert.h" + +const char *ior = "file://test.ior"; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "k:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s \n" + "-k \n" + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + CIAO::Client_init (orb.in ()); + + CORBA::Object_var tmp = + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + Deployment::NodeApplication_var node_app = + Deployment::NodeApplication::_narrow(tmp.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (CORBA::is_nil (node_app.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil nodeapplication reference <%s>\n", + ior), + 1); + } + + + ACE_DEBUG ((LM_DEBUG, "Try installing Home and Component\n")); + + Deployment::ComponentImplementationInfo info; + + // Add the names and entry points of each of the DLLs + info.component_instance_name = + CORBA::string_dup ("NodeAppTest_RoundTrip"); + info.executor_dll = + CORBA::string_dup ("NodeAppTest_RoundTrip_exec"); + info.executor_entrypt = + CORBA::string_dup ("createRoundTripHome_Impl"); + info.servant_dll = + CORBA::string_dup ("NodeAppTest_RoundTrip_svnt"); + info.servant_entrypt = + CORBA::string_dup ("createNodeAppTest_RoundTripHome_Servant"); + + // Create a ContainerImplementationInfo sequence + Deployment::ContainerImplementationInfo container_info; + container_info.impl_infos.length (1); + container_info.impl_infos[0] = info; + + // Create a NodeImplementationInfo sequence + Deployment::NodeImplementationInfo node_info; + node_info.impl_infos.length (1); + node_info.impl_infos[0] = container_info; + + // Install test component and its home on NodeApplication + Deployment::ComponentInfos_var comp_info = + node_app->install (node_info ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + assert (comp_info->length () == 1); //return 1 component objeref + + const CORBA::ULong i = 0; + Components::CCMObject_var objref = (comp_info[i]).component_ref; + + NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var = + NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (CORBA::is_nil (roundtrip_var.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil RoundTrip reference\n"), + 1); + } + + // Invoke Operation on the Interface + ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n")); + CORBA::Long input = 1L; + CORBA::Long output = + roundtrip_var->cube_long (input ACE_ENV_ARG_PARAMETER); + + if (input == output) + ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n")); + else + { + ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n")); + exit (1); + } + + // Install another set of components + ACE_DEBUG ((LM_DEBUG, "Try installing another component dynamically\n")); + + // Modifying the component instance name since it must be unique + (node_info.impl_infos[0]).impl_infos[0].component_instance_name = + CORBA::string_dup ("NodeAppTest_RoundTrip_2"); + Deployment::ComponentInfos_var comp_info_new = + node_app->install (node_info ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + assert (comp_info_new->length () == 1); //return 1 component objeref + + ACE_DEBUG ((LM_DEBUG, "Try removing the second component and its home\n")); + node_app->remove_component ("NodeAppTest_RoundTrip"); + ACE_DEBUG ((LM_DEBUG, "Component and Home removed successfully\n")); + +/* + ACE_DEBUG ((LM_DEBUG, "=====Try removing all remaining components and homes\n")); + node_app->remove (); + ACE_DEBUG ((LM_DEBUG, "=====Components and Homes removed successfully\n")); +*/ + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + ACE_DEBUG ((LM_DEBUG, "=====Test success!!\n")); + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/CIAO/ciao/Deployment.idl b/TAO/CIAO/ciao/Deployment.idl index d7a121e17cd..9ef7d45f3e9 100644 --- a/TAO/CIAO/ciao/Deployment.idl +++ b/TAO/CIAO/ciao/Deployment.idl @@ -71,6 +71,7 @@ module Deployment { UnknownImplId, ImplEntryPointNotFound, InvalidConnection, + InvalidProperty, ::Components::RemoveFailure); }; @@ -89,10 +90,12 @@ module Deployment { // "perform_redeployment" operation defined on DAM and NA // are implementaion details within DAnCE. void perform_redeployment (in DeploymentPlan new_plan) - raises (InstallationFailure, + raises (PlanError, + InstallationFailure, UnknownImplId, ImplEntryPointNotFound, InvalidConnection, + InvalidProperty, ::Components::RemoveFailure); }; -- cgit v1.2.1