Thu Aug 20 09:56:11 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors:
        * connectors/AMI_CCM:
        * connectors/AMI_CCM/AMI:
        * connectors/AMI_CCM/AMI/AMI.idl:
        * connectors/AMI_CCM/AMI/AMI.mpc:
        * connectors/AMI_CCM/AMI/AMI_exec.h:
        * connectors/AMI_CCM/AMI/AMI_exec.cpp:
        * connectors/AMI_CCM/Hello_Base:
        * connectors/AMI_CCM/Hello_Base/Hello_Base.idl:
        * connectors/AMI_CCM/Hello_Base/Hello_Base.mpc:
        * connectors/AMI_CCM/Receiver:
        * connectors/AMI_CCM/Receiver/Hello_Receiver.idl:
        * connectors/AMI_CCM/Receiver/Hello_Receiver.mpc:
        * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h:
        * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp:
        * connectors/AMI_CCM/Sender:
        * connectors/AMI_CCM/Sender/Hello_Sender.idl:
        * connectors/AMI_CCM/Sender/Hello_Sender.mpc:
        * connectors/AMI_CCM/Sender/Hello_Sender_exec.h:
        * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp:
        * connectors/AMI_CCM/descriptors:
        * connectors/AMI_CCM/descriptors/Plan.cdp:
        * connectors/AMI_CCM/descriptors/run_test.pl:
          Moved this example from tests to this location. Just to
          be consistent with dds4ccm.

        * tests/AMI_CCM:
        * tests/AMI_CCM/AMI:
        * tests/AMI_CCM/AMI/AMI.idl:
        * tests/AMI_CCM/AMI/AMI.mpc:
        * tests/AMI_CCM/AMI/AMI_exec.h:
        * tests/AMI_CCM/AMI/AMI_exec.cpp:
        * tests/AMI_CCM/Hello_Base:
        * tests/AMI_CCM/Hello_Base/Hello_Base.idl:
        * tests/AMI_CCM/Hello_Base/Hello_Base.mpc:
        * tests/AMI_CCM/Receiver:
        * tests/AMI_CCM/Receiver/Hello_Receiver.idl:
        * tests/AMI_CCM/Receiver/Hello_Receiver.mpc:
        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h:
        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp:
        * tests/AMI_CCM/Sender:
        * tests/AMI_CCM/Sender/Hello_Sender.idl:
        * tests/AMI_CCM/Sender/Hello_Sender.mpc:
        * tests/AMI_CCM/Sender/Hello_Sender_exec.h:
        * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp:
        * tests/AMI_CCM/descriptors:
        * tests/AMI_CCM/descriptors/Plan.cdp:
        * tests/AMI_CCM/descriptors/run_test.pl:
          Removed these files.

17 files changed, 56 insertions, 6 deletions

diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index 2ce5eee8a46..ceb49149b0a 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,55 @@
+Thu Aug 20 09:56:11 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors:
+        * connectors/AMI_CCM:
+        * connectors/AMI_CCM/AMI:
+        * connectors/AMI_CCM/AMI/AMI.idl:
+        * connectors/AMI_CCM/AMI/AMI.mpc:
+        * connectors/AMI_CCM/AMI/AMI_exec.h:
+        * connectors/AMI_CCM/AMI/AMI_exec.cpp:
+        * connectors/AMI_CCM/Hello_Base:
+        * connectors/AMI_CCM/Hello_Base/Hello_Base.idl:
+        * connectors/AMI_CCM/Hello_Base/Hello_Base.mpc:
+        * connectors/AMI_CCM/Receiver:
+        * connectors/AMI_CCM/Receiver/Hello_Receiver.idl:
+        * connectors/AMI_CCM/Receiver/Hello_Receiver.mpc:
+        * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h:
+        * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp:
+        * connectors/AMI_CCM/Sender:
+        * connectors/AMI_CCM/Sender/Hello_Sender.idl:
+        * connectors/AMI_CCM/Sender/Hello_Sender.mpc:
+        * connectors/AMI_CCM/Sender/Hello_Sender_exec.h:
+        * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp:
+        * connectors/AMI_CCM/descriptors:
+        * connectors/AMI_CCM/descriptors/Plan.cdp:
+        * connectors/AMI_CCM/descriptors/run_test.pl:
+          Moved this example from tests to this location. Just to
+          be consistent with dds4ccm.
+
+        * tests/AMI_CCM:
+        * tests/AMI_CCM/AMI:
+        * tests/AMI_CCM/AMI/AMI.idl:
+        * tests/AMI_CCM/AMI/AMI.mpc:
+        * tests/AMI_CCM/AMI/AMI_exec.h:
+        * tests/AMI_CCM/AMI/AMI_exec.cpp:
+        * tests/AMI_CCM/Hello_Base:
+        * tests/AMI_CCM/Hello_Base/Hello_Base.idl:
+        * tests/AMI_CCM/Hello_Base/Hello_Base.mpc:
+        * tests/AMI_CCM/Receiver:
+        * tests/AMI_CCM/Receiver/Hello_Receiver.idl:
+        * tests/AMI_CCM/Receiver/Hello_Receiver.mpc:
+        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h:
+        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp:
+        * tests/AMI_CCM/Sender:
+        * tests/AMI_CCM/Sender/Hello_Sender.idl:
+        * tests/AMI_CCM/Sender/Hello_Sender.mpc:
+        * tests/AMI_CCM/Sender/Hello_Sender_exec.h:
+        * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp:
+        * tests/AMI_CCM/descriptors:
+        * tests/AMI_CCM/descriptors/Plan.cdp:
+        * tests/AMI_CCM/descriptors/run_test.pl:
+          Removed these files.
+
 Thu Aug 20 09:24:04 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * tests/AMI_CCM/AMI/AMI_exec.cpp:
diff --git a/modules/CIAO/tests/AMI_CCM/AMI/AMI.idl b/modules/CIAO/connectors/AMI_CCM/AMI/AMI.idl
index 0e482404fcb..0e482404fcb 100644
--- a/modules/CIAO/tests/AMI_CCM/AMI/AMI.idl
+++ b/modules/CIAO/connectors/AMI_CCM/AMI/AMI.idl
diff --git a/modules/CIAO/tests/AMI_CCM/AMI/AMI.mpc b/modules/CIAO/connectors/AMI_CCM/AMI/AMI.mpc
index bba183cb3f0..bba183cb3f0 100644
--- a/modules/CIAO/tests/AMI_CCM/AMI/AMI.mpc
+++ b/modules/CIAO/connectors/AMI_CCM/AMI/AMI.mpc
diff --git a/modules/CIAO/tests/AMI_CCM/AMI/AMI_exec.cpp b/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp
index d38eaa8cff7..fe0a0bfae0a 100644
--- a/modules/CIAO/tests/AMI_CCM/AMI/AMI_exec.cpp
+++ b/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp
@@ -53,8 +53,8 @@ namespace CIAO_Hello_AMI_AMI_Impl
   int ami_handler::svc ()
   {
     char* out_str;
-    CORBA::Long   result;
-    printf ("AMI :\tThread started for cookie <%d>\n", ck_);
+    long  result;
+    printf ("AMI :\tThread started for cookie <%ld> sending string <%s>\n", ck_, in_str_);
     result = foo_receiver_->asynch_foo (CORBA::string_dup (in_str_), out_str);
     printf ("AMI :\tCookie <%ld> received : result <%ld> answer <%s>\n",
             ck_, result, out_str);
@@ -87,10 +87,8 @@ namespace CIAO_Hello_AMI_AMI_Impl
   AMI_ami_foo_exec_i::sendc_asynch_foo (
     const char * in_str)
   {
-    printf ("AMI :\tReceived string <%s>\n", in_str);
-    printf ("AMI :\tTry to pass it on to the Receiver component\n");
     ::CCM_AMI::Cookie ck = ++cookie_;
-    printf ("AMI :\tStarting AMI handler to handle asych request <%ld>\n", ck);
+    printf ("AMI :\tReceived string <%s> for <%d>\n", in_str, ck);
     ami_handler* ah = new ami_handler (ck, in_str, foo_receiver_, foo_callback_);
     ah->activate ();
     return ck;
diff --git a/modules/CIAO/tests/AMI_CCM/AMI/AMI_exec.h b/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.h
index 26d98108d0b..26d98108d0b 100644
--- a/modules/CIAO/tests/AMI_CCM/AMI/AMI_exec.h
+++ b/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.h
diff --git a/modules/CIAO/tests/AMI_CCM/Hello_Base/Hello_Base.idl b/modules/CIAO/connectors/AMI_CCM/Hello_Base/Hello_Base.idl
index 97ae69fe21a..97ae69fe21a 100644
--- a/modules/CIAO/tests/AMI_CCM/Hello_Base/Hello_Base.idl
+++ b/modules/CIAO/connectors/AMI_CCM/Hello_Base/Hello_Base.idl
diff --git a/modules/CIAO/tests/AMI_CCM/Hello_Base/Hello_Base.mpc b/modules/CIAO/connectors/AMI_CCM/Hello_Base/Hello_Base.mpc
index adbe02d19e8..adbe02d19e8 100644
--- a/modules/CIAO/tests/AMI_CCM/Hello_Base/Hello_Base.mpc
+++ b/modules/CIAO/connectors/AMI_CCM/Hello_Base/Hello_Base.mpc
diff --git a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver.idl b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver.idl
index 0e727564815..0e727564815 100644
--- a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver.idl
+++ b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver.idl
diff --git a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver.mpc b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver.mpc
index 8b925a2c1a8..8b925a2c1a8 100644
--- a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver.mpc
+++ b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver.mpc
diff --git a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp
index e18bec15085..e18bec15085 100644
--- a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp
+++ b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp
diff --git a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.h b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h
index 837555c9bb3..837555c9bb3 100644
--- a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.h
+++ b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h
diff --git a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender.idl b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender.idl
index 5d82a899440..5d82a899440 100644
--- a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender.idl
+++ b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender.idl
diff --git a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender.mpc b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender.mpc
index e39403920bf..e39403920bf 100644
--- a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender.mpc
+++ b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender.mpc
diff --git a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp
index abf6875a2bb..abf6875a2bb 100644
--- a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp
+++ b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp
diff --git a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.h b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender_exec.h
index c7b4d7325e2..c7b4d7325e2 100644
--- a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.h
+++ b/modules/CIAO/connectors/AMI_CCM/Sender/Hello_Sender_exec.h
diff --git a/modules/CIAO/tests/AMI_CCM/descriptors/Plan.cdp b/modules/CIAO/connectors/AMI_CCM/descriptors/Plan.cdp
index 20016d2180a..20016d2180a 100644
--- a/modules/CIAO/tests/AMI_CCM/descriptors/Plan.cdp
+++ b/modules/CIAO/connectors/AMI_CCM/descriptors/Plan.cdp
diff --git a/modules/CIAO/tests/AMI_CCM/descriptors/run_test.pl b/modules/CIAO/connectors/AMI_CCM/descriptors/run_test.pl
index 4d0c8e9c8d2..0d41ff4892d 100755
--- a/modules/CIAO/tests/AMI_CCM/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/AMI_CCM/descriptors/run_test.pl
@@ -185,7 +185,7 @@ if (PerlACE::waitforfile_timed ("AMI.ior",
 }
 
 print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
+sleep (30);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";