Mon Jan 4 13:29:39 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/ami4ccm/examples/Hello/Connector/AMI.idl
        * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp
        * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h
        * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
        * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
        * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl
        * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
        * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
          Updated name of the AMI connector, it is tied to the sender,
          so call it AMI_Sender

        * tests/IDL_Test/Double_Inherited_Component/run_test.pl:
          Print message before spawn

10 files changed, 37 insertions, 21 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 42da21a9580..61b821e053c 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,19 @@
+Mon Jan  4 13:29:39 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/ami4ccm/examples/Hello/Connector/AMI.idl
+        * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp
+        * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h
+        * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
+        * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
+        * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl
+        * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
+        * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
+          Updated name of the AMI connector, it is tied to the sender,
+          so call it AMI_Sender
+
+        * tests/IDL_Test/Double_Inherited_Component/run_test.pl:
+          Print message before spawn
+
 Mon Jan  4 12:14:39 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/ami4ccm/docs/AMI4CCM-spec.odt:
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI.idl b/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI.idl
index 4c190e99307..0167d0b99e8 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI.idl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI.idl
@@ -13,13 +13,13 @@
 
 module Hello
 {
-  connector AMI_Receiver
+  connector AMI_Sender
   {
     /// Provides the interface for Sender
-    provides Hello::AMI_MyFoo sendc_run_my_foo;
+    provides AMI_MyFoo sendc_run_my_foo;
 
     /// Uses the interface of the Receiver ('server')
-    uses Hello::MyFoo run_my_foo;
+    uses MyFoo run_my_foo;
   };
 };
 
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp b/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp
index c202f6cce5f..133b5039d3c 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp
@@ -5,7 +5,7 @@
 #include "ciao/Logger/Log_Macros.h"
 #include "AMI_MyFoo_i.h"
 
-namespace CIAO_Hello_AMI_Receiver_Impl
+namespace CIAO_Hello_AMI_Sender_Impl
 {
   AMI_MyFoo_exec_i::AMI_MyFoo_exec_i ()
   {
@@ -153,7 +153,7 @@ namespace CIAO_Hello_AMI_Receiver_Impl
     ::Components::SessionContext_ptr ctx)
   {
     this->context_ =
-      ::Hello::CCM_AMI_Receiver_Context::_narrow (ctx);
+      ::Hello::CCM_AMI_Sender_Context::_narrow (ctx);
 
     if ( ::CORBA::is_nil (this->context_.in ()))
       {
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h b/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h
index 691fcac544c..35d27482d48 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h
@@ -13,7 +13,7 @@
 
 #include "tao/LocalObject.h"
 
-namespace CIAO_Hello_AMI_Receiver_Impl
+namespace CIAO_Hello_AMI_Sender_Impl
 {
   class  AMI_MyFoo_exec_i
     : public virtual ::Hello::CCM_AMI_MyFoo,
@@ -53,7 +53,7 @@ namespace CIAO_Hello_AMI_Receiver_Impl
   };
 
   class  AMI_exec_i
-    : public virtual AMI_Receiver_Exec,
+    : public virtual AMI_Sender_Exec,
       public virtual ::CORBA::LocalObject
   {
   public:
@@ -74,7 +74,7 @@ namespace CIAO_Hello_AMI_Receiver_Impl
     virtual void ccm_remove (void);
 
   private:
-    ::Hello::CCM_AMI_Receiver_Context_var context_;
+    ::Hello::CCM_AMI_Sender_Context_var context_;
     ::Hello::AMI_MyFooCallback_var callback_foo_;
     ::Hello::MyFoo_var receiver_foo_;
 
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl
index 75160a2c922..27474b40151 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl
@@ -13,7 +13,7 @@ module Hello
   component Receiver
   {
     /// Provides
-    provides Hello::MyFoo do_my_foo;
+    provides MyFoo do_my_foo;
   };
 };
 #endif
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
index 1c254d15cc6..0ae341c48df 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
@@ -14,10 +14,10 @@ module Hello
   component Sender
   {
     /// For asynch invocation. @@implied
-    uses Hello::AMI_MyFoo sendc_run_my_foo;
+    uses AMI_MyFoo sendc_run_my_foo;
 
     /// For synchronous invocation
-    uses Hello::MyFoo run_my_foo;
+    uses MyFoo run_my_foo;
   };
 };
 
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
index 7e4301b6775..d1fdbef956a 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
@@ -139,7 +139,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_AMI_Receiver_Servant</string>
+          <string>create_Hello_AMI_Sender_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
index a4ddacdea36..58e4eb77196 100755
--- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
@@ -17,10 +17,10 @@ $em_running = 0;
 $ns_running = 0;
 
 $nr_daemon = 3;
-@ports = ( 60000, 60001, 60002 );
-@iorbases = ( "AMI.ior", "Sender.ior", "Receiver.ior" );
+@ports = ( 60000, 60001 );
+@iorbases = ( "Sender.ior", "Receiver.ior", "AMI.ior" );
 @iorfiles = 0;
-@nodenames = ( "AMI", "Sender", "Receiver" );
+@nodenames = ( "Sender", "Receiver" );
 
 # ior files other than daemon
 $ior_nsbase = "ns.ior";
@@ -138,6 +138,8 @@ init_ior_files ();
 
 $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
+print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+
 $ns_status = $NS->Spawn ();
 
 if ($ns_status != 0) {
@@ -146,8 +148,6 @@ if ($ns_status != 0) {
     exit 1;
 }
 
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
 if ($tg_naming->WaitForFileTimed ($ior_nsbase,
                                   $tg_naming->ProcessStartWaitInterval ()) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
index 181df61274c..cb3fe92b80c 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
@@ -139,6 +139,8 @@ init_ior_files ();
 
 $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
+print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+
 $ns_status = $NS->Spawn ();
 
 if ($ns_status != 0) {
@@ -147,8 +149,6 @@ if ($ns_status != 0) {
     exit 1;
 }
 
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
 if ($tg_naming->WaitForFileTimed ($ior_nsbase,
                                   $tg_naming->ProcessStartWaitInterval ()) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl b/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl
index b6dd7a841a4..0ddfb372d43 100755
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl
@@ -143,6 +143,8 @@ init_ior_files ();
 
 $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
+print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+
 $ns_status = $NS->Spawn ();
 
 if ($status != 0) {
@@ -151,8 +153,6 @@ if ($status != 0) {
     exit 1;
 }
 
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
 if ($tg_naming->WaitForFileTimed ($ior_nsbase,
                                   $tg_naming->ProcessStartWaitInterval ()) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";