From 3cf01d96bfa700057f4c7aed188d20dcae44271f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 12 Jan 2010 11:08:47 +0000 Subject: Tue Jan 12 11:08:30 UTC 2010 Johnny Willemsen * connectors/ami4ccm/ami4ccm/ami4ccm.cpp: * connectors/ami4ccm/ami4ccm/ami4ccm.h: * connectors/ami4ccm/ami4ccm/ami4ccm.idl: * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: New AMI4CCM stub library which is going to be used by all connectors and components that want to use ami4ccm * MPC/config/ami4ccm_stub.mpb: New base project * tests/Bug_3769_Regression/Foo.mpc * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc * tests/IDL_Test/Inherited_Component/IhC_Foo.mpc * tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc * tests/IDL_Test/PIDL_Include/PIDLInclude.mpc * tests/Minimum/Receiver/Receiver.mpc Layout changes --- CIAO/ChangeLog | 22 ++++++++++++ CIAO/MPC/config/ami4ccm_stub.mpb | 8 +++++ CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp | 28 +++++++++++++++ CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h | 41 ++++++++++++++++++++++ CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl | 15 ++++++++ CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc | 34 ++++++++++++++++++ CIAO/tests/Bug_3769_Regression/Foo.mpc | 32 ++++++++--------- .../Local_Facet/Local_Facet.mpc | 6 ++-- .../Inherited_components.mpc | 2 +- .../tests/IDL_Test/Inherited_Component/IhC_Bar.mpc | 4 +-- .../tests/IDL_Test/Inherited_Component/IhC_Foo.mpc | 32 ++++++++--------- .../IDL_Test/Lem_Specific_Export/Lem_Export.mpc | 26 +++++++------- CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc | 4 +-- CIAO/tests/Minimum/Receiver/Receiver.mpc | 12 +++---- 14 files changed, 207 insertions(+), 59 deletions(-) create mode 100644 CIAO/MPC/config/ami4ccm_stub.mpb create mode 100644 CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp create mode 100644 CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h create mode 100644 CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl create mode 100644 CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index e33e3c527e6..8a43c59a8f8 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,25 @@ +Tue Jan 12 11:08:30 UTC 2010 Johnny Willemsen + + * connectors/ami4ccm/ami4ccm/ami4ccm.cpp: + * connectors/ami4ccm/ami4ccm/ami4ccm.h: + * connectors/ami4ccm/ami4ccm/ami4ccm.idl: + * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: + New AMI4CCM stub library which is going to be used by + all connectors and components that want to use ami4ccm + + * MPC/config/ami4ccm_stub.mpb: + New base project + + * tests/Bug_3769_Regression/Foo.mpc + * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc + * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc + * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc + * tests/IDL_Test/Inherited_Component/IhC_Foo.mpc + * tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc + * tests/IDL_Test/PIDL_Include/PIDLInclude.mpc + * tests/Minimum/Receiver/Receiver.mpc + Layout changes + Tue Jan 12 10:07:17 UTC 2010 Marcel Smit * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: diff --git a/CIAO/MPC/config/ami4ccm_stub.mpb b/CIAO/MPC/config/ami4ccm_stub.mpb new file mode 100644 index 00000000000..a4be7dbd50f --- /dev/null +++ b/CIAO/MPC/config/ami4ccm_stub.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_connector_base, messaging { + after += AMI4CCM_stub + libs += AMI4CCM_stub + includes += $(CIAO_ROOT)/connectors/ami4ccm +} diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp new file mode 100644 index 00000000000..e3b4bb4b7a7 --- /dev/null +++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp @@ -0,0 +1,28 @@ +// -*- C++ -*- +// $Id$ + +#include "ami4ccm/ami4ccm.h" + +#include "tao/debug.h" + +ACE_RCSID (ami4ccm, + ami4ccm, + "$Id$") + +CCM_AMI::ExceptionHolder_i::ExceptionHolder_i (::Messaging::ExceptionHolder* holder) + : holder_ (holder) +{ +} + +void +CCM_AMI::ExceptionHolder_i::raise_exception (void) +{ + if (holder_) + { + holder_->raise_exception (); + } + else + { + throw ::CORBA::UNKNOWN (TAO::VMCID, CORBA::COMPLETED_YES); + } +} diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h new file mode 100644 index 00000000000..358ebc2baec --- /dev/null +++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h @@ -0,0 +1,41 @@ +// -*- C++ -*- + +// ================================================================ +/** + * @file ami4ccm.h + * + * $Id$ + * + * Include all the required headers to use CCM AMI easily. + * + * @author Johnny Willemsen + */ +// ================================================================ + +#ifndef CIAO_AMI4CCM_H +#define CIAO_AMI4CCM_H + +#include /**/ "ace/pre.h" + +#include "ami4ccm/ami4ccmC.h" +#include "tao/LocalObject.h" +#include "tao/Messaging/Messaging.h" + +namespace CCM_AMI +{ + class ExceptionHolder_i + : public virtual ::CCM_AMI::CCM_ExceptionHolder, + public virtual ::CORBA::LocalObject + { + public: + ExceptionHolder_i (::Messaging::ExceptionHolder* holder); + + virtual void raise_exception (void); + + private: + ::Messaging::ExceptionHolder* holder_; + }; +} + +#include /**/ "ace/post.h" +#endif /* CIAO_AMI4CCM_H */ diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl new file mode 100644 index 00000000000..f061bfebebb --- /dev/null +++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl @@ -0,0 +1,15 @@ +// $Id + +module CCM_AMI +{ + native UserExceptionBase; + + local interface CCM_ExceptionHolder + { + void raise_exception() raises (UserExceptionBase); + }; + + /// Base interface for the Callback model + interface ReplyHandler { }; +}; + diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc new file mode 100644 index 00000000000..6740b06ace6 --- /dev/null +++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc @@ -0,0 +1,34 @@ +// $Id$ + +project(AMI4CCM_idl_gen) : taoidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=AMI4CCM_STUB_Export \ + -Wb,stub_export_include=ami4ccm_stub_export.h -Gxhst -SS + + IDL_Files { + ami4ccm.idl + } +} + +project(AMI4CCM_stub) : ciao_lib, messaging { + after += AMI4CCM_idl_gen + sharedname = AMI4CCM_stub + dynamicflags = AMI4CCM_STUB_BUILD_DLL + includes += $(CIAO_ROOT)/connectors/ami4ccm + + Source_Files { + ami4ccmC.cpp + ami4ccm.cpp + } + + Header_Files { + ami4ccm.h + ami4ccmC.h + ami4ccm_stub_export.h +} + + Inline_Files { + ami4ccmC.inl + } +} + diff --git a/CIAO/tests/Bug_3769_Regression/Foo.mpc b/CIAO/tests/Bug_3769_Regression/Foo.mpc index b26a046d7fd..13b6385de4b 100644 --- a/CIAO/tests/Bug_3769_Regression/Foo.mpc +++ b/CIAO/tests/Bug_3769_Regression/Foo.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Foo" -project(Foo_idl_gen) : componentidldefaults { +project(Foo_idl_gen) : componentidldefaults { custom_only = 1 idlflags += -Wb,stub_export_macro=FOO_STUB_Export \ -Wb,stub_export_include=Foo_stub_export.h \ @@ -15,7 +15,7 @@ project(Foo_idl_gen) : componentidldefaults { } } -project(Foo_lem_gen) : ciaoidldefaults { +project(Foo_lem_gen) : ciaoidldefaults { after += Foo_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=FOO_LEM_STUB_Export \ @@ -28,10 +28,10 @@ project(Foo_lem_gen) : ciaoidldefaults { } project(Foo_lem_stub) : ccm_svnt { - after += Foo_lem_gen Foo_stub + after += Foo_lem_gen Foo_stub libs += Foo_stub - - + + sharedname = Foo_lem_stub dynamicflags = FOO_LEM_STUB_BUILD_DLL @@ -53,10 +53,10 @@ project(Foo_lem_stub) : ccm_svnt { } project(Foo_stub) : ccm_stub { - after += Foo_idl_gen - libs += - - + after += Foo_idl_gen + libs += + + sharedname = Foo_stub dynamicflags = FOO_STUB_BUILD_DLL @@ -80,9 +80,9 @@ project(Foo_stub) : ccm_stub { project(Foo_exec) : ciao_executor { after += Foo_lem_stub Foo_stub sharedname = Foo_exec - libs += Foo_stub Foo_lem_stub - - + libs += Foo_stub Foo_lem_stub + + dynamicflags = FOO_EXEC_BUILD_DLL IDL_Files { @@ -105,11 +105,11 @@ project(Foo_exec) : ciao_executor { project(Foo_svnt) : ciao_servant { after += Foo_lem_stub sharedname = Foo_svnt - libs += Foo_stub Foo_lem_stub - - + libs += Foo_stub Foo_lem_stub + + dynamicflags = FOO_SVNT_BUILD_DLL - + IDL_Files { } diff --git a/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc index 022c15a5cad..f5d15f9dc85 100644 --- a/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc +++ b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Local_Facet" -project(Local_Facet_idl_gen) : componentidldefaults { +project(Local_Facet_idl_gen) : componentidldefaults { custom_only = 1 idlflags += -Wb,stub_export_macro=LOCAL_FACET_STUB_Export \ @@ -16,7 +16,7 @@ project(Local_Facet_idl_gen) : componentidldefaults { } } -project(Local_Facet_lem_gen) : ciaoidldefaults { +project(Local_Facet_lem_gen) : ciaoidldefaults { after += Local_Facet_idl_gen custom_only = 1 @@ -143,4 +143,4 @@ project (Lf_CIAOComponentServer_Tst) : ciao_componentserver_stub, ccm_configvalu Source_Files { client.cpp } -} \ No newline at end of file +} diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc index 177f178c2bc..34803606813 100644 --- a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc +++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc @@ -1,6 +1,6 @@ // $Id$ -project(Inherited_Components_idl_gen) : componentidldefaults { +project(Inherited_Components_idl_gen) : componentidldefaults { after += custom_only = 1 idlflags += -Wb,stub_export_macro=INHERITED_COMPONENTS_STUB_Export \ diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc index 2e73abdfef6..ba1e18944a1 100644 --- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc +++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -p IhC_Foo IhC_Bar" -project(IhC_Foo_IhC_Bar_idl_gen) : componentidldefaults { +project(IhC_Foo_IhC_Bar_idl_gen) : componentidldefaults { requires += dummy_label custom_only = 1 after += IhC_Foo_idl_gen @@ -17,7 +17,7 @@ project(IhC_Foo_IhC_Bar_idl_gen) : componentidldefaults { } } -project(IhC_Foo_IhC_Bar_lem_gen) : ciaoidldefaults { +project(IhC_Foo_IhC_Bar_lem_gen) : ciaoidldefaults { requires += dummy_label after += IhC_Foo_IhC_Bar_idl_gen custom_only = 1 diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc index 133b5352e00..7f1279b24d8 100644 --- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc +++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl IhC_Foo" -project(IhC_Foo_idl_gen) : componentidldefaults { +project(IhC_Foo_idl_gen) : componentidldefaults { custom_only = 1 idlflags += -Wb,stub_export_macro=IHC_FOO_STUB_Export \ -Wb,stub_export_include=IhC_Foo_stub_export.h \ @@ -15,7 +15,7 @@ project(IhC_Foo_idl_gen) : componentidldefaults { } } -project(IhC_Foo_lem_gen) : ciaoidldefaults { +project(IhC_Foo_lem_gen) : ciaoidldefaults { after += IhC_Foo_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=IHC_FOO_LEM_STUB_Export \ @@ -28,10 +28,10 @@ project(IhC_Foo_lem_gen) : ciaoidldefaults { } project(IhC_Foo_lem_stub) : ccm_svnt { - after += IhC_Foo_lem_gen IhC_Foo_stub + after += IhC_Foo_lem_gen IhC_Foo_stub libs += IhC_Foo_stub - - + + sharedname = IhC_Foo_lem_stub dynamicflags = IHC_FOO_LEM_STUB_BUILD_DLL @@ -53,10 +53,10 @@ project(IhC_Foo_lem_stub) : ccm_svnt { } project(IhC_Foo_stub) : ccm_stub { - after += IhC_Foo_idl_gen - libs += - - + after += IhC_Foo_idl_gen + libs += + + sharedname = IhC_Foo_stub dynamicflags = IHC_FOO_STUB_BUILD_DLL @@ -80,9 +80,9 @@ project(IhC_Foo_stub) : ccm_stub { project(IhC_Foo_exec) : ciao_executor { after += IhC_Foo_lem_stub IhC_Foo_stub sharedname = IhC_Foo_exec - libs += IhC_Foo_stub IhC_Foo_lem_stub - - + libs += IhC_Foo_stub IhC_Foo_lem_stub + + dynamicflags = IHC_FOO_EXEC_BUILD_DLL IDL_Files { @@ -105,11 +105,11 @@ project(IhC_Foo_exec) : ciao_executor { project(IhC_Foo_svnt) : ciao_servant { after += IhC_Foo_lem_stub sharedname = IhC_Foo_svnt - libs += IhC_Foo_stub IhC_Foo_lem_stub - - + libs += IhC_Foo_stub IhC_Foo_lem_stub + + dynamicflags = IHC_FOO_SVNT_BUILD_DLL - + IDL_Files { } diff --git a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc index a5eeaa65369..4b51f971870 100644 --- a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc +++ b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Lem_Export" -project(Lem_Export_idl_gen) : componentidldefaults { +project(Lem_Export_idl_gen) : componentidldefaults { custom_only = 1 idlflags += -Wb,stub_export_macro=LEM_EXPORT_STUB_Export \ -Wb,stub_export_include=Lem_Export_stub_export.h \ @@ -15,7 +15,7 @@ project(Lem_Export_idl_gen) : componentidldefaults { } } -project(Lem_Export_lem_gen) : ciaoidldefaults { +project(Lem_Export_lem_gen) : ciaoidldefaults { after += Lem_Export_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=LEM_EXPORT_LEM_STUB_Export \ @@ -28,9 +28,9 @@ project(Lem_Export_lem_gen) : ciaoidldefaults { } project(Lem_Export_stub) : ccm_stub { - after += Lem_Export_idl_gen - libs += - + after += Lem_Export_idl_gen + libs += + sharedname = Lem_Export_stub dynamicflags = LEM_EXPORT_STUB_BUILD_DLL @@ -52,9 +52,9 @@ project(Lem_Export_stub) : ccm_stub { } project(Lem_Export_lem_stub) : ccm_svnt { - after += Lem_Export_lem_gen - libs += - + after += Lem_Export_lem_gen + libs += + sharedname = Lem_Export_lem_stub dynamicflags = LEM_EXPORT_LEM_STUB_BUILD_DLL @@ -78,8 +78,8 @@ project(Lem_Export_lem_stub) : ccm_svnt { project(Lem_Export_exec) : ciao_executor { after += Lem_Export_lem_stub Lem_Export_stub sharedname = Lem_Export_exec - libs += Lem_Export_stub Lem_Export_lem_stub - + libs += Lem_Export_stub Lem_Export_lem_stub + dynamicflags = LEM_EXPORT_EXEC_BUILD_DLL IDL_Files { @@ -102,10 +102,10 @@ project(Lem_Export_exec) : ciao_executor { project(Lem_Export_svnt) : ciao_servant { after += Lem_Export_lem_stub Lem_Export_stub sharedname = Lem_Export_svnt - libs += Lem_Export_stub Lem_Export_lem_stub - + libs += Lem_Export_stub Lem_Export_lem_stub + dynamicflags = LEM_EXPORT_SVNT_BUILD_DLL - + IDL_Files { } diff --git a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc index c790417197e..8ec2f7b3244 100644 --- a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc +++ b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl PIDLInclude" -project(PIDLInclude_idl_gen) : componentidldefaults { +project(PIDLInclude_idl_gen) : componentidldefaults { custom_only = 1 idlflags += -Wb,stub_export_macro=PIDLINCLUDE_STUB_Export \ -Wb,stub_export_include=PIDLInclude_stub_export.h \ @@ -15,7 +15,7 @@ project(PIDLInclude_idl_gen) : componentidldefaults { } } -project(PIDLInclude_lem_gen) : ciaoidldefaults { +project(PIDLInclude_lem_gen) : ciaoidldefaults { after += PIDLInclude_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=PIDLINCLUDE_LEM_STUB_Export \ diff --git a/CIAO/tests/Minimum/Receiver/Receiver.mpc b/CIAO/tests/Minimum/Receiver/Receiver.mpc index 0bd74e3971f..9ddaa8c3e6e 100644 --- a/CIAO/tests/Minimum/Receiver/Receiver.mpc +++ b/CIAO/tests/Minimum/Receiver/Receiver.mpc @@ -15,7 +15,7 @@ project(Minimum_Base_Receiver_idl_gen) : componentidldefaults { } } -project(Minimum_Base_Receiver_lem_gen) : ciaoidldefaults { +project(Minimum_Base_Receiver_lem_gen) : ciaoidldefaults { after += Minimum_Base_Receiver_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ @@ -31,7 +31,7 @@ project(Minimum_Base_Receiver_lem_stub) : ccm_svnt { after += Minimum_Base_Receiver_lem_gen Minimum_Base_Receiver_stub Minimum_Base_stub libs += Minimum_Base_stub Receiver_stub libpaths += ../Minimum_Base - + sharedname = Receiver_lem_stub dynamicflags = RECEIVER_LEM_STUB_BUILD_DLL @@ -56,7 +56,7 @@ project(Minimum_Base_Receiver_stub) : ccm_stub { after += Minimum_Base_Receiver_idl_gen Minimum_Base_stub libs += Minimum_Base_stub libpaths += ../Minimum_Base - + sharedname = Receiver_stub dynamicflags = RECEIVER_STUB_BUILD_DLL @@ -82,7 +82,7 @@ project(Minimum_Base_Receiver_exec) : ciao_executor { sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub Minimum_Base_stub libpaths += ../Minimum_Base - + dynamicflags = RECEIVER_EXEC_BUILD_DLL IDL_Files { @@ -109,9 +109,9 @@ project(Minimum_Base_Receiver_svnt) : ciao_servant { Minimum_Base_skel \ Minimum_Base_stub libpaths += ../Minimum_Base - + dynamicflags = RECEIVER_SVNT_BUILD_DLL - + IDL_Files { } -- cgit v1.2.1