diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-05-21 03:11:06 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-05-21 03:11:06 +0000 |
| commit | e4d9e8942c80321cb2479a501f676994339e170c (patch) | |
| tree | 3562a3933be2b1762c330422261f44c937127f9c | |
| parent | 9f9374416ba53a00c3cf44902bdb87e673fb0c39 (diff) | |
| download | ATCD-e4d9e8942c80321cb2479a501f676994339e170c.tar.gz | |
Fri May 21 03:08:15 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/DAnCE/DAnCE_Utility.cpp:
* DAnCE/LocalityManager/Daemon/Locality_Manager.mpc:
* DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h:
* DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
* DAnCE/LocalityManager/Daemon/Name_Utilities.h:
* DAnCE/LocalityManager/Daemon/Name_Utilities.cpp:
* DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp:
* DAnCE/NodeApplication/NodeApplication.mpc:
* DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
* DAnCE/tests/CIAO/CommandlinePassage/Component.cdp:
* DAnCE/tests/CIAO/CommandlinePassage/run_test.pl:
* ciao/Containers/Container_Base.idl:
* ciao/Containers/Session/Session_Container.h:
* ciao/Containers/Session/Session_Container.cpp:
* ciao/Deployment/Handlers/CIAO_Handler_Common.h:
* ciao/Deployment/Handlers/CIAO_Handler_Common.cpp:
* ciao/Deployment/Handlers/Component_Handler.cpp:
* ciao/Deployment/Handlers/Connection_Handler.cpp:
* ciao/Deployment/Handlers/Homed_Component_Handler.cpp:
* ciao/Servants/Home_Servant_Impl_T.cpp:
Various bug fixes, and added support for 1) attribute
initialization, 2) external reference endpoints.
* DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp:
Log message fix.
* DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp:
* DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp:
* DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp:
* DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp:
* DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp:
* DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp:
* DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp:
* DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp:
* DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp:
* DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl:
* DAnCE/tests/CIAO/EM-Redeployment/run_test.pl:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl:
* DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl:
* DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl:
* DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp:
* DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp:
* DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp:
* DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl:
Ported DAnCE tests.
* DAnCE/NodeApplication/Name_Utilities.h:
* DAnCE/NodeApplication/Name_Utilities.cpp:
Removed these files.
54 files changed, 809 insertions, 120 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog index 62fde1a4e4b..02514e4d243 100644 --- a/modules/CIAO/ChangeLog +++ b/modules/CIAO/ChangeLog @@ -1,3 +1,73 @@ +Fri May 21 03:08:15 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/DAnCE/DAnCE_Utility.cpp: + * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: + * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h: + * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: + * DAnCE/LocalityManager/Daemon/Name_Utilities.h: + * DAnCE/LocalityManager/Daemon/Name_Utilities.cpp: + * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: + * DAnCE/NodeApplication/NodeApplication.mpc: + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: + * DAnCE/tests/CIAO/CommandlinePassage/Component.cdp: + * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: + * ciao/Containers/Container_Base.idl: + * ciao/Containers/Session/Session_Container.h: + * ciao/Containers/Session/Session_Container.cpp: + * ciao/Deployment/Handlers/CIAO_Handler_Common.h: + * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp: + * ciao/Deployment/Handlers/Component_Handler.cpp: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: + * ciao/Servants/Home_Servant_Impl_T.cpp: + + Various bug fixes, and added support for 1) attribute + initialization, 2) external reference endpoints. + + * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: + + Log message fix. + + * DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp: + * DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp: + * DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp: + * DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp: + * DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp: + * DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp: + * DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp: + * DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp: + * DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp: + * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl: + * DAnCE/tests/CIAO/EM-Redeployment/run_test.pl: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl: + * DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl: + * DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp: + * DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp: + * DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp: + * DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl: + + Ported DAnCE tests. + + * DAnCE/NodeApplication/Name_Utilities.h: + * DAnCE/NodeApplication/Name_Utilities.cpp: + + Removed these files. + Thu May 20 19:29:49 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/DAnCE/DAnCE_Core.mpc: diff --git a/modules/CIAO/DAnCE/DAnCE/DAnCE_Utility.cpp b/modules/CIAO/DAnCE/DAnCE/DAnCE_Utility.cpp index 880eae5bb20..f320262e2b1 100644 --- a/modules/CIAO/DAnCE/DAnCE/DAnCE_Utility.cpp +++ b/modules/CIAO/DAnCE/DAnCE/DAnCE_Utility.cpp @@ -71,21 +71,14 @@ namespace DAnCE void append_properties (::Deployment::Properties &dest, const ::Deployment::Properties &src) { - const char* edu_prop = "edu.vanderbilt.dre.CIAO.ComponentServer."; + CORBA::ULong pos = dest.length (); + dest.length (pos + src.length ()); + for (CORBA::ULong i = 0; i < src.length (); ++i) { - if (ACE_OS::strncmp (src[i].name.in (), - edu_prop, ACE_OS::strlen (edu_prop)) == 0) - { - DANCE_DEBUG (9, (LM_TRACE, DLINFO - ACE_TEXT("NodeApplication::append_properties - ") - ACE_TEXT("Adding property %C\n"), - src[i].name.in ())); - CORBA::ULong const dest_length = dest.length (); - dest.length (dest_length + 1); - dest[dest_length].name = CORBA::string_dup (src[i].name.in ()); - dest[dest_length].value = src[i].value; - } + dest[pos].name = CORBA::string_dup (src[i].name.in ()); + dest[pos].value = src[i].value; + ++pos; } } diff --git a/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc b/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc index 9d9ec3bb2fa..df052df3d29 100644 --- a/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc +++ b/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc @@ -10,6 +10,8 @@ project (DAnCE_LocalityManager_Impl) : dance_lib, dance_output, naming, \ after += CIAO_Deployment_Handlers Source_Files { Locality_Manager_Impl.cpp + Deployment_Interceptors.cpp + Name_Utilities.h } Header_Files { diff --git a/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp index b73fd192f9d..e0f373fe4a3 100644 --- a/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp +++ b/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp @@ -16,6 +16,7 @@ #include "ciao/Deployment/Handlers/Component_Handler.h" #include "ciao/Deployment/Handlers/Home_Handler.h" #include "ciao/Deployment/Handlers/Homed_Component_Handler.h" +#include "Deployment_Interceptors.h" // namespace DAnCE @@ -76,6 +77,10 @@ namespace DAnCE this->instance_handlers_[tmp->instance_type ()] = Handler (tmp); this->handler_order_.push_back (tmp->instance_type ()); + + ACE_NEW_THROW_EX (this->ii_interceptor_, + DAnCE_StoreReferences_i (this->orb_.in ()), + CORBA::NO_MEMORY ()); } ::Deployment::Properties * @@ -140,13 +145,23 @@ namespace DAnCE this->plan_.instance[*j].name.in ())); - // @@ todo: pre-interceptor + this->ii_interceptor_->instance_pre_install (this->plan_, + *j); + CORBA::Any_var reference; handler->install_instance (this->plan_, *j, reference.out ()); + CORBA::Any exception; + + this->ii_interceptor_->instance_post_install (this->plan_, + *j, + reference.in (), + exception); this->instance_references_[*j] = reference._retn (); + + // @@ todo: post-interceptor } } @@ -214,6 +229,14 @@ namespace DAnCE typedef std::map < std::string, CORBA::ULong > ConnMap; ConnMap conns; + DANCE_DEBUG (6, (LM_TRACE, DLINFO + "LocalityManager_i::finishLaunch - " + "Starting finsihLaunch, received %u references, " + "have %u connections\n", + providedReference.length (), + this->plan_.connection.length () + )); + for (CORBA::ULong i = 0; i < this->plan_.connection.length (); ++i) { conns[this->plan_.connection[i].name.in ()] = i; @@ -222,8 +245,37 @@ namespace DAnCE for (CORBA::ULong i = 0; i < providedReference.length (); ++i) { const char * name = providedReference[i].name.in (); - ConnMap::const_iterator conn = conns.find (name); + ConnMap::const_iterator conn_ref = conns.find (name); + + if (conn_ref == conns.end ()) + continue; + + CORBA::ULong j (0); + const ::Deployment::PlanConnectionDescription &conn = + this->plan_.connection[conn_ref->second]; + + DANCE_DEBUG (9, (LM_TRACE, DLINFO + "LocalityManager_i::finishLaunch - " + "Connection <%C> has %u endpoints\n", + conn.name.in (), + conn.internalEndpoint.length ())); + + if (conn.internalEndpoint.length () == 2) + { + if (!conn.internalEndpoint[1].provider) + j = 1; + } + else if (conn.internalEndpoint[0].provider && + conn.externalReference.length () == 0) + { + DANCE_DEBUG (9, (LM_TRACE, DLINFO + "LocalityManager_i::finishLaunch - " + "Skipping connection <%C>\n", + conn.name.in ())); + continue; + } + DANCE_DEBUG (6, (LM_DEBUG, DLINFO "LocalityManager_i::finishLaunch - " "Starting connection <%C>\n", @@ -234,7 +286,7 @@ namespace DAnCE reference <<= providedReference[i].endpoint[0]; CORBA::ULong instRef = - this->plan_.connection[conn->second].internalEndpoint[i].instanceRef; + conn.internalEndpoint[j].instanceRef; CORBA::ULong implRef = this->plan_.instance[instRef].implementationRef; @@ -244,7 +296,7 @@ namespace DAnCE // @@ placeholder for pre_connect interceptor this->instance_handlers_[inst_type].handler_-> connect_instance (this->plan_, - conn->second, + conn_ref->second, reference); // @@ placeholder for post_connect interceptor } diff --git a/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h b/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h index 4a5b200532e..aa1ae6d02a5 100644 --- a/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h +++ b/modules/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h @@ -13,6 +13,7 @@ #define DANCE_LOCALITYMANAGERI_PDD6RP_H_ #include "DAnCE/DAnCE_LocalityManagerS.h" +#include "DAnCE/DAnCE_DeploymentInterceptorsC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -102,6 +103,8 @@ namespace DAnCE REFERENCE_MAP instance_references_; ::Deployment::DeploymentPlan plan_; + + ::DAnCE::InstanceInstallation_var ii_interceptor_; }; } diff --git a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp b/modules/CIAO/DAnCE/LocalityManager/Daemon/Name_Utilities.cpp index 258584aeb40..258584aeb40 100644 --- a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp +++ b/modules/CIAO/DAnCE/LocalityManager/Daemon/Name_Utilities.cpp diff --git a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.h b/modules/CIAO/DAnCE/LocalityManager/Daemon/Name_Utilities.h index 2685ee36012..2685ee36012 100644 --- a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.h +++ b/modules/CIAO/DAnCE/LocalityManager/Daemon/Name_Utilities.h diff --git a/modules/CIAO/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp b/modules/CIAO/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp index 0672080a083..1373682a61a 100644 --- a/modules/CIAO/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp +++ b/modules/CIAO/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp @@ -103,6 +103,11 @@ namespace DAnCE mdd.execParameter); Utility::append_properties (allprops, idd.configProperty); + + DANCE_DEBUG (9, (LM_TRACE, DLINFO + "Locality_Handler_i::install_instance - " + "Passing %u properties to activator\n", + allprops.length ())); ::DAnCE::LocalityManager_var lm_ref = this->activator_->create_locality_manager (allprops); diff --git a/modules/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/modules/CIAO/DAnCE/NodeApplication/NodeApplication.mpc index 4cbdf484382..0a5c75ac6c6 100644 --- a/modules/CIAO/DAnCE/NodeApplication/NodeApplication.mpc +++ b/modules/CIAO/DAnCE/NodeApplication/NodeApplication.mpc @@ -11,13 +11,11 @@ project(DAnCE_NodeApplication): install, dance_lib, dynamicinterface, \ Source_Files { NodeApplication_Impl.cpp ComponentAttributesSetter.cpp - Name_Utilities.cpp } Header_Files { NodeApplication_Impl.h ComponentAttributesSetter.h - Name_Utilities.h } specific { diff --git a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp index 2bd3fcad161..01628d9b1bc 100644 --- a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp +++ b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp @@ -586,10 +586,10 @@ namespace DAnCE for (CORBA::ULong i = 0; i < plan.connection.length(); i++) { - if (plan.connection[i].externalReference.length() > 0 - && plan.connection[i].externalReference[0].provider) + if (plan.connection[i].externalReference.length() > 0) + //&& plan.connection[i].externalReference[0].provider) { - DANCE_DEBUG (6, (LM_DEBUG, + DANCE_DEBUG (6, (LM_DEBUG, DLINFO "Plan_Launcher_i::create_external_connections - create connection %C from IOR %C\n", plan.connection[i].name.in(), plan.connection[i].externalReference[0].location.in())); @@ -598,10 +598,18 @@ namespace DAnCE { CORBA::Object_ptr obj = this->orb_->string_to_object(plan.connection[i].externalReference[0].location.in()); + if (!CORBA::is_nil (obj)) { - CORBA::ULong const indx = conn.length(); - conn.length(indx + 1); + CORBA::ULong indx = 0; + for (; indx < conn.length (); ++indx) + + if (ACE_OS::strcmp (conn[indx].name.in (), + plan.connection[i].name.in ()) == 0) + break; + + if (indx == conn.length()) + conn.length(indx + 1); conn[indx].name= CORBA::string_dup (plan.connection[i].name.in()); conn[indx].endpoint.length(1L); conn[indx].endpoint[0] = obj; @@ -623,9 +631,9 @@ namespace DAnCE } catch (...) { - DANCE_ERROR (1, (LM_ERROR, DLINFO - ACE_TEXT("Plan_Launcher_i::create_external_connections - ") - ACE_TEXT("Caught C++ Exception while resolving endpoint for connection\n"))); + DANCE_ERROR (1, (LM_ERROR, DLINFO + ACE_TEXT("Plan_Launcher_i::create_external_connections - ") + ACE_TEXT("Caught C++ Exception while resolving endpoint for connection\n"))); } } } diff --git a/modules/CIAO/DAnCE/tests/CIAO/CommandlinePassage/Component.cdp b/modules/CIAO/DAnCE/tests/CIAO/CommandlinePassage/Component.cdp index f692ab3a7eb..432e01f72a6 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/CommandlinePassage/Component.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/CommandlinePassage/Component.cdp @@ -21,7 +21,7 @@ <kind>tk_string</kind> </type> <value> - <string>edu.vanderbilt.dre.DAnCE.ServerExecutable</string> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> </value> </value> </execParameter> @@ -84,8 +84,8 @@ <node>CommandlinePassageNode</node> <source /> <implementation xmi:idref="CompSvrImpl" /> - <configProperty> - <name>edu.vanderbilt.dre.CIAO.ComponentServer.Args</name> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> <value> <type> <kind>tk_string</kind> @@ -123,7 +123,7 @@ <name>CompoSvrArtifactName</name> <source /> <node /> - <location>ciao_componentserver</location> + <location>dance_locality_manager</location> </artifact> <artifact xmi:id="CommandlinePassage_ExecArtifact"> <name>CommandlinePassage_exec</name> diff --git a/modules/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl b/modules/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl index 42e6eb574b4..e54326eb789 100755 --- a/modules/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl +++ b/modules/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl @@ -102,7 +102,7 @@ sub kill_open_processes { $NS->Kill (); $NS->TimedWait (1); } # in case shutdown did not perform as expected - $tg_executor->KillAll ('ciao_componentserver'); + $tg_executor->KillAll ('dance_locality_manager'); } sub run_node_daemons { @@ -112,7 +112,7 @@ sub run_node_daemons { $port = $ports[$i]; $nodename = $nodenames[$i]; $iiop = "iiop://localhost:$port"; - $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + $node_app = "$DANCE_ROOT/bin/dance_locality_manager"; $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp index caa0415af75..5a67065c471 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp +++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp @@ -204,7 +204,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl this->long_ == -1 || this->short_ == -1) { - ACE_ERROR ((LM_ERROR, "SimpleAttribute_exec_i::ccm_activate - " + ACE_ERROR ((LM_ERROR, "SimpleAttributeHom_exec_i::create - " "Error: Attribute values didin't initialize correctly!\n")); } else @@ -213,6 +213,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl "Test passed! String attribute is %s\n", this->str_.c_str ())); } + ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp index 80901f25ca4..363b29389e6 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleFailure_ExecArtifact" /> <artifact xmi:idref="SimpleFailure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleFailureHomeInstance"> @@ -84,7 +95,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp index 8874e3f840a..a447dc8f499 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleFailure_ExecArtifact" /> <artifact xmi:idref="SimpleFailure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleFailureHomeInstance"> @@ -84,7 +95,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp index 8f773621a35..8b63bff232c 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleFailure_ExecArtifact" /> <artifact xmi:idref="SimpleFailure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleFailureHomeInstance"> @@ -84,7 +95,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp index 32fae58667c..594d8c016f1 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleFailure_ExecArtifact" /> <artifact xmi:idref="SimpleFailure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <!-- Node One --> @@ -86,7 +97,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -135,7 +146,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp index db0b5b819b4..30cb3fc94f8 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleFailure_ExecArtifact" /> <artifact xmi:idref="SimpleFailure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <!-- Node One --> @@ -86,7 +97,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -135,7 +146,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp index b6a600d09af..b3c0165c0a3 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleFailure_ExecArtifact" /> <artifact xmi:idref="SimpleFailure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <!-- Node One --> @@ -86,7 +97,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -135,7 +146,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp index 9f6315a7ca7..1b9845d54b4 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleFailure_ExecArtifact" /> <artifact xmi:idref="SimpleFailure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <!-- Node One --> @@ -86,7 +97,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -135,7 +146,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -184,7 +195,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -233,7 +244,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -282,7 +293,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp index 37718ae6dd1..2e306352442 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleFailure_ExecArtifact" /> <artifact xmi:idref="SimpleFailure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <!-- Node One --> @@ -86,7 +97,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -135,7 +146,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -184,7 +195,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -233,7 +244,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -282,7 +293,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp index f01b0da8266..332b454c54f 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleFailure_ExecArtifact" /> <artifact xmi:idref="SimpleFailure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <!-- Node One --> @@ -86,7 +97,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -135,7 +146,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -184,7 +195,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -233,7 +244,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -282,7 +293,7 @@ <source/> <implementation xmi:idref="SimpleFailureComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl index 5b5eb104ee3..80b5df6c20d 100755 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl @@ -89,7 +89,7 @@ sub kill_node_daemons { } for ($i = 0; $i < $nr_daemon; ++$i) { # in case shutdown did not perform as expected - $tg_daemons[$i]->KillAll ('ciao_componentserver'); + $tg_daemons[$i]->KillAll ('dance_locality_manager'); } } @@ -116,7 +116,7 @@ sub run_node_daemons { $nodename = $nodebase . ($i + 1); $node_host = $tg_daemons[$i]->HostName (); $iiop = "iiop://$node_host:$port"; - $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + $node_app = "$DANCE_ROOT/bin/dance_locality_manager"; $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService --instance-nc corbaloc:rir:/NameService"; @@ -229,7 +229,7 @@ foreach $file (@files) { if ($status >= 0) { # cleanup any leftover comp.servers (might happen when not correctly # started or torn down) otherwise we won't be able to start new ones - $tg_executor->KillAll ('ciao_componentserver'); + $tg_executor->KillAll ('dance_locality_manager'); $file =~ s/Failure.*\.cdp$/NoFailure.cdp/; diff --git a/modules/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl b/modules/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl index b473b6ea233..e61b287ddae 100755 --- a/modules/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl +++ b/modules/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl @@ -85,7 +85,7 @@ sub kill_node_daemon { } for ($i = 0; $i < $nr_daemon; ++$i) { # in case shutdown did not perform as expected - $tg_daemons[$i]->KillAll ('ciao_componentserver'); + $tg_daemons[$i]->KillAll ('dance_locality_manager'); } } @@ -112,7 +112,7 @@ sub run_node_daemons { $nodename = $nodenames[$i]; $node_host = $tg_daemons[$i]->HostName (); $iiop = "iiop://$node_host:$port"; - $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + $node_app = "$DANCE_ROOT/bin/dance_locality_manager"; $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService --instance-nc corbaloc:rir:/NameService"; diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp index 01c13b3f3d1..92e67ad815f 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleEmitter_ExecArtifact" /> <artifact xmi:idref="SimpleEmitter_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleConsumerHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleEmitterHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleEmitterComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -169,7 +191,7 @@ <source/> <implementation xmi:idref="SimpleConsumerComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp index 6c01f6d36d6..cfa3f0447e1 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleEmitter_ExecArtifact" /> <artifact xmi:idref="SimpleEmitter_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleConsumerHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleEmitterHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleEmitterComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -180,7 +202,7 @@ <source/> <implementation xmi:idref="SimpleConsumerComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp index c5bc81c852a..31f01a10415 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleProvider_ExecArtifact" /> <artifact xmi:idref="SimpleProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleMultipleUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleMultipleUser_ExecArtifact" /> <artifact xmi:idref="SimpleMultipleUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -169,7 +191,7 @@ <source/> <implementation xmi:idref="SimpleMultipleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -188,7 +210,7 @@ <source/> <implementation xmi:idref="SimpleMultipleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp index fcb44451caa..8a26143627c 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleProvider_ExecArtifact" /> <artifact xmi:idref="SimpleProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleMultipleUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleMultipleUser_ExecArtifact" /> <artifact xmi:idref="SimpleMultipleUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -180,7 +202,7 @@ <source/> <implementation xmi:idref="SimpleMultipleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -210,7 +232,7 @@ <source/> <implementation xmi:idref="SimpleMultipleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp index 6e00f7d41a8..dc68110477a 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleProvider_ExecArtifact" /> <artifact xmi:idref="SimpleProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleMultipleUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleMultipleUser_ExecArtifact" /> <artifact xmi:idref="SimpleMultipleUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -180,7 +202,7 @@ <source/> <implementation xmi:idref="SimpleMultipleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -210,7 +232,7 @@ <source/> <implementation xmi:idref="SimpleMultipleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp index e5a4daa60c2..685e7817684 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleProvider_ExecArtifact" /> <artifact xmi:idref="SimpleProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleMultipleUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleMultipleUser_ExecArtifact" /> <artifact xmi:idref="SimpleMultipleUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -180,7 +202,7 @@ <source/> <implementation xmi:idref="SimpleMultipleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -210,7 +232,7 @@ <source/> <implementation xmi:idref="SimpleMultipleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp index 32747bfc1bf..f67fd51bb0d 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimplePublisher_ExecArtifact" /> <artifact xmi:idref="SimplePublisher_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleConsumerHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimplePublisherHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimplePublisherComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -169,7 +191,7 @@ <source/> <implementation xmi:idref="SimpleConsumerComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp index 054e7964bea..73d217ed42e 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimplePublisher_ExecArtifact" /> <artifact xmi:idref="SimplePublisher_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleConsumerHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimplePublisherHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimplePublisherComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -180,7 +202,7 @@ <source/> <implementation xmi:idref="SimpleConsumerComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp index e9af75b1ac4..9177aa1e82e 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleNull_ExecArtifact" /> <artifact xmi:idref="SimpleNull_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleNullHomeInstance"> @@ -84,7 +95,7 @@ <source/> <implementation xmi:idref="SimpleNullComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp index 8283e9e869a..b41c9c04fa2 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleProvider_ExecArtifact" /> <artifact xmi:idref="SimpleProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleUser_ExecArtifact" /> <artifact xmi:idref="SimpleUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -169,7 +191,7 @@ <source/> <implementation xmi:idref="SimpleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -188,7 +210,7 @@ <source/> <implementation xmi:idref="SimpleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp index 799ec7d5fa6..726e586082c 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleProvider_ExecArtifact" /> <artifact xmi:idref="SimpleProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleUser_ExecArtifact" /> <artifact xmi:idref="SimpleUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -180,7 +202,7 @@ <source/> <implementation xmi:idref="SimpleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -210,7 +232,7 @@ <source/> <implementation xmi:idref="SimpleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp index 58eec7a4ff8..1f52c71a995 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleProvider_ExecArtifact" /> <artifact xmi:idref="SimpleProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleUser_ExecArtifact" /> <artifact xmi:idref="SimpleUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -180,7 +202,7 @@ <source/> <implementation xmi:idref="SimpleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -210,7 +232,7 @@ <source/> <implementation xmi:idref="SimpleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp index fff2817c3ab..9b8a86367c9 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleProvider_ExecArtifact" /> <artifact xmi:idref="SimpleProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleUser_ExecArtifact" /> <artifact xmi:idref="SimpleUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -180,7 +202,7 @@ <source/> <implementation xmi:idref="SimpleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -210,7 +232,7 @@ <source/> <implementation xmi:idref="SimpleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp index e9539795797..9ed8de4aa56 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleNilFacetProvider_ExecArtifact" /> <artifact xmi:idref="SimpleNilFacetProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleNilFacetUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleNilFacetUser_ExecArtifact" /> <artifact xmi:idref="SimpleNilFacetUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleNilFacetProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleNilFacetProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -169,7 +191,7 @@ <source/> <implementation xmi:idref="SimpleNilFacetUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -188,7 +210,7 @@ <source/> <implementation xmi:idref="SimpleNilFacetUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl index 8cca3466bed..db0d579db58 100755 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl @@ -86,7 +86,7 @@ sub kill_node_daemon { } for ($i = 0; $i < $nr_daemon; ++$i) { # in case shutdown did not perform as expected - $tg_daemons[$i]->KillAll ('ciao_componentserver'); + $tg_daemons[$i]->KillAll ('dance_locality_manager'); } } @@ -113,7 +113,7 @@ sub run_node_daemons { $nodename = $nodenames[$i]; $node_host = $tg_daemons[$i]->HostName (); $iiop = "iiop://$node_host:$port"; - $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + $node_app = "$DANCE_ROOT/bin/dance_locality_manager"; $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService --instance-nc corbaloc:rir:/NameService"; diff --git a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl index 901a98944bc..edd5eaf27eb 100755 --- a/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl +++ b/modules/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl @@ -89,7 +89,7 @@ sub kill_node_daemon { } for ($i = 0; $i < $nr_daemon; ++$i) { # in case shutdown did not perform as expected - $tg_daemons[$i]->KillAll ('ciao_componentserver'); + $tg_daemons[$i]->KillAll ('dance_locality_manager'); } } @@ -116,7 +116,7 @@ sub run_node_daemons { $nodename = $nodenames[$i]; $node_host = $tg_daemons[$i]->HostName (); $iiop = "iiop://$node_host:$port"; - $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + $node_app = "$DANCE_ROOT/bin/dance_locality_manager"; $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService --instance-nc corbaloc:rir:/NameService"; diff --git a/modules/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl b/modules/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl index 8c09290d6dc..e3b237cd221 100755 --- a/modules/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl +++ b/modules/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl @@ -109,7 +109,7 @@ sub kill_open_processes { $NS->Kill (); $NS->TimedWait (1); } # in case shutdown did not perform as expected - $tg_executor->KillAll ('ciao_componentserver'); + $tg_executor->KillAll ('dance_locality_manager'); } @@ -120,7 +120,7 @@ sub run_node_daemons { $port = $ports[$i]; $nodename = $nodenames[$i]; $iiop = "iiop://localhost:$port"; - $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + $node_app = "$CIAO_ROOT/bin/dance_locality_manager"; $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService --instance-nc corbaloc:rir:/NameService"; diff --git a/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp b/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp index ee716fd3187..6a276488fb6 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp @@ -64,6 +64,17 @@ <source/> <artifact xmi:idref="Progressive_ExecArtifact" /> <artifact xmi:idref="Progressive_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="ProgressiveHomeInstance"> @@ -81,7 +92,7 @@ <source/> <implementation xmi:idref="ProgressiveComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp b/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp index 6642f413142..a42fa8fd05a 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp @@ -64,6 +64,17 @@ <source/> <artifact xmi:idref="Progressive_ExecArtifact" /> <artifact xmi:idref="Progressive_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="ProgressiveHomeInstance"> @@ -81,7 +92,7 @@ <source/> <implementation xmi:idref="ProgressiveComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp b/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp index dc62694effa..86ab9a921cc 100644 --- a/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp +++ b/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp @@ -66,6 +66,17 @@ <source/> <artifact xmi:idref="SimpleProvider_ExecArtifact" /> <artifact xmi:idref="SimpleProvider_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <implementation xmi:id="SimpleUserHomeImplementation"> @@ -125,6 +136,17 @@ <source/> <artifact xmi:idref="SimpleUser_ExecArtifact" /> <artifact xmi:idref="SimpleUser_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> </implementation> <instance xmi:id="SimpleProviderHomeInstance"> @@ -142,7 +164,7 @@ <source/> <implementation xmi:idref="SimpleProviderComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> @@ -180,7 +202,7 @@ <source/> <implementation xmi:idref="SimpleUserComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl b/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl index c06d1ad5bcf..ea23cc95761 100755 --- a/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl +++ b/modules/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl @@ -103,7 +103,7 @@ sub kill_open_processes { $NS->TimedWait (1); } # in case shutdown did not perform as expected - $tg_executor->KillAll ('ciao_componentserver'); + $tg_executor->KillAll ('dance_locality_manager'); } sub run_node_daemons { @@ -113,7 +113,7 @@ sub run_node_daemons { $port = $ports[$i]; $nodename = $nodenames[$i]; $iiop = "iiop://localhost:$port"; - $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + $node_app = "$DANCE_ROOT/bin/dance_locality_manager"; $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --instance-nc corbaloc:rir:/NameService"; diff --git a/modules/CIAO/ciao/Containers/Container_Base.idl b/modules/CIAO/ciao/Containers/Container_Base.idl index da2d406573a..7027afcc293 100644 --- a/modules/CIAO/ciao/Containers/Container_Base.idl +++ b/modules/CIAO/ciao/Containers/Container_Base.idl @@ -8,6 +8,7 @@ #include "tao/PortableServer/PortableServer_include.pidl" #include "ccm/CCM_Home.idl" #include "ccm/CCM_Base.idl" +#include "ccm/CCM_StandardConfigurator.idl" #include "ciao/Containers/CIAO_Servant_Activator.idl" module CIAO @@ -51,6 +52,9 @@ module CIAO in string servant_artifact, in string servant_entrypoint, in string name); + + void set_attributes (in Components::CCMObject name, + in Components::ConfigValues values); void activate_component (in Components::CCMObject name); diff --git a/modules/CIAO/ciao/Containers/Session/Session_Container.cpp b/modules/CIAO/ciao/Containers/Session/Session_Container.cpp index a6eb570c149..1165135b90d 100644 --- a/modules/CIAO/ciao/Containers/Session/Session_Container.cpp +++ b/modules/CIAO/ciao/Containers/Session/Session_Container.cpp @@ -1013,6 +1013,78 @@ namespace CIAO } void + Session_Container::set_attributes (Components::CCMObject_ptr compref, + const ::Components::ConfigValues & values) + { + CIAO_TRACE("Session_Container::activate_component"); + + try + { + + CIAO::Connector_Servant_Impl_Base * svt = 0; + + try + { + svt = + dynamic_cast<CIAO::Connector_Servant_Impl_Base *> ( + this->component_poa_->reference_to_servant (compref)); + } + catch (...) + { + throw InvalidComponent (); + } + + if (!svt) + { + throw CIAO::InvalidComponent (); + } + else + { + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Session_Container::set_attributes - " + "Configuring attribute values on " + "component object reference.\n")); + + svt->set_attributes (values); + } + } + catch (const CIAO::InvalidComponent &) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Session_Container::set_attributes - " + "Failed to retrieve servant and/or cast " + "to servant pointer.\n")); + throw; + } + catch (const CORBA::Exception &ex) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Session_Container::set_attributes - " + "Caught CORBA exception while configuring " + "component attributes: %C\n", + ex._info ().c_str ())); + throw; + } + catch (...) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Session_Container::set_attributes - " + "Caught unknown C++ eception while " + "configuring component attributes.\n")); + + throw; + } + } + + void Session_Container::activate_component ( Components::CCMObject_ptr compref) { diff --git a/modules/CIAO/ciao/Containers/Session/Session_Container.h b/modules/CIAO/ciao/Containers/Session/Session_Container.h index b25975389d5..a2ec4a05ae1 100644 --- a/modules/CIAO/ciao/Containers/Session/Session_Container.h +++ b/modules/CIAO/ciao/Containers/Session/Session_Container.h @@ -144,6 +144,10 @@ namespace CIAO ::Components::CCMObject_ptr user, const char * user_port); + /// Set attributes on a component + virtual void set_attributes (Components::CCMObject_ptr compref, + const ::Components::ConfigValues & values); + /// Activate component virtual void activate_component (Components::CCMObject_ptr compref); diff --git a/modules/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp b/modules/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp index 3ea45b63aea..ac0ff2e7ff9 100644 --- a/modules/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp +++ b/modules/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp @@ -3,6 +3,7 @@ #include "Deployment/Deployment_PlanErrorC.h" #include "ciao/Logger/Log_Macros.h" +#include "ciao/Valuetype_Factories/ConfigValue.h" namespace CIAO { @@ -44,4 +45,19 @@ namespace CIAO "Nonexistant artifact"); return 0; } + + void + Deployment_Common::create_attribute_configuration (const ::Deployment::Properties &props, + ::Components::ConfigValues & values) + { + values.length (props.length ()); + + for (CORBA::ULong i = 0; + i < props.length (); + ++i) + { + values[i] = new CIAO::ConfigValue_impl (props[i].name.in (), + props[i].value); + } + } } diff --git a/modules/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h b/modules/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h index 30614f91e8b..6a2901402d8 100644 --- a/modules/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h +++ b/modules/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h @@ -11,6 +11,7 @@ #include <map> #include <string> +#include "ccm/CCM_StandardConfiguratorC.h" #include "Deployment/Deployment_DeploymentPlanC.h" #include "DAnCE/DAnCE_Utility.h" @@ -24,6 +25,8 @@ namespace CIAO static const char * get_implementation (const char *name, const ::Deployment::DeploymentPlan &plan); + static void create_attribute_configuration (const ::Deployment::Properties &props, + ::Components::ConfigValues & values); struct Instance_Info { std::string name; diff --git a/modules/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp b/modules/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp index fb4b0575003..cec456977d9 100644 --- a/modules/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp +++ b/modules/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp @@ -169,6 +169,13 @@ namespace CIAO svnt_art, svnt_entry, idd.name.in ()); + + ::Components::ConfigValues attr_config; + Deployment_Common::create_attribute_configuration (idd.configProperty, + attr_config); + + container->set_attributes (comp_ref.in (), + attr_config); } catch (::CORBA::Exception &ex) { diff --git a/modules/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp b/modules/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp index 670829ae5c8..a4536656a9b 100644 --- a/modules/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp +++ b/modules/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp @@ -216,16 +216,18 @@ namespace CIAO "Expected external reference connection."); } - ::Components::CCMObject_var provided; + ::CORBA::Object_var obj; + provided_reference >>= CORBA::Any::to_object (obj); + + ::Components::CCMObject_var provided = ::Components::CCMObject::_narrow (obj.in ()); - if (!(provided_reference >>= provided) && - CORBA::is_nil (provided)) + if (CORBA::is_nil (provided)) { CIAO_ERROR (1, (LM_ERROR, CLINFO "Connection_Handler::connect_facet - " "While connecting <%C>:" "Provided reference for connection where primary is Facet must be " - "non-nil.", + "non-nil.\n", plan.connection[connectionRef].name.in ())); throw ::Deployment::InvalidConnection (plan.connection[connectionRef].name.in (), "Provided reference for connection where primary is Facet must " diff --git a/modules/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp b/modules/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp index c29e311e8d4..4e761ad6eaa 100644 --- a/modules/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp +++ b/modules/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp @@ -91,10 +91,23 @@ namespace CIAO "Home ID is not available"); } + const char *cont_id = + DEPLOYMENT_STATE::instance ()->instance_to_container (tmp); + + ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); + Components::CCMObject_var ref; try { ref = home->create_component (); + + ::Components::ConfigValues attr_config; + Deployment_Common::create_attribute_configuration (idd.configProperty, + attr_config); + + + container->set_attributes (ref.in (), + attr_config); } catch (const CORBA::Exception &ex) { @@ -136,9 +149,6 @@ namespace CIAO this->instances_[idd.name.in ()] = info; - const char *cont_id = - DEPLOYMENT_STATE::instance ()->instance_to_container (tmp); - DEPLOYMENT_STATE::instance ()->add_component (idd.name.in (), cont_id, ref.in ()); diff --git a/modules/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/modules/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp index 5444b2ed0bd..a34a2f8b687 100644 --- a/modules/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp +++ b/modules/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp @@ -163,6 +163,7 @@ namespace CIAO typename COMP_SVNT::_exec_type::_ptr_type exe) { CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component"); + CORBA::Object_var hobj = this->container_->get_objref (this); @@ -193,7 +194,6 @@ namespace CIAO this->container_->install_servant (svt, Container_Types::COMPONENT_t, oid.out ()); - typedef typename COMP_SVNT::_stub_type stub_type; typename COMP_SVNT::_stub_var_type ho = stub_type::_narrow (objref.in ()); @@ -203,7 +203,6 @@ namespace CIAO this->objref_map_.bind ( oid.in (), Components::CCMObject::_duplicate (ccmobjref.in ())); - return ho._retn (); } |