diff options
Diffstat (limited to 'CIAO/DAnCE/tests')
47 files changed, 1323 insertions, 102 deletions
diff --git a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/Component.cdp b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/Component.cdp index f692ab3a7eb..432e01f72a6 100644 --- a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/Component.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl index 42e6eb574b4..e54326eb789 100755 --- a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl +++ b/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/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp index caa0415af75..5a67065c471 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp index 80901f25ca4..363b29389e6 100644 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp index 8874e3f840a..a447dc8f499 100644 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp index 8f773621a35..8b63bff232c 100644 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp index 32fae58667c..594d8c016f1 100644 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp index db0b5b819b4..30cb3fc94f8 100644 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp index b6a600d09af..b3c0165c0a3 100644 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp index 9f6315a7ca7..1b9845d54b4 100644 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp index 37718ae6dd1..2e306352442 100644 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp index f01b0da8266..332b454c54f 100644 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl index 5b5eb104ee3..80b5df6c20d 100755 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl +++ b/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/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl b/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl index b473b6ea233..e61b287ddae 100755 --- a/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp index 01c13b3f3d1..92e67ad815f 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp index 6c01f6d36d6..cfa3f0447e1 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp index c5bc81c852a..31f01a10415 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp index fcb44451caa..8a26143627c 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp index 6e00f7d41a8..dc68110477a 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp index e5a4daa60c2..685e7817684 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp index 32747bfc1bf..f67fd51bb0d 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp index 054e7964bea..73d217ed42e 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp index e9af75b1ac4..9177aa1e82e 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp index 8283e9e869a..b41c9c04fa2 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp index 799ec7d5fa6..726e586082c 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp index 58eec7a4ff8..1f52c71a995 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp index fff2817c3ab..9b8a86367c9 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp index e9539795797..9ed8de4aa56 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl index 8cca3466bed..db0d579db58 100755 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl +++ b/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/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl index 901a98944bc..edd5eaf27eb 100755 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl +++ b/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/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp index 6ac17b1e9e9..cab85d47d4a 100644 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-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/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp index 45ff31929c3..3914d6fb605 100644 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-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/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/PublishConnectionExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/PublishConnectionExplicitHome.cdp index 53a0a54482d..5dba94fa3b7 100644 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/PublishConnectionExplicitHome.cdp +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-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/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleAttributeExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleAttributeExplicitHome.cdp index d66eef2c70b..228b8f1fed8 100644 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleAttributeExplicitHome.cdp +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleAttributeExplicitHome.cdp @@ -67,6 +67,17 @@ <source/> <artifact xmi:idref="SimpleAttribute_ExecArtifact" /> <artifact xmi:idref="SimpleAttribute_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="SimpleAttributeHomeInstance"> @@ -117,7 +128,7 @@ <source/> <implementation xmi:idref="SimpleAttributeComponentImplementation" /> <configProperty> - <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> <value> <type> <kind>tk_string</kind> diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentExplicitHome.cdp index 5632d219c48..74cfec7d5b7 100644 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentExplicitHome.cdp +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-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/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp index f3f1e1ca6e9..0654617740a 100644 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-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/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/TwoComponentsOneHome.cdp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/TwoComponentsOneHome.cdp index e02732e05bb..3c04127b3a3 100644 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/TwoComponentsOneHome.cdp +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/TwoComponentsOneHome.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> @@ -161,7 +183,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> @@ -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> @@ -207,7 +229,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/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl index 71c656d841b..4e7f73231b3 100755 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl @@ -108,7 +108,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'); } @@ -119,7 +119,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 --instance-nc corbaloc:rir:/NameService"; diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl index 8c09290d6dc..e3b237cd221 100755 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl +++ b/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/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp b/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp index ee716fd3187..6a276488fb6 100644 --- a/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp b/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp index 6642f413142..a42fa8fd05a 100644 --- a/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp b/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp index dc62694effa..86ab9a921cc 100644 --- a/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp +++ b/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/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl index c06d1ad5bcf..ea23cc95761 100755 --- a/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl +++ b/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/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/Deployment.cdp b/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/Deployment.cdp new file mode 100644 index 00000000000..429a27661de --- /dev/null +++ b/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/Deployment.cdp @@ -0,0 +1,106 @@ +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>LocalityManager_SpawnMultiple</label> + <UUID>LocalityManager_SpawnMultiple</UUID> + + <implementation xmi:id="CompSvrImpl"> + <name>CompSvr</name> + <source /> + <artifact xmi:idref="CompSvrArt" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> + </value> + </value> + </execParameter> + </implementation> + + + <instance xmi:id="CompSvrInst"> + <name>LocalityInstance</name> + <node>LocalityOne</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-o InstOne.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="CompSvrInst2"> + <name>LocalityInstance2</name> + <node>LocalityOne</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-o InstTwo.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="CompSvrInst3"> + <name>LocalityInstance3</name> + <node>LocalityOne</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-o InstThree.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="CompSvrInst4"> + <name>LocalityInstance4</name> + <node>LocalityOne</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-o InstFour.ior</string> + </value> + </value> + </configProperty> + </instance> + + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>ciao_componentserver</location> + </artifact> +</Deployment:DeploymentPlan> + diff --git a/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl b/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl new file mode 100755 index 00000000000..da5225f465e --- /dev/null +++ b/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl @@ -0,0 +1,245 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 1; +@ports = ( 60001 ); +@iorbases = ( "InstOne.ior" ); +@iorfiles = 0; +@nodenames = ( "LocalityOne" ); + +# ior files other than daemon +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Deployment.cdp"; + + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('.'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('.'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('.'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('.'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $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"; + + print "Run dance_node_manager with $d_param\n"; + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 10 seconds to allow task to complete\n"; +sleep (10); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/CIAO/DAnCE/tests/LocalityManager/SpawnOne/Deployment.cdp b/CIAO/DAnCE/tests/LocalityManager/SpawnOne/Deployment.cdp new file mode 100644 index 00000000000..8b3845fe149 --- /dev/null +++ b/CIAO/DAnCE/tests/LocalityManager/SpawnOne/Deployment.cdp @@ -0,0 +1,52 @@ +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>LocalityManager_SpawnOne</label> + <UUID>LocalityManager_SpawnOne</UUID> + + <implementation xmi:id="CompSvrImpl"> + <name>CompSvr</name> + <source /> + <artifact xmi:idref="CompSvrArt" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> + </value> + </value> + </execParameter> + </implementation> + + + <instance xmi:id="CompSvrInst"> + <name>LocalityInstance</name> + <node>LocalityOne</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-o InstOne.ior</string> + </value> + </value> + </configProperty> + </instance> + + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>ciao_componentserver</location> + </artifact> +</Deployment:DeploymentPlan> + diff --git a/CIAO/DAnCE/tests/LocalityManager/SpawnOne/run_test.pl b/CIAO/DAnCE/tests/LocalityManager/SpawnOne/run_test.pl new file mode 100755 index 00000000000..da5225f465e --- /dev/null +++ b/CIAO/DAnCE/tests/LocalityManager/SpawnOne/run_test.pl @@ -0,0 +1,245 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 1; +@ports = ( 60001 ); +@iorbases = ( "InstOne.ior" ); +@iorfiles = 0; +@nodenames = ( "LocalityOne" ); + +# ior files other than daemon +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Deployment.cdp"; + + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('.'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('.'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('.'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('.'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $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"; + + print "Run dance_node_manager with $d_param\n"; + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 10 seconds to allow task to complete\n"; +sleep (10); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; |