summaryrefslogtreecommitdiff
path: root/CIAO/tutorials
diff options
context:
space:
mode:
authormcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-01-20 12:11:28 +0000
committermcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-01-20 12:11:28 +0000
commit1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5 (patch)
tree78fc0571a66bb48c5b2565e10ceef69cfe5afff2 /CIAO/tutorials
parent6f8f4ebd99e45fe3e24a40c6cc7cf03bf8d31c24 (diff)
downloadATCD-1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5.tar.gz
Merged RemedyWork branch.
ChangeLogTag: Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'CIAO/tutorials')
-rw-r--r--CIAO/tutorials/Quoter/Simple/04.html2
-rw-r--r--CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h2
-rw-r--r--CIAO/tutorials/Quoter/Simple/README.html8
3 files changed, 6 insertions, 6 deletions
diff --git a/CIAO/tutorials/Quoter/Simple/04.html b/CIAO/tutorials/Quoter/Simple/04.html
index 60c49cb63bc..5097af5ae73 100644
--- a/CIAO/tutorials/Quoter/Simple/04.html
+++ b/CIAO/tutorials/Quoter/Simple/04.html
@@ -72,7 +72,7 @@ COLOR:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/descriptors</span></code><
%DANCE_ROOT%/bin/dance_execution_manager -eEM.ior --cdd NodeMap.cdd</span></code>&nbsp; </P>
<p><span style='COLOR:black'>The </span><code><span style='FONT-SIZE:10pt;
COLOR:black'>NodeMap.cdd</span></code><span style='COLOR:black'> file describes
- the deployment daemons CIAO's Execution_Manager will contact to instantiate
+ the deployment daemons DAnCE's Execution_Manager will contact to instantiate
ComponentServer's, home's, and component instances. In xml the name
of an installation "destination" and the corresponding IOR for the
CIAO_Daemon are described.</span></p>
diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
index 87ad7a9195a..49972e7fb99 100644
--- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
+++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
@@ -61,7 +61,7 @@ namespace CIAO_Stock_StockDistributor_Impl
virtual ~StockQuoter_exec_i (void);
- // Operations and attributes from ::Stock::StockQuoter
+ // Operations and attributes from Stock::StockQuoter
// TAO_IDL - Generated from
// c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
diff --git a/CIAO/tutorials/Quoter/Simple/README.html b/CIAO/tutorials/Quoter/Simple/README.html
index 76414ba92cc..a5be49e8bca 100644
--- a/CIAO/tutorials/Quoter/Simple/README.html
+++ b/CIAO/tutorials/Quoter/Simple/README.html
@@ -60,7 +60,7 @@ generate makefiles and Visual C++ project/solutions files for all <a
href="http://www.cs.wustl.edu/%7Eschmidt/TAO.html">TAO</a> and <a
href="http://www.cs.wustl.edu/%7Eschmidt/CIAO.html">CIAO</a>
libraries. </li>
-<li>&nbsp;idl and cidl files for each component are placed in
+<li>&nbsp;idl and files for each component are placed in
components directory.
</li>
<li>&nbsp;The <code>_exec.h</code> and <code>_exec.cpp</code> files
@@ -116,10 +116,10 @@ directory:
<ul>
<li>Start NodeManagers (NodeDameon) by running runNodeDaemon.pl </li>
<li>Start the execution manager
-$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o ior -i
+$DANCE_ROOT/bin/dance_execution_manager -o ior -i
Stock.dat&nbsp; </li>
</ul>
-<p>The Stock.dat file describes the deployment daemons CIAO's
+<p>The Stock.dat file describes the deployment daemons DAnCE's
Execution_Manager
will contact to instantiate ComponentServer's, home's, and component
instances.
@@ -134,7 +134,7 @@ this in the future. </li>
</ul>
<ul>
<li> Start the plan_launcher by running
-$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p
+$DANCE_ROOT/bin/dance_plan_launcher -p
flattened_deploymentplan.cdp -k file://ior</li>
<li>By now the components should be successfully deployed. You may
run the driver program to start the application. Open a new shell, keep