Fri Jul 24 07:34:04 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h:
        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp:
        * tests/AMI_CCM/Sender/Hello_Sender_exec.h:
        * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp:
        * tests/AMI_CCM/descriptors/Plan.cdp:
          Changed naming convention regarding entry points

6 files changed, 28 insertions, 19 deletions

diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index 1028abe3e65..dea5bca2f13 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jul 24 07:34:04 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h:
+        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp:
+        * tests/AMI_CCM/Sender/Hello_Sender_exec.h:
+        * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp:
+        * tests/AMI_CCM/descriptors/Plan.cdp:
+          Changed naming convention regarding entry points
+
 Thu Jul 23 18:53:34 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * tests/AMI_CCM/descriptors/Plan.cdp:
diff --git a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp b/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp
index 805d0196080..8ffdb4e4f5f 100644
--- a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp
+++ b/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp
@@ -129,16 +129,16 @@ namespace CIAO_Hello_AMI_Receiver_Impl
   }
   
   extern "C"  ::Components::EnterpriseComponent_ptr
-  create_Hello_AMI_Receiver_Impl (void)
+  create_Hello_AMI_ReceiverComp_Impl (void)
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
-    
+
     ACE_NEW_RETURN (
       retval,
       Receiver_exec_i,
       ::Components::EnterpriseComponent::_nil ());
-    
+
     return retval;
   }
 }
@@ -184,12 +184,12 @@ namespace CIAO_Hello_AMI_Receiver_Impl
   {
     ::Components::HomeExecutorBase_ptr retval =
       ::Components::HomeExecutorBase::_nil ();
-    
+
     ACE_NEW_RETURN (
       retval,
       ReceiverHome_exec_i,
       ::Components::HomeExecutorBase::_nil ());
-    
+
     return retval;
   }
 }
diff --git a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.h b/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.h
index 8d69109825f..4380cab757d 100644
--- a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.h
+++ b/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.h
@@ -103,7 +103,7 @@ namespace CIAO_Hello_AMI_Receiver_Impl
   };
   
   extern "C"  ::Components::EnterpriseComponent_ptr
-  create_Hello_AMI_Receiver_Impl (void);
+  create_Hello_AMI_ReceiverComp_Impl (void);
 }
 
 namespace CIAO_Hello_AMI_Receiver_Impl
@@ -118,7 +118,7 @@ namespace CIAO_Hello_AMI_Receiver_Impl
     virtual ~ReceiverHome_exec_i (void);
     
     // All operations and attributes.
-    
+
     // Factory operations.
     
     // Finder operations.
diff --git a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp b/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp
index 78b5f610fa5..7db7f4be058 100644
--- a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp
+++ b/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp
@@ -129,7 +129,7 @@ namespace CIAO_Hello_AMI_Sender_Impl
   }
   
   extern "C"  ::Components::EnterpriseComponent_ptr
-  create_Hello_AMI_Sender_Impl (void)
+  create_Hello_AMI_SenderComp_Impl (void)
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
diff --git a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.h b/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.h
index 6bb77aacfc9..04dd847cbff 100644
--- a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.h
+++ b/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.h
@@ -103,7 +103,7 @@ namespace CIAO_Hello_AMI_Sender_Impl
   };
   
   extern "C"  ::Components::EnterpriseComponent_ptr
-  create_Hello_AMI_Sender_Impl (void);
+  create_Hello_AMI_SenderComp_Impl (void);
 }
 
 namespace CIAO_Hello_AMI_Sender_Impl
diff --git a/modules/CIAO/tests/AMI_CCM/descriptors/Plan.cdp b/modules/CIAO/tests/AMI_CCM/descriptors/Plan.cdp
index a70c8853f18..fb2c96887c3 100644
--- a/modules/CIAO/tests/AMI_CCM/descriptors/Plan.cdp
+++ b/modules/CIAO/tests/AMI_CCM/descriptors/Plan.cdp
@@ -15,7 +15,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_AMI_Receiver_Impl</string>
+          <string>create_Hello_AMI_ReceiverComp_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -37,7 +37,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_Receiver_Servant</string>
+          <string>create_Hello_AMI_Receiver_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -66,7 +66,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_AMI_Sender_Impl</string>
+          <string>create_Hello_AMI_SenderComp_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -88,7 +88,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_Sender_Servant</string>
+          <string>create_Hello_AMI_Sender_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -177,7 +177,7 @@
     <name>Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name>
     <source/>
     <node/>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -185,7 +185,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
+          <string>create_Hello_AMI_ReceiverHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -203,7 +203,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_ReceiverHome_Impl</string>
+          <string>create_Hello_AMI_ReceiverHome_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -213,7 +213,7 @@
     <name>Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name>
     <source/>
     <node/>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -221,7 +221,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_SenderHome_Servant</string>
+          <string>create_Hello_AMI_SenderHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -239,7 +239,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_SenderHome_Impl</string>
+          <string>create_Hello_AMI_SenderHome_Impl</string>
         </value>
       </value>
     </execParameter>