Mon Mar 03 09:37:23 2005 Gan Deng <gan.deng@vanderbilt.edu>

5 files changed, 35 insertions, 12 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 56f0928730c..64a75541f4e 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,19 @@
+Mon Mar 03 09:37:23 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+
+	* DAnCE/examples/Hello/descriptors/Hello.cdp
+	* DAnCE/examples/Hello/descriptors/hello.dat
+
+	  Remove these two files because the file name is bad.
+
+	* DAnCE/examples/Hello/descriptors/DeploymentPlan.cdp
+	* DAnCE/examples/Hello/descriptors/NodeManagerMap.dat
+
+	  Added these two files.
+
+	* DAnCE/examples/Hello/step-by-step.html
+
+	  Fixed this page to reflex the above change.
+	  
 Mon Mar 03 08:59:23 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 
 	* DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -20,12 +36,11 @@ Mon Mar 02 18:30:25 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 	* examples/Hello/step-by-step.html
 	* DAnCE/examples/Hello/step-by-step.html
 
-          Modified these two documentation page to fix some errors.
-
+	  Modified these two documentation page to fix some errors.
 
 	* DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc
 
-          Fixed wrong shared library names and project names.
+	  Fixed wrong shared library names and project names.
 
 Sat Feb 26 14:38:46 2005  Arvind S. Krishna  <arvindk@tango.dre.vanderbilt.edu>
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/descriptors/Hello.cdp b/TAO/CIAO/DAnCE/examples/Hello/descriptors/DeploymentPlan.cdp
index d15bdef91bf..eda6344646e 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/descriptors/Hello.cdp
+++ b/TAO/CIAO/DAnCE/examples/Hello/descriptors/DeploymentPlan.cdp
@@ -7,10 +7,10 @@
   <label>Hello Deployment Plan</label>
   <instance xmi:id="Sender_Instance">
     <name>Sender_Instance</name>
-    <node>Sender</node>
+    <node>SenderNode</node>
   </instance>
   <instance xmi:id="Receiver_Instance">
     <name>Receiver_Instance</name>
-    <node>Receiver</node>
+    <node>ReceiverNode</node>
   </instance>
 </Deployment:DeploymentPlan>
diff --git a/TAO/CIAO/DAnCE/examples/Hello/descriptors/NodeManagerMap.dat b/TAO/CIAO/DAnCE/examples/Hello/descriptors/NodeManagerMap.dat
new file mode 100644
index 00000000000..64a48411d87
--- /dev/null
+++ b/TAO/CIAO/DAnCE/examples/Hello/descriptors/NodeManagerMap.dat
@@ -0,0 +1,2 @@
+SenderNode      corbaloc:iiop:localhost:30000/NodeManager
+ReceiverNode    corbaloc:iiop:localhost:40000/NodeManager
\ No newline at end of file
diff --git a/TAO/CIAO/DAnCE/examples/Hello/descriptors/hello.dat b/TAO/CIAO/DAnCE/examples/Hello/descriptors/hello.dat
deleted file mode 100644
index c92723678c9..00000000000
--- a/TAO/CIAO/DAnCE/examples/Hello/descriptors/hello.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-Sender      corbaloc:iiop:localhost:30000/NodeManager
-Receiver    corbaloc:iiop:localhost:40000/NodeManager
-
diff --git a/TAO/CIAO/DAnCE/examples/Hello/step-by-step.html b/TAO/CIAO/DAnCE/examples/Hello/step-by-step.html
index d5ce7fbc37f..9853a2d291b 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/step-by-step.html
+++ b/TAO/CIAO/DAnCE/examples/Hello/step-by-step.html
@@ -123,7 +123,11 @@ Now we can step forward to build the assembly. Here we are going to build the si
 <li> Please make sure that the Deployment.xsd and XMI.xsd files are in the Hello/descriptors directory.
 <br>
 <br>
-<li> Create the <em>.dat</em> file containing the CORBALOC IIOP address of each <code>NodeManager (Node_Daemon)</code> where it is running. Please refer to the existing <code>hello.dat</code> for details, as you can see, we only specify 1 <code>NodeManager</code>, which means these two components will be installed in the same <code>NodeApplication</code> server.</li>
+<li> Create the <em>.dat</em> file containing the CORBALOC IIOP address of each <code>NodeManager (Node_Daemon)</code> 
+     where it is running. Please refer to the existing <code>NodeManagerMap.dat</code> for details, 
+     as you can see, we only specify 2 <code>NodeManagers</code>, which means these two components 
+     will be installed in the different <code>NodeApplication</code> server. Please refer to the
+     <em>DeploymentPlan.cdp</em> file to see how a deployer could specify the mapping between components and nodes.</li>
 
 <br>
 <br>
@@ -139,14 +143,19 @@ Finally you are ready to test the application you have made.
   <LI> Go into the <em> descriptors </em> directory Start NodeManagers (NodeDameon) by running <code> basicNodeDaemon.pl </code>
   
   <LI> Start the execution manager:
-  <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i hello.dat </code>
+  <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat </code>
   </LI>
+  
+  <ul type="square"> <li> <em>NOTE</em>: As one can see, we use the "NodeManagerMap.dat" file to instruct the 
+       Execution_Manager how to find the endpoint of each individual NodeManager (i.e., Node Daemon) where
+       component(s) will be deployed, so this is non-standard. We plan to use Naming Service to do this in the future.
+  </ul>
 
   <LI> Start the executor:
-  <code> $CIAO_ROOT/DAnCE/RepositoryManager/executor -p package.tpd -d Hello.cdp -k file://EM.ior </code>
+  <code> $CIAO_ROOT/DAnCE/RepositoryManager/executor -p package.tpd -d DeploymentPlan.cdp -k file://EM.ior </code>
   
   <LI> After this, components should be deployed successfully. You can run the $CIAO_ROOT/DAnCE/examples/Hello/Sender/starter to start the application.
-       Please make sure that the component IOR file for the EC component is present when you run this client.
+       Please make sure that the component IOR file for the EC (<code>EC.ior</code>) component is present when you run this client.
 
   <BR/>
   </LI>