summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2010-06-29 12:43:13 +0000
committerMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2010-06-29 12:43:13 +0000
commit41f70459381183a8c87ae786624595c1d4003b10 (patch)
treeb4d48cfd2a9c746460095f97e7d446cac55ada40
parent1aa2b6778e6968fd5a28a9a515643d3bee4f535f (diff)
downloadATCD-41f70459381183a8c87ae786624595c1d4003b10.tar.gz
Tue Jun 29 12:42:04 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html * connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html * connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html Changes text and layout
-rw-r--r--CIAO/ChangeLog10
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html203
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html32
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html27
-rw-r--r--CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html1
5 files changed, 120 insertions, 153 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 93356f7d843..bb6d4568588 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jun 29 12:42:04 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl>
+
+ * connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html
+ * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html
+ * connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html
+ * connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html
+ Changes text and layout
+
Tue Jun 29 12:29:25 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl:
@@ -72,7 +80,7 @@ Tue Jun 29 08:40:39 UTC 2010 Marcel Smit <msmit@remedy.nl>
* tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp:
Code layout.
-Tue Jun 22 08:37:04 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl>
+Tue Jun 29 08:37:04 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp
* connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html
index a575602fae3..0812b351214 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html
@@ -8,9 +8,6 @@
<META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
<META NAME="CHANGED" CONTENT="20100625;13251200">
<META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
- <META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
- <META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
- <META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
<STYLE TYPE="text/css">
<!--//$Id$ -->
<!--
@@ -18,151 +15,109 @@
-->
</STYLE>
</HEAD>
-<BODY LANG="nl-NL" DIR="LTR">
-<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=2 STYLE="page-break-before: always">
+<BODY LANG="nl-NL" DIR="ltr">
+<TABLE WIDTH="100%" BORDER=0 CELLPADDING=2 CELLSPACING=2 STYLE="PAGE-BREAK-BEFORE: always">
<TR>
<TD>
- <P><BR>
- </P>
- </TD>
+ <P><BR></P></TD>
<TD>
- <P ALIGN=CENTER><IMG SRC="images/images.png" NAME="graphics1" ALIGN=BOTTOM WIDTH=4% HEIGHT=5% BORDER=0></P>
- </TD>
+ <P ALIGN=center><IMG border=0 name=graphics1 align=bottom src="images/images.png" width="4%" height="5%" ></P></TD>
<TD>
- <P ALIGN=RIGHT><A HREF="02_idl.html">Next</A></P>
- </TD>
- </TR>
-</TABLE>
+ <P ALIGN=right><A href="02_idl.html">Next</A></P></TD></TR></TABLE>
<HR>
<H1>General</H1>
-<P>This tutorial explains how to use Asynchronous Method Invocation
-for CCM (AMI4CCM). The AMI Connector component handles the
+<P>This tutorial explains how to use Asynchronous Method
+Invocation for CCM (AMI4CCM). The AMI Connector component handles the
asynchronous invocation using CORBA AMI.</P>
-<P STYLE="margin-bottom: 0cm"><BR>
-</P>
+<P STYLE="MARGIN-BOTTOM: 0cm"><BR></P>
<H2 CLASS="western">System</H2>
-<P>The system consists of three components:
-</P>
+<P>The system consists of three components: </P>
<UL>
- <LI><P STYLE="margin-bottom: 0cm">A Sender component
- </P>
- <LI><P STYLE="margin-bottom: 0cm">A Receiver component
- </P>
- <LI><P>An AMI4CCM connector
- </P>
-</UL>
-<P>In this tutorial a Sender wants to invoke methods on the Receiver
-asynchronously and synchronously. Therefor the Sender and the
-Receiver are connected via an AMI connector for the asynchronously
-invoked methods and via a direct connection for the synchronously
-invoked methods. The AMI connector itself will be completely
-generated by IDL and will handle details of executing the
-asynchronous invocation and callback to the user component. The
-Receiver (Server side) isn't aware of any AMI clients.</P>
-<P><IMG SRC="images/system.png" NAME="graphics4" ALIGN=BOTTOM WIDTH=33% HEIGHT=27% BORDER=0></P>
-<P>There are different methods used in this example in order to show
-different aspects:
-</P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm">A Sender component </P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm">A Receiver component </P>
+ <LI><P>An AMI connector </P></LI></UL>
+<P>In this tutorial a Sender wants to invoke methods on the
+Receiver asynchronously and synchronously. Therefor the Sender and the Receiver
+are connected via an AMI connector for the asynchronously invoked methods and
+via a direct connection for the synchronously invoked methods. The AMI connector
+itself will be completely generated by IDL and will handle details of executing
+the asynchronous invocation and callback to the user component. The Receiver
+(Server side) isn't aware of any AMI clients.</P>
+<P><IMG border=0 name=graphics4 align=bottom src="images/system.png" width="33%" height="27%" ></P>
+<P>There are different methods used in this example in
+order to show different aspects: </P>
<UL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT COLOR="#000000"><FONT SIZE=3>method
- with return value, in- and out argument:</FONT></FONT></P>
-</UL>
-<P STYLE="margin-left: 2cm; margin-bottom: 0cm"><FONT SIZE=2><FONT COLOR="#0000ff">long</FONT><FONT COLOR="#000000">
-</FONT><FONT COLOR="#000000">foo (</FONT><FONT COLOR="#0000ff">in</FONT><FONT COLOR="#000000">
-</FONT><FONT COLOR="#0000ff">string</FONT><FONT COLOR="#000000">
-</FONT><FONT COLOR="#000000">in_str, </FONT><FONT COLOR="#0000ff">out</FONT><FONT COLOR="#000000">
-</FONT><FONT COLOR="#0000ff">string</FONT><FONT COLOR="#000000">
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm"><FONT COLOR="#000000"><FONT SIZE=3>method with return
+ value, in- and out argument:</FONT></FONT></P></LI></UL>
+<P STYLE="MARGIN-BOTTOM: 0cm; MARGIN-LEFT: 2cm"><FONT SIZE=2><FONT COLOR="#0000ff">long</FONT><FONT COLOR="#000000">
+</FONT><FONT COLOR="#000000">foo (</FONT><FONT COLOR="#0000ff">in</FONT><FONT COLOR="#000000">
+</FONT><FONT COLOR="#0000ff">string</FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#000000">in_str,
+</FONT><FONT COLOR="#0000ff">out</FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#0000ff">string</FONT><FONT COLOR="#000000">
</FONT><FONT COLOR="#000000">answer);</FONT></FONT></P>
<UL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT COLOR="#000000"><FONT SIZE=3>void
- method with out argument:</FONT></FONT></P>
-</UL>
-<P STYLE="margin-left: 2cm; margin-bottom: 0cm"><FONT SIZE=2><FONT COLOR="#0000ff">void</FONT><FONT COLOR="#000000">
-</FONT><FONT COLOR="#000000">hello (</FONT><FONT COLOR="#0000ff">out</FONT><FONT COLOR="#000000">
-</FONT><FONT COLOR="#0000ff">long</FONT><FONT COLOR="#000000">
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm"><FONT COLOR="#000000"><FONT SIZE=3>void method with out
+ argument:</FONT></FONT></P></LI></UL>
+<P STYLE="MARGIN-BOTTOM: 0cm; MARGIN-LEFT: 2cm"><FONT SIZE=2><FONT COLOR="#0000ff">void</FONT><FONT COLOR="#000000">
+</FONT><FONT COLOR="#000000">hello (</FONT><FONT COLOR="#0000ff">out</FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#0000ff">long</FONT><FONT COLOR="#000000">
</FONT><FONT COLOR="#000000">answer);</FONT></FONT></P>
<UL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT COLOR="#000000"><FONT SIZE=3>method
- to set and get an attribute:</FONT></FONT></P>
-</UL>
-<P STYLE="margin-left: 2cm; margin-bottom: 0cm"><FONT COLOR="#000000">
-<FONT SIZE=2>a</FONT></FONT><FONT COLOR="#000000"><FONT SIZE=2>ttribute
-</FONT></FONT><FONT COLOR="#0000ff"><FONT SIZE=2>short</FONT></FONT><FONT COLOR="#000000"><FONT SIZE=2>
-rw_attrib</FONT></FONT></P>
-<P STYLE="margin-left: 2.54cm; margin-bottom: 0cm"><FONT COLOR="#000000">
-<FONT SIZE=2>getraises (InternalError)</FONT></FONT></P>
-<P STYLE="margin-left: 2.65cm; margin-bottom: 0cm"><FONT COLOR="#000000">
-<FONT SIZE=2>setraises (InternalError);</FONT></FONT></P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm"><FONT COLOR="#000000"><FONT SIZE=3>method to set and get
+ an attribute:</FONT></FONT></P></LI></UL>
+<P STYLE="MARGIN-BOTTOM: 0cm; MARGIN-LEFT: 2cm"><FONT COLOR="#000000">
+<FONT SIZE=2>attribute
+</FONT></FONT><FONT COLOR="#0000ff"><FONT SIZE=2>short</FONT></FONT><FONT COLOR="#000000"><FONT SIZE=2>
+rw_attrib<BR></FONT></FONT>&nbsp;
+<FONT COLOR="#000000"><FONT SIZE=2>&nbsp;&nbsp;getraises
+(InternalError)<BR></FONT></FONT>&nbsp;
+<FONT COLOR="#000000"><FONT SIZE=2>&nbsp;&nbsp;setraises
+(InternalError);</FONT></FONT></P>
<UL>
- <LI><P STYLE="margin-bottom: 0cm"><FONT COLOR="#000000"><FONT SIZE=3>method
- to get an readonly attribute:</FONT></FONT></P>
-</UL>
-<P STYLE="margin-left: 2cm; margin-bottom: 0cm"><FONT COLOR="#0000ff">
-<FONT SIZE=2>readonly</FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#000000">attribute
-</FONT><FONT COLOR="#0000ff">short</FONT><FONT COLOR="#000000">
-</FONT><FONT COLOR="#000000">ro_attrib raises (InternalError);</FONT></FONT></P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm"><FONT COLOR="#000000"><FONT SIZE=3>method to get an
+ readonly attribute:</FONT></FONT></P></LI></UL>
+<P STYLE="MARGIN-BOTTOM: 0cm; MARGIN-LEFT: 2cm"><FONT COLOR="#0000ff">
+<FONT SIZE=2>readonly</FONT><FONT COLOR="#000000">
+</FONT><FONT COLOR="#000000">attribute </FONT><FONT COLOR="#0000ff">short</FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#000000">ro_attrib
+raises (InternalError);</FONT></FONT></P>
<H2 CLASS="western">Directory structure</H2>
-<P>The following convention is used:
-</P>
+<P>The following convention is used: </P>
<UL>
- <LI><P STYLE="margin-bottom: 0cm">|--<B>*_asm</B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- : Directory contains an assembly.
- </P>
- <LI><P STYLE="margin-bottom: 0cm">&nbsp;&nbsp;&nbsp;&nbsp;|--<B>ports</B>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : Directory contains common IDL
- code for the assembly.
- </P>
- <LI><P STYLE="margin-bottom: 0cm">&nbsp;&nbsp;&nbsp;&nbsp;|--<B>*_comp</B>&nbsp;&nbsp;&nbsp;
- : Directory contains an component.
- </P>
- <LI><P STYLE="margin-bottom: 0cm">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|--
- <B>ports</B>&nbsp;&nbsp; : Directory contains common IDL code for
- the component.
- </P>
- <LI><P>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|--&nbsp;<B>src</B>&nbsp;
- &nbsp;&nbsp; : Directory contains the IDL and *_exec-files for the
- component.
- </P>
-</UL>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm">|--<B>*_asm</B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+ : Directory contains an assembly. </P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm">&nbsp;&nbsp;&nbsp;&nbsp;|--<B>ports</B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : C:\ACE\latest\ACE_wrappers\TAO\CIAO\connectors\ami4ccm\tutorials\Hello\Tutorial\02_idl.html
+
+ Directory contains common IDL code for the assembly. </P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm">&nbsp;&nbsp;&nbsp;&nbsp;|--<B>*_comp</B>&nbsp;&nbsp;&nbsp; : Directory contains an
+ component. </P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|--
+ <B>ports</B>&nbsp;&nbsp; : Directory contains common IDL
+ code for the component. </P>
+ <LI><P>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|--&nbsp;<B>src</B>&nbsp; &nbsp;&nbsp; &nbsp; : Directory contains the IDL
+ and *_exec-files for the component. </P></LI></UL>
<H2 CLASS="western">File naming convention</H2>
-<P>The following convention is used:
-</P>
+<P>The following convention is used: </P>
<UL>
- <LI><P STYLE="margin-bottom: 0cm"><B>*_defn.idl</B> - These files
- will contain definitions, like enumerations, constants and so on.
- Typically located in *_asm/ports.
- </P>
- <LI><P STYLE="margin-bottom: 0cm"><B>*_obj.idl</B> - These files
- will contain the interfaces between components. Typically located in
- *_asm/ports.
- </P>
- <LI><P><B>*_comp.idl</B> - These files will contain the component
- declaration. Typically located in *_asm/*_comp/src.
- </P>
-</UL>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm"><B>*_defn.idl</B> - These files will contain definitions,
+ like enumerations, constants and so on. Typically located in *_asm/ports. </P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm"><B>*_obj.idl</B> - These files will contain the interfaces
+ between components. Typically located in *_asm/ports. </P>
+ <LI><P><B>*_comp.idl</B> - These files
+ will contain the component declaration. Typically located in *_asm/*_comp/src.
+ </P></LI></UL>
<H2 CLASS="western">Additional conventions</H2>
<UL>
- <LI><P STYLE="margin-bottom: 0cm">MPC files are located in the same
- directory as the IDL for the common mpc files and in the same
- directory as the executor files for the component mpc files.
- </P>
- <LI><P>Files that were generated by the TAO IDL compiler should all
- be located in one subdirectory. In this tutorial the name of this
- subdirectory is &quot;GeneratedCode&quot;.
- </P>
- <TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=2>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm">MPC files are located in
+ the same directory as the IDL for the common mpc files and in the same
+ directory as the executor files for the component mpc files. </P>
+ <LI><P>Files that were generated by the TAO IDL compiler
+ should all be located in one subdirectory. In this tutorial the name of this
+ subdirectory is "GeneratedCode". </P>
+ <TABLE WIDTH="100%" BORDER=0 CELLPADDING=2 CELLSPACING=2>
<TR>
<TD></TD>
<TD>
- <P ALIGN=CENTER><IMG SRC="images/images.png" NAME="graphics3" ALIGN=BOTTOM WIDTH=4% HEIGHT=5% BORDER=0></P>
- </TD>
+ <P ALIGN=center><IMG border=0 name=graphics3 align=bottom src="images/images.png" width="4%" height="5%" ></P></TD>
<TD>
- <P ALIGN=LEFT><A HREF="02_idl.html">Next</A></P>
- </TD>
- </TR>
- </TABLE>
-</UL>
-<P><BR><BR>
-</P>
+ <P ALIGN=left><A href="02_idl.html">Next</A></P></TD></TR></TABLE></LI></UL>
+<P><BR><BR></P>
</BODY>
</HTML>
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html
index adcf4f116f0..ebba8f542a5 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html
@@ -48,15 +48,22 @@ InternalError { </FONT></FONT><FONT COLOR="#0000ff"><FONT SIZE=2>long</FONT></FO
<LI><P STYLE="MARGIN-BOTTOM: 0cm"><CODE CLASS="western"><FONT COLOR="#0000ff"><FONT FACE="Times New Roman, serif"><FONT SIZE=2>#pragma</FONT></FONT></FONT></CODE><CODE CLASS="western"><FONT COLOR="#000000">
</FONT></CODE><CODE CLASS="western"><FONT COLOR="#000000"><FONT FACE="Times New Roman, serif"><FONT SIZE=2>ciao lem
- </FONT></FONT></FONT></CODE><CODE CLASS="western"><FONT COLOR="#a31515"><FONT FACE="Times New Roman, serif"><FONT SIZE=2>"Hello_MyFoo_objE.idl",
+ "Hello_MyFoo_objE.idl",
</FONT></FONT></FONT></CODE></P>
<LI><P STYLE="MARGIN-BOTTOM: 0cm"><CODE CLASS="western"><FONT COLOR="#0000ff"><FONT FACE="Times New Roman, serif"><FONT SIZE=2>#pragma</FONT></FONT></FONT></CODE><CODE CLASS="western"><FONT COLOR="#000000">
</FONT></CODE><CODE CLASS="western"><FONT COLOR="#000000"><FONT FACE="Times New Roman, serif"><FONT SIZE=2>ciao lem
- </FONT></FONT></FONT></CODE><CODE CLASS="western"><FONT COLOR="#a31515"><FONT FACE="Times New Roman, serif"><FONT SIZE=2>"Hello_MyFoo_objAE.idl"</FONT></FONT></FONT></CODE></P>
- <LI><P STYLE="MARGIN-BOTTOM: 0cm"><FONT COLOR="#0000ff"><FONT SIZE=2>#pragma</FONT></FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#000000"><FONT SIZE=2>ciao ami4ccm </FONT></FONT><FONT COLOR="#0000ff"><FONT SIZE=2>interface</FONT></FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#a31515"><FONT SIZE=2>"Hello::MyFoo_obj" /</FONT></FONT><FONT COLOR="#33cc66"><FONT SIZE=2>//</FONT></FONT><FONT COLOR="#008000"><FONT SIZE=2>this is needed per
- interface</FONT></FONT></P>
- <LI><P STYLE="MARGIN-BOTTOM: 0cm"><FONT COLOR="#0000ff"><FONT SIZE=2>#pragma</FONT></FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#000000"><FONT SIZE=2>ciao ami4ccm idl </FONT></FONT><FONT COLOR="#a31515"><FONT SIZE=2>"Hello_MyFoo_objA.idl" </FONT></FONT><FONT COLOR="#008000"><FONT SIZE=2>//needed for 'uses multiple', not used in this example
- </FONT></FONT></P></LI></UL></LI></UL>
+ "Hello_MyFoo_objAE.idl"</FONT></FONT></FONT></CODE></P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm">
+ <FONT COLOR="#000000"><FONT SIZE=3>Pragma needed per interface for implying ami.</FONT></FONT><br>
+ <FONT COLOR="#0000ff"><FONT SIZE=2>#pragma</FONT></FONT><FONT COLOR="#000000"> </FONT>
+ <FONT COLOR="#000000"><FONT SIZE=2>ciao ami4ccm </FONT></FONT>
+ <FONT COLOR="#0000ff"><FONT SIZE=2>interface </FONT><FONT COLOR="#000000">"Hello::MyFoo_obj"</FONT></FONT>
+ </P>
+ <LI><P STYLE="MARGIN-BOTTOM: 0cm"><FONT COLOR="#000000"><FONT SIZE=3>Name implied IDL file, used by IDL compiler to generate ami4ccm
+ functionality:</FONT><br><FONT SIZE=2><FONT COLOR="#0000ff">#pragma</FONT></FONT>
+ <FONT COLOR="#000000"><FONT SIZE=2>ciao ami4ccm idl "Hello_MyFoo_objA.idl" </FONT></FONT>
+ </P>
+ </LI></UL></LI></UL>
<P STYLE="MARGIN-BOTTOM: 0cm; MARGIN-LEFT: 1cm"><FONT COLOR="#000000"><FONT SIZE=3>Also this
IDL contains the interface between Sender and Receiver</FONT></FONT></P>
<P STYLE="MARGIN-BOTTOM: 0cm; MARGIN-LEFT: 2cm"><FONT SIZE=2><FONT COLOR="#0000ff">interface</FONT><FONT COLOR="#000000">
@@ -81,14 +88,17 @@ ro_attrib<BR></FONT></FONT><FONT SIZE=2><FONT color=#0000ff>&nbsp;&nbsp;&nbsp;&n
<P>The <A href="../Hello_asm/Sender_comp/src/Hello_Sender_comp.idl">Hello_Sender_comp.idl</A>
file in the Sender_comp/src directory defines the asynchronous and
synchronous connections. <FONT COLOR="#000000"><FONT SIZE=3>For synchronous invocations, the Sender component uses the
-MyFoo_obj interface (which the Receiver provides). </FONT></FONT><FONT COLOR="#a31515"><FONT SIZE=2>component
-Sender</FONT></FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#000000"><FONT SIZE=2>{
-</FONT></FONT><FONT COLOR="#008000"><FONT SIZE=2>/// For synchronous invocation</FONT></FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#000000"><FONT SIZE=2>uses MyFoo run_my_foo; };
+MyFoo_obj interface (which the Receiver provides):<BR><br></FONT></FONT>
+<FONT COLOR="#000000"><FONT SIZE=2>component
+Sender<br>{<BR>&nbsp;</FONT></FONT><FONT COLOR="#008000"><FONT SIZE=2>// For synchronous
+invocation</FONT></FONT>&nbsp;<BR>
+<FONT COLOR="#000000"><FONT SIZE=2>&nbsp;&nbsp;uses MyFoo run_my_foo;<BR>};
</FONT></FONT></P>
<P><FONT COLOR="#000000"><FONT SIZE=3>For asynchronous invocations, the Sender component uses the
AMI_MyFoo_obj interface of the AMI component and provides the
-AMI_MyFoo_objReplyHandler interface to the AMI component. This is indicated with
-</FONT></FONT><FONT COLOR="#0000ff"><FONT SIZE=2>#pragma</FONT></FONT><FONT COLOR="#000000"> </FONT><FONT COLOR="#000000"><FONT SIZE=2>ciao ami4ccm receptacle </FONT></FONT><FONT COLOR="#a31515"><FONT SIZE=2>"Hello::Sender_comp::run_my_foo" </FONT></FONT><FONT COLOR="#000000"><FONT SIZE=2>.</FONT></FONT></P>
+AMI_MyFoo_objReplyHandler interface to the AMI component. This is indicated with the following pragma:<br><br>
+</FONT></FONT><FONT COLOR="#000000"><FONT SIZE=2>#pragma ciao ami4ccm receptacle "Hello::Sender_comp::run_my_foo"
+.</FONT></FONT></P>
<H2 CLASS="western"><FONT SIZE=4 STYLE="FONT-SIZE: 16pt">Receiver component IDL file</FONT></H2>
<P>The <A href="../Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl">Hello_Receiver_comp.idl</A>
file in the Receiver_comp/src directory indicates the port the
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html
index cda636b892f..6cd9b4ecaf6 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html
@@ -38,17 +38,13 @@ following command: </P>
<P><CODE CLASS="western"><FONT SIZE=3>tao_idl
-I../../ports -I../../GeneratedCode -I%TAO_ROOT% -I%TAO_ROOT%/tao -I%CIAO_ROOT%
-I%CIAO_ROOT%/ccm -I%CIAO_ROOT%/ciao -Gex Hello_Senmder_comp.idl</CODE></P>
-<FONT face="Times New Roman>An example of the </FONT></CODE>generated code can be found <A href="
-Hello_Sender_comp_exec.cpp? GeneratedExec Code></A><FONT
-face="Times New Roman"><FONT face="Times New Roman">An
-example of the implemented executor can be found </FONT><A
-href="Code/ImplementedExec/Hello_Sender_comp_exec.cpp"><FONT
-face="Times New Roman">here</FONT></A><FONT face="Times New Roman">
-.<BR></FONT><FONT face="Times New Roman">Be aware that running this command,
+<FONT face="Times New Roman>An example of the generated code can be found <A href="
+Hello_Sender_comp_exec.cpp? GeneratedExec Code></A>An
+example of the implemented executor can be found <A
+href="Code/ImplementedExec/Hello_Sender_comp_exec.cpp">here</A>.<BR>Be aware that running this command,
will overwrite the already implemented exec code in the Hello_asm/Sender_comp
-directory. A copy of the implemented executor can be found </FONT><A
-href="Code/ImplementedExec/Hello_Sender_comp_exec.cpp"><FONT
-face="Times New Roman">here</FONT></A><FONT face="Times New Roman"> .</FONT></P>
+directory. A copy of the implemented executor can be found <A
+href="Code/ImplementedExec/Hello_Sender_comp_exec.cpp">here</A>.</FONT></P>
<H2 class=western>Receiver</H2>
<P>Navigate to the Hello_asm/Receiver_comp/src and invoke the TAO IDL compiler
by running the following command: </P>
@@ -57,15 +53,14 @@ by running the following command: </P>
Hello_Receiver_comp.idl.<BR></CODE></p>
<FONT face="Times New Roman">An example of the generated code can be found </FONT><A
href="Code/GeneratedExec/Hello_Receiver_comp_exec.cpp"><FONT
-face="Times New Roman">here</FONT></A><FONT face="Times New Roman">. <CODE
-class=western>An example of the </CODE>implemented executor can be found
+face="Times New Roman">here</FONT></A><FONT face="Times New Roman">.
+An example of the implemented executor can be found
</FONT><A href="Code/ImplementedExec/Hello_Receiver_comp_exec.cpp"><FONT
face="Times New Roman">here</FONT></A><FONT face="Times New Roman">
-.<BR></FONT><FONT face="Times New Roman">Be aware that running this command,
+.<BR>Be aware that running this command,
will overwrite the already implemented exec code in the Hello_asm/Receiver_comp
-directory. A copy of the implemented executor can be found </FONT><A
-href="Code/ImplementedExec/Hello_Receiver_comp_exec.cpp"><FONT
-face="Times New Roman">here</FONT></A><FONT face="Times New Roman"> .</FONT></P>
+directory. A copy of the implemented executor can be found <A
+href="Code/ImplementedExec/Hello_Receiver_comp_exec.cpp">here</A>.</FONT></P>
<P><BR><BR></P><TABLE BORDER=0 CELLPADDING =2 CELLSPACING =2 width ="100%" >
<TR>
<TD>
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html
index 5afc3d6cb2e..83277fa4726 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html
@@ -8,7 +8,6 @@
<META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
<META NAME="CHANGED" CONTENT="20100625;14523700">
<META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
- <META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
<!--//$Id$ -->
<STYLE TYPE="text/css">
<!--