Tue Jun 22 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
        * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
        * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp
        * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp
        * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html
        Cleanup code.

7 files changed, 21 insertions, 14 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 18f24486044..9379d16cdda 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jun 22 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
+        * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
+        * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp
+        * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp
+        * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html
+        Cleanup code.
+
 Mon Jun 28 23:55:35 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/DAnCE/DAnCE_Properties.idl:
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp
index a04ce2b0e61..98ca0752e67 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp
@@ -95,7 +95,7 @@ namespace CIAO_DelReplyH_Sender_Impl
     try 
       {
         CORBA::String_var answer;
-        my_foo_ami_->foo("synchroon call", answer.out ());
+        my_foo_ami_->foo("synchronous call", answer.out ());
         ACE_DEBUG ((LM_DEBUG, "OK: SYNCH foo returns <%C>.\n",
                               answer.in ()));
       }
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp
index c90e01c00c1..54fdf88125b 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp
@@ -27,7 +27,7 @@ namespace CIAO_InterMulti_Sender_Impl
     ::CORBA::Long /*ami_return_val*/,
     const char * answer)
   {
-    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchroon callback from ONE::foo,"
+    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from ONE::foo,"
                           " answer = <%C>\n",
                           answer));
     ++nr_of_received;
@@ -56,7 +56,7 @@ namespace CIAO_InterMulti_Sender_Impl
   void
   Two_callback_exec_i::bar (const char * answer)
   {
-    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchroon callback from TWO::bar,"
+    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from TWO::bar,"
                           " answer = <%C>\n",
                           answer));
     ++nr_of_received;
@@ -86,7 +86,7 @@ namespace CIAO_InterMulti_Sender_Impl
   void
   Three_callback_exec_i::plus (const char * answer)
   {
-    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchroon callback from THREE::plus,"
+    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from THREE::plus,"
                           " answer = <%C>\n",
                           answer));  
      ++nr_of_received;
@@ -104,7 +104,7 @@ namespace CIAO_InterMulti_Sender_Impl
     ::CORBA::Long /*ami_return_val*/,
     const char * answer)
   {
-    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchroon callback from THREE::foo,"
+    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from THREE::foo,"
                           " answer = <%C>\n",
                           answer));  
     ++nr_of_received;
@@ -120,7 +120,7 @@ namespace CIAO_InterMulti_Sender_Impl
   void
   Three_callback_exec_i::bar (const char * answer)
   {
-    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchroon callback from THREE::bar,"
+    ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from THREE::bar,"
                           " answer = <%C>\n",
                           answer));  
     ++nr_of_received;
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
index 3098322f3af..9e028367497 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
@@ -307,7 +307,7 @@ namespace CIAO_InterReturnT_Sender_Impl
         ++arr;
         if ((l_cmd != 5) || (arr->x_array[2] != 102))
           {
-            ACE_ERROR ((LM_ERROR, "ERROR MyFoo synchroon ret_array: "
+            ACE_ERROR ((LM_ERROR, "ERROR MyFoo synchronous ret_array: "
                               "received the wrong long or array, expected 5 "
                               "and 102, received %u and %u\n",
                               l_cmd, arr->x_array[2]));
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp
index c98167f1f68..3d256278467 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp
@@ -30,7 +30,7 @@ namespace CIAO_UsesSM_Sender_Impl
     ::CORBA::Long /*ami_return_val*/,
     const char * answer)
   {
-    ACE_DEBUG ((LM_DEBUG, "Sender: Get asynchroon callback from foo,"
+    ACE_DEBUG ((LM_DEBUG, "Sender: Get asynchronous callback from foo,"
                            " answer = <%C>\n",
                            answer));
      ++nr_of_received;
@@ -59,7 +59,7 @@ namespace CIAO_UsesSM_Sender_Impl
   void
   Two_callback_exec_i::bar (const char * answer)
   {
-     ACE_DEBUG ((LM_DEBUG, "Sender: Get asynchroon callback from bar,"
+     ACE_DEBUG ((LM_DEBUG, "Sender: Get asynchronous callback from bar,"
                            " answer = <%C>\n",
                            answer));
      ++nr_of_received;
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp
index 9e190153691..b155928416f 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp
@@ -31,7 +31,7 @@ namespace CIAO_UsesMulti_Sender_Impl
     ::CORBA::Long /*ami_return_val*/,
     const char * answer)
   {
-    ACE_DEBUG ((LM_DEBUG, "Sender: Get asynchroon callback from foo,"
+    ACE_DEBUG ((LM_DEBUG, "Sender: Get asynchronous callback from foo,"
                            " answer = <%C>\n",
                            answer));
      ++nr_of_received;
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html
index d73d34ffbcd..adcf4f116f0 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html
@@ -8,9 +8,6 @@
 	<META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
 	<META NAME="CHANGED" CONTENT="20100628;14101200">
 	<META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
-	<META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
-	<META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
-	<META NAME="CHANGEDBY" CONTENT="Marijke Hengstmengel">
 	<!--//$Id$  -->
 	<STYLE TYPE="text/css">
 	<!--
@@ -114,4 +111,4 @@ synchronously.</FONT></FONT></FONT></CODE></P>
 			<P ALIGN=right><A href="03_executors.html">Next</A></P></TD></TR></TABLE>
 <P><BR><BR></P>
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>