diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm')
8 files changed, 66 insertions, 260 deletions
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl index a1d53ba40d0..9006ce330de 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl @@ -3,6 +3,8 @@ #ifndef SINGLE_SERVICE_COMMON_IDL_ #define SINGLE_SERVICE_COMMON_IDL_ +#pragma ciao lem "Common/Single_Service_CommonE.idl" + interface Simple_Service { oneway void ping (); diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc index 3da2e6a035a..f9c67fc69e7 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc @@ -6,13 +6,52 @@ project(Single_Service_Common_idl_gen) : taoidldefaults { -Wb,stub_export_include=Single_Service_Common_stub_export.h \ -Wb,skel_export_macro=SINGLE_SERVICE_COMMON_SKEL_Export \ -Wb,skel_export_include=Single_Service_Common_skel_export.h \ - -Gxhst -Gxhsk + -Gxhst -Gxhsk -Gsv -Glem IDL_Files { Single_Service_Common.idl } } +project(Single_Service_Common_idl_lem_gen) : ciaoidldefaults { + after += Single_Service_Common_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_COMMON_LEM_STUB_Export \ + -Wb,stub_export_include=Single_Service_Common_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + Single_Service_CommonE.idl + } +} + +project(Single_Service_Common_lem_stub) : ccm_svnt { + after += Single_Service_Common_idl_lem_gen \ + Single_Service_Common_stub + libs += Single_Service_Common_stub + + libpaths += ../lib + libout = ../lib + + sharedname = Single_Service_Common_lem_stub + dynamicflags += SINGLE_SERVICE_COMMON_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Single_Service_CommonEC.cpp + } + + Header_Files { + Single_Service_CommonEC.h + Single_Service_Common_lem_stub_export.h + } + + Inline_Files { + Single_Service_CommonEC.inl + } +} project(Single_Service_Common_stub) : ccm_stub { after += Single_Service_Common_idl_gen diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc index 8c6c1ca8d39..7c530c9d2eb 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc @@ -17,7 +17,8 @@ project(Large_DDS_Pub_idl_gen) : componentidldefaults, dds4ccm { } project(Large_DDS_Pub_lem_gen) : ciaoidldefaults, dds4ccm { - after += Large_DDS_Pub_idl_gen Large_Connector_idl_gen + after += Large_DDS_Pub_idl_gen Large_Connector_idl_gen \ + Single_Service_Common_lem_stub custom_only = 1 idlflags += -Wb,stub_export_macro=DDS_PUB_LEM_STUB_Export \ -Wb,stub_export_include=DDS_Pub_lem_stub_export.h \ diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc index 0f22cfd536b..f1d6485bc17 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc @@ -9,7 +9,7 @@ project(Single_Service_idl_gen) : componentidldefaults { -Wb,skel_export_include=Single_Service_svnt_export.h \ -Wb,exec_export_macro=SINGLE_SERVICE_EXEC_Export \ -Wb,exec_export_include=Single_Service_exec_export.h \ - -Gxhex -Gxhsk -Gxhst -I.. -Glfa + -Gxhex -Gxhsk -Gxhst -I.. -Gex IDL_Files { Single_Service.idl @@ -81,9 +81,15 @@ project(Single_Service_stub) : ccm_stub { } project(Single_Service_exec) : ciao_executor { - after += Single_Service_lem_stub Single_Service_stub Single_Service_Common_stub + after += Single_Service_lem_stub \ + Single_Service_stub \ + Single_Service_Common_stub \ + Single_Service_Common_lem_stub sharedname = Single_Service_exec - libs += Single_Service_stub Single_Service_lem_stub Single_Service_Common_stub + libs += Single_Service_stub \ + Single_Service_lem_stub \ + Single_Service_Common_stub \ + Single_Service_Common_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +113,16 @@ project(Single_Service_exec) : ciao_executor { project(Single_Service_svnt) : ciao_servant { - after += Single_Service_lem_stub Single_Service_Common_skel Single_Service_Common_stub + after += Single_Service_lem_stub \ + Single_Service_Common_skel \ + Single_Service_Common_stub \ + Single_Service_Common_lem_stub sharedname = Single_Service_svnt - libs += Single_Service_stub Single_Service_lem_stub \ - Single_Service_Common_skel Single_Service_Common_stub + libs += Single_Service_stub \ + Single_Service_lem_stub \ + Single_Service_Common_skel \ + Single_Service_Common_stub \ + Single_Service_Common_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -133,5 +145,3 @@ project(Single_Service_svnt) : ciao_servant { Inline_Files { } } - - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp deleted file mode 100644 index 2e620612de3..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp +++ /dev/null @@ -1,130 +0,0 @@ -// -*- C++ -*- -// $Id$ - -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.cs.wustl.edu/~schmidt/TAO.html - **/ - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1277 - -#include "Single_Service_exec.h" - -namespace CIAO_Single_Service_Impl -{ - //============================================================ - // Facet Executor Implementation Class: Simple_Service_exec_i - //============================================================ - - Simple_Service_exec_i::Simple_Service_exec_i (void) - { - } - - Simple_Service_exec_i::~Simple_Service_exec_i (void) - { - } - - // Operations from ::Simple_Service - - void - Simple_Service_exec_i::ping (void) - { - /* Your code here. */ - } - - //============================================================ - // Component Executor Implementation Class: Single_Service_exec_i - //============================================================ - - Single_Service_exec_i::Single_Service_exec_i (void) - { - } - - Single_Service_exec_i::~Single_Service_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::CCM_Simple_Service_ptr - Single_Service_exec_i::get_ping_port (void) - { - /* Your code here. */ - return ::CCM_Simple_Service::_nil (); - } - - // Operations from Components::SessionComponent. - - void - Single_Service_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CCM_Single_Service_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Single_Service_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Single_Service_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Single_Service_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Single_Service_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SINGLE_SERVICE_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Single_Service_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Single_Service_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h deleted file mode 100644 index cbe4bd81665..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h +++ /dev/null @@ -1,114 +0,0 @@ -// -*- C++ -*- -// $Id$ - -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.cs.wustl.edu/~schmidt/TAO.html - **/ - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1216 - -#ifndef CIAO_SINGLE_SERVICE_EXEC_AZRZEB_H_ -#define CIAO_SINGLE_SERVICE_EXEC_AZRZEB_H_ - -#include /**/ "ace/pre.h" - -#include "Single_ServiceEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Single_Service_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Single_Service_Impl -{ - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exh.cpp:53 - - class SINGLE_SERVICE_EXEC_Export Simple_Service_exec_i - : public virtual ::CCM_Simple_Service, - public virtual ::CORBA::LocalObject - { - public: - Simple_Service_exec_i (void); - virtual ~Simple_Service_exec_i (void); - - // Operations and attributes from Simple_Service - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:37 - - virtual void - ping (void); - }; - - class SINGLE_SERVICE_EXEC_Export Single_Service_exec_i - : public virtual Single_Service_Exec, - public virtual ::CORBA::LocalObject - { - public: - Single_Service_exec_i (void); - virtual ~Single_Service_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - - virtual ::CCM_Simple_Service_ptr - get_ping_port (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - - private: - ::CCM_Single_Service_Context_var context_; - }; - - extern "C" SINGLE_SERVICE_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Single_Service_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc index 9d1abfae6ff..667c182647f 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc @@ -6,10 +6,9 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults { -Wb,stub_export_include=dds4ccm_stub_export.h \ -Wb,skel_export_macro=DDS4CCM_SKEL_Export \ -Wb,skel_export_include=dds4ccm_skel_export.h \ - -I$(CIAO_ROOT)/connectors -Glem + -I$(CIAO_ROOT)/connectors IDL_Files { - idlflags -= -Gsv idlflags += -Gxhst -Gxhsk -SS dds4ccm_Base.idl } @@ -22,8 +21,8 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults { } IDL_Files { - idlflags -= -Gxhst -Gxhsk -Gsv - idlflags += -Sci -SS -Scc + idlflags -= -Gxhst -Gxhsk -Gsv -Glem + idlflags += -Sci -SS dds4ccm_Entity.idl ccm_dds.idl } diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc index bb24ef53099..1d9f8d0ebb9 100644 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc @@ -9,12 +9,11 @@ project (CIAO_NDDS_idl_gen) : install, ndds_idltocpp, componentidldefaults { -I$(CIAO_ROOT)/connectors -Glem IDL_Files { - idlflags -= -Gsv ndds_dcps.idl } IDL_Files { - idlflags -= -Gxhst -Gxhsk -Gsv + idlflags -= -Gxhst -Gxhsk ndds_dcps_i_handle.idl } |