From 02ad1e6102380dc42c06464fb76662f5234eaa14 Mon Sep 17 00:00:00 2001 From: msmit Date: Fri, 24 Jul 2009 07:34:18 +0000 Subject: Fri Jul 24 07:34:04 UTC 2009 Marcel Smit * 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 --- modules/CIAO/ChangeLog | 9 +++++++++ .../tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp | 10 +++++----- .../tests/AMI_CCM/Receiver/Hello_Receiver_exec.h | 4 ++-- .../CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp | 2 +- .../CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.h | 2 +- modules/CIAO/tests/AMI_CCM/descriptors/Plan.cdp | 20 ++++++++++---------- 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 + + * 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 * 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 @@ tk_string - create_Hello_AMI_Receiver_Impl + create_Hello_AMI_ReceiverComp_Impl @@ -37,7 +37,7 @@ tk_string - create_Hello_Receiver_Servant + create_Hello_AMI_Receiver_Servant @@ -66,7 +66,7 @@ tk_string - create_Hello_AMI_Sender_Impl + create_Hello_AMI_SenderComp_Impl @@ -88,7 +88,7 @@ tk_string - create_Hello_Sender_Servant + create_Hello_AMI_Sender_Servant @@ -177,7 +177,7 @@ Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - Receiver_svnt + Hello_Receiver_svnt entryPoint @@ -185,7 +185,7 @@ tk_string - create_Hello_ReceiverHome_Servant + create_Hello_AMI_ReceiverHome_Servant @@ -203,7 +203,7 @@ tk_string - create_Hello_ReceiverHome_Impl + create_Hello_AMI_ReceiverHome_Impl @@ -213,7 +213,7 @@ Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - Sender_svnt + Hello_Sender_svnt entryPoint @@ -221,7 +221,7 @@ tk_string - create_Hello_SenderHome_Servant + create_Hello_AMI_SenderHome_Servant @@ -239,7 +239,7 @@ tk_string - create_Hello_SenderHome_Impl + create_Hello_AMI_SenderHome_Impl -- cgit v1.2.1