Fri Jul 29 15:02:43 2005 Gan Deng <dengg@dre.vanderbilt.edu>

4 files changed, 377 insertions, 0 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index aed83c14d21..c3d99537df1 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Fri Jul 29 15:02:43 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
+
+        * DAnCE/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
+        * DAnCE/examples/Hello/descriptors/run_test_without_ns.pl
+
+	  Added a flattened deployment plan and test script which
+	  doesn't use naming service.
+
+        * DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
+
+	  Documented the above another available test in the file.
+
 Fri Jul 29 09:30:43 2005  Nishanth Shanakran  <nshankar@dre.vanderbilt.edu>
 
         * NEWS:
diff --git a/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
index ff13fec96fa..7f2fb021c70 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
@@ -1,3 +1,8 @@
+<!-- This flattened deployment plan allows component instance to 
+     register to naming service, if you don't want to use naming
+     service at all, you can use the flattened_deployment_without_ns.cdp
+     as your deployment descriptor. -->
+
 <Deployment:deploymentPlan
  xmlns:Deployment="http://www.omg.org/Deployment"
  xmlns:xmi="http://www.omg.org/XMI"
@@ -66,6 +71,7 @@
     </configProperty>
 
     <!-- Add this property if you want to register with naming service -->
+    <!-- The string is the naming context to bind to naming service -->
     <configProperty>
       <name>RegisterNaming</name>
       <value>
diff --git a/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp b/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
new file mode 100644
index 00000000000..3cfd7d9b389
--- /dev/null
+++ b/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
@@ -0,0 +1,201 @@
+<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 Modified_Deployment.xsd">
+
+  <label>Hello-DeploymentPlan</label>
+  <UUID>Hello_Plan_UUID_0001</UUID>
+  <!-- Could be ZERO  -->
+  <realizes>
+    <label>BasicSP-realizes-cid</label>
+    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
+    <specificType><!-- @@ What does here? --></specificType>
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <port>
+      <name>read_message</name>
+      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
+      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
+      <provider>false></provider>
+      <exclusiveProvider>false</exclusiveProvider>
+      <exclusiveUser>true</exclusiveUser>
+      <optional>false</optional>
+      <kind>SimplexReceptacle</kind>
+    </port>
+  </realizes>
+  
+  <implementation id="Hello-Sender-mdd">
+    <name>Hello-Sender-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Sender_exec</artifact>
+    <artifact>Hello-Sender_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="Hello-Receiver-mdd">
+    <name>Hello-Receiver-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>Hello-Receiver_exec</artifact>
+    <artifact>Hello-Receiver_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <instance id="Hello-Sender-idd">
+    <name>Hello-Sender-idd</name>
+    <node>SenderNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Sender-mdd</implementation>
+
+    <!-- Add this property if you want to write component reference to IOR -->
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+
+    <!-- Add this property if you want to initialize component attribute -->
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a test message passed in through XML.</string>
+        </value>
+      </value> 
+    </configProperty>
+  </instance>
+
+  <instance id="Hello-Receiver-idd">
+    <name>Hello-Receiver-idd</name>
+    <node>ReceiverNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>Hello-Receiver-mdd</implementation>
+    <configProperty>
+      <name>ComponentIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+
+  <connection>
+    <name>hell_event_connection</name>
+    <internalEndpoint>
+      <portName>click_out</portName>
+      <kind>EventPublisher</kind>
+      <instance>Hello-Sender-idd</instance>
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>click_in</portName>
+      <kind>EventConsumer</kind>
+      <instance>Hello-Receiver-idd</instance>
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>hello_facet_connection</name>
+    <internalEndpoint>
+      <portName>push_message</portName>
+      <kind>Facet</kind>
+      <instance>Hello-Sender-idd</instance>
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>read_message</portName>
+      <kind>SimplexReceptacle</kind>
+      <instance>Hello-Receiver-idd</instance>
+    </internalEndpoint>
+  </connection>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="Hello-Sender_exec">
+    <name>Sender_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Sender_svnt">
+    <name>Sender_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Sender_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_exec">
+    <name>Receiver_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="Hello-Receiver_svnt">
+    <name>Receiver_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Receiver_DnC_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/DAnCE/examples/Hello/descriptors/run_test_without_ns.pl b/TAO/CIAO/DAnCE/examples/Hello/descriptors/run_test_without_ns.pl
new file mode 100644
index 00000000000..43218f8d5c8
--- /dev/null
+++ b/TAO/CIAO/DAnCE/examples/Hello/descriptors/run_test_without_ns.pl
@@ -0,0 +1,158 @@
+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::Run_Test;
+
+$DAnCE = "$ENV{'ACE_ROOT'}/TAO/CIAO/DAnCE";
+
+$daemons_running = 0;
+$em_running = 0;
+$daemons = 2;
+@ports = ( 60001, 60002 );
+@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
+$status = 0;
+$dat_file = "TestNodeManagerMap.dat";
+$cdp_file = "DeploymentPlan.cdp";
+$controller_exec = "$DAnCE/examples/Hello/Sender/starter";
+
+$E = 0;
+$EM = 0;
+
+# Delete if there are any .ior files.
+sub delete_ior_files {
+    for ($i = 0; $i < $daemons; ++$i) {
+        unlink $iorfiles[$i];
+    }
+    unlink PerlACE::LocalFile ("EM.ior");
+    unlink PerlACE::LocalFile ("Receiver.ior");
+    unlink PerlACE::LocalFile ("Sender.ior");
+    unlink PerlACE::LocalFile ("DAM.ior");
+}
+
+sub kill_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i) {
+    $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+  }
+}
+
+sub kill_open_processes {
+  if ($daemons_running == 1) {
+    kill_node_daemons ();
+  }
+
+  if ($em_running == 1) {
+    $EM->Kill ();
+    $EM->TimedWait (1);
+  }
+}
+
+sub run_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i)
+  {
+      $iorfile = $iorfiles[$i];
+      $port = $ports[$i];
+
+      $iiop = "iiop://localhost:$port";
+      $node_app = "$DAnCE/NodeApplication/NodeApplication";
+
+      $d_cmd = "$DAnCE/NodeManager/Node_Daemon";
+      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
+
+      $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
+      $result = $Daemons[$i]->Spawn ();
+      push(@processes, $Daemons[$i]);
+
+      if (PerlACE::waitforfile_timed ($iorfile,
+                          $PerlACE::wait_interval_for_process_creation) == -1) {
+          print STDERR
+            "ERROR: The ior file of node daemon $i could not be found\n";
+          for (; $i > 0; --$i) {
+            $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+          }
+          return -1;
+      }
+  }
+  $daemons_running = 1;
+  return 0;
+}
+
+delete_ior_files ();
+
+# Invoke node daemons.
+print "Invoking node daemons\n";
+$status = run_node_daemons ();
+
+if ($status != 0) {
+  print STDERR "ERROR: Unable to execute the node daemons\n";
+  exit 1;
+}
+
+$ns_running = 1;
+
+# Invoke execution manager.
+print "Invoking execution manager\n";
+$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
+                            "-o EM.ior -i $dat_file");
+$EM->Spawn ();
+
+if (PerlACE::waitforfile_timed ("EM.ior",
+                        $PerlACE::wait_interval_for_process_creation) == -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 - start the application -\n";
+$E =
+  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+                        "-p flattened_deploymentplan_without_ns.cdp -k file://EM.ior -o DAM.ior");
+ 
+$E->SpawnWaitKill (5000);
+
+if (PerlACE::waitforfile_timed (
+      "Receiver.ior",
+      $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR "ERROR: The ior file of receiver could not be found\n";
+    kill_open_processes (); 
+    exit 1;
+}
+
+if (PerlACE::waitforfile_timed ("Sender.ior",
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR "ERROR: The ior file of sender could not be found\n";
+    kill_open_processes (); 
+    exit 1;
+}
+
+print "Invoking the controller\n";
+$controller = new PerlACE::Process ("$controller_exec", "-k file://Sender.ior");
+$result = $controller->SpawnWaitKill (3000);
+
+if ($result != 0) {
+    print STDERR "ERROR: The controller returned $result\n";
+    $status = 1;
+}
+
+# Invoke executor - stop the application -.
+print "Invoking executor - stop the application -\n";
+$E =
+  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+                        "-k file://EM.ior -i file://DAM.ior");
+$E->SpawnWaitKill (3000);
+
+print "Executor returned.\n";
+print "Shutting down rest of the processes.\n";
+
+delete_ior_files ();
+kill_open_processes ();
+
+exit $status;