diff options
Diffstat (limited to 'CIAO/examples/Hello/descriptors')
12 files changed, 144 insertions, 23 deletions
diff --git a/CIAO/examples/Hello/descriptors/Aliased_Map.cdd b/CIAO/examples/Hello/descriptors/Aliased_Map.cdd new file mode 100644 index 00000000000..3a9fbdb0de7 --- /dev/null +++ b/CIAO/examples/Hello/descriptors/Aliased_Map.cdd @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<Deployment:domain 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"> + + <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID> + + <label/> + + <node> + <name>Alias</name> + <label/> + <resource> + <name>Node Address</name> + <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType> + <property> + <name>edu.vanderbilt.dre.DAnCE.StringIOR</name> + <kind>Attribute</kind> + <dynamic>false</dynamic> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>corbaloc:iiop:localhost:60001</string> + </value> + </value> + </property> + </resource> + </node> + <node> + <name>Alias</name> + <label/> + <resource> + <name>Node Address</name> + <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType> + <property> + <name>edu.vanderbilt.dre.DAnCE.StringIOR</name> + <kind>Attribute</kind> + <dynamic>false</dynamic> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>corbaloc:iiop:localhost:60002</string> + </value> + </value> + </property> + </resource> + </node> +</Deployment:domain>
\ No newline at end of file diff --git a/CIAO/examples/Hello/descriptors/Aliased_Map.dat b/CIAO/examples/Hello/descriptors/Aliased_Map.dat deleted file mode 100644 index 30e6930c2a3..00000000000 --- a/CIAO/examples/Hello/descriptors/Aliased_Map.dat +++ /dev/null @@ -1,2 +0,0 @@ -SenderNode corbaloc:iiop:localhost:60001/Alias.NodeManager -ReceiverNode corbaloc:iiop:localhost:60001/Alias.NodeManager
\ No newline at end of file diff --git a/CIAO/examples/Hello/descriptors/NodeManagerMap.cdd b/CIAO/examples/Hello/descriptors/NodeManagerMap.cdd new file mode 100644 index 00000000000..0bac35a3e21 --- /dev/null +++ b/CIAO/examples/Hello/descriptors/NodeManagerMap.cdd @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<Deployment:domain 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"> + + <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID> + + <label/> + + <node> + <name>SenderNode</name> + <label/> + <resource> + <name>Node Address</name> + <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType> + <property> + <name>edu.vanderbilt.dre.DAnCE.StringIOR</name> + <kind>Attribute</kind> + <dynamic>false</dynamic> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>corbaloc:iiop:localhost:60001</string> + </value> + </value> + </property> + </resource> + </node> + <node> + <name>ReceiverNode</name> + <label/> + <resource> + <name>Node Address</name> + <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType> + <property> + <name>edu.vanderbilt.dre.DAnCE.StringIOR</name> + <kind>Attribute</kind> + <dynamic>false</dynamic> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>corbaloc:iiop:localhost:60002</string> + </value> + </value> + </property> + </resource> + </node> +</Deployment:domain>
\ No newline at end of file diff --git a/CIAO/examples/Hello/descriptors/NodeManagerMap.dat b/CIAO/examples/Hello/descriptors/NodeManagerMap.dat deleted file mode 100644 index fb390806728..00000000000 --- a/CIAO/examples/Hello/descriptors/NodeManagerMap.dat +++ /dev/null @@ -1,4 +0,0 @@ -SenderNode corbaloc:iiop:localhost:60001/Sender.NodeManager - - -ReceiverNode corbaloc:iiop:localhost:60002/Receiver.NodeManager
\ No newline at end of file diff --git a/CIAO/examples/Hello/descriptors/NodeMap.cdd b/CIAO/examples/Hello/descriptors/NodeMap.cdd new file mode 100755 index 00000000000..a48f4bc245b --- /dev/null +++ b/CIAO/examples/Hello/descriptors/NodeMap.cdd @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<Deployment:domain 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"> + + <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID> + + <label/> + + <node> + <name>NodeOne</name> + <label/> + <resource> + <name>Node Address</name> + <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType> + <property> + <name>edu.vanderbilt.dre.DAnCE.StringIOR</name> + <kind>Attribute</kind> + <dynamic>false</dynamic> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>corbaloc:iiop:localhost:60001</string> + </value> + </value> + </property> + </resource> + </node> +</Deployment:domain> diff --git a/CIAO/examples/Hello/descriptors/NodeMap.dat b/CIAO/examples/Hello/descriptors/NodeMap.dat deleted file mode 100755 index 16cb0459657..00000000000 --- a/CIAO/examples/Hello/descriptors/NodeMap.dat +++ /dev/null @@ -1 +0,0 @@ -NodeOne corbaloc:iiop:localhost:60001/NodeOne.NodeManager diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl index dffd736af37..7d4fb2e9057 100755 --- a/CIAO/examples/Hello/descriptors/run_test.pl +++ b/CIAO/examples/Hello/descriptors/run_test.pl @@ -20,10 +20,9 @@ $nr_daemon = 2; @ports = ( 60001, 60002 ); @iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); @iorfiles = 0; -@nodenames = ( "Sender", "Receiver" ); +@nodenames = ( "SenderNode", "ReceiverNode" ); $status = 0; -$dat_file = "NodeManagerMap.dat"; $cdp_file = "DeploymentPlan.cdp"; $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; @@ -118,7 +117,7 @@ sub run_node_daemons { $node_app = $tg_daemons[$i]->GetArchDir("$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"; + $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"; @@ -181,7 +180,7 @@ $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 --node-map $dat_file"); + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); $EM->Spawn (); if ($tg_exe_man->WaitForFileTimed ($ior_embase, diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl index 7d4d6febd1e..ccf44c53969 100755 --- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl +++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl @@ -21,7 +21,7 @@ $daemons = 1; @nodenames = ( "NodeOne" ); $status = 0; -$dat_file = "NodeMap.dat"; +$dat_file = "NodeMap.cdd"; $cdp_file = "PlanLocality_DifferentProcesses.cdp"; $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; @@ -141,7 +141,7 @@ $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 --node-map $dat_file"); + "-e$ior_emfile --cdd $dat_file"); $EM->Spawn (); if ($tg_exe_man->WaitForFileTimed ($ior_embase, diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl index 9edeb1b8361..d32ce8cc057 100755 --- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl +++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl @@ -21,7 +21,7 @@ $daemons = 1; @nodenames = ( "NodeOne" ); $status = 0; -$dat_file = "NodeMap.dat"; +$dat_file = "NodeMap.cdd"; $cdp_file = "PlanLocality_SameProcess.cdp"; $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; @@ -141,7 +141,7 @@ $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 --node-map $dat_file"); + "-e$ior_emfile --cdd $dat_file"); $EM->Spawn (); if ($tg_exe_man->WaitForFileTimed ($ior_embase, diff --git a/CIAO/examples/Hello/descriptors/run_test_alias.pl b/CIAO/examples/Hello/descriptors/run_test_alias.pl index 82a617fdf58..c5a44969fe2 100755 --- a/CIAO/examples/Hello/descriptors/run_test_alias.pl +++ b/CIAO/examples/Hello/descriptors/run_test_alias.pl @@ -23,7 +23,7 @@ $daemons = 1; @nodenames = ( "Alias" ); $status = 0; -$dat_file = "Aliased_Map.dat"; +$dat_file = "Aliased_Map.cdd"; $cdp_file = "DeploymentPlan.cdp"; $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; @@ -181,7 +181,7 @@ $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 --node-map $dat_file"); + "-e$ior_emfile --cdd $dat_file"); $EM->Spawn (); if ($tg_exe_man->WaitForFileTimed ($ior_embase, diff --git a/CIAO/examples/Hello/descriptors/run_test_shs.pl b/CIAO/examples/Hello/descriptors/run_test_shs.pl index 658b2f52fd0..f115d6b83da 100755 --- a/CIAO/examples/Hello/descriptors/run_test_shs.pl +++ b/CIAO/examples/Hello/descriptors/run_test_shs.pl @@ -20,10 +20,10 @@ $nr_daemon = 2; @ports = ( 60001, 60002 ); @iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); @iorfiles = 0; -@nodenames = ( "Sender", "Receiver" ); +@nodenames = ( "SenderNode", "ReceiverNode" ); $status = 0; -$dat_file = "NodeManagerMap.dat"; +$dat_file = "NodeManagerMap.cdd"; $cdp_file = "DeploymentPlan.cdp"; $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; @@ -216,7 +216,7 @@ $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 --node-map $dat_file"); + "-e$ior_emfile --cdd $dat_file"); $EM->Spawn (); if ($tg_exe_man->WaitForFileTimed ($ior_embase, diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl index d9b367ca6f6..dcc4f99ffc5 100755 --- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl +++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl @@ -18,10 +18,10 @@ $daemons = 2; @ports = ( 60001, 60002 ); @iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); @iorfiles = 0; -@nodenames = ( "Sender", "Receiver" ); +@nodenames = ( "SenderNode", "ReceiverNode" ); $status = 0; -$dat_file = "NodeManagerMap.dat"; +$dat_file = "NodeManagerMap.cdd"; $cdp_file = "DeploymentPlan_without_ns.cdp"; $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; @@ -141,7 +141,7 @@ $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 --node-map $dat_file"); + "-e$ior_emfile --cdd $dat_file"); $EM->Spawn (); if ($tg_exe_man->WaitForFileTimed ($ior_embase, |