diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-05-19 12:58:44 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-05-19 12:58:44 +0000 |
| commit | 23a41f3ecb1856a30ab726b6d2beb165f762ff38 (patch) | |
| tree | 4c37288fde93c8ea4a15c78a5f0f8d148f7ac5ea | |
| parent | 414013db64dafc014d4a7dae1cde9edcc9510dee (diff) | |
| download | ATCD-23a41f3ecb1856a30ab726b6d2beb165f762ff38.tar.gz | |
merge from head
479 files changed, 9043 insertions, 1277 deletions
diff --git a/modules/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc b/modules/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc index 4d578c4a2b2..353b90e2769 100644 --- a/modules/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc +++ b/modules/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc @@ -1,6 +1,6 @@ //$Id$ -project (XSC_XML_Generation) : xscdefaults { +project (XSC_XML_Generation) : install, xscdefaults { requires += xsc xscflags += --cxx-banner-file $(DANCE_ROOT)/docs/schema/xsc-banner.cpp @@ -31,7 +31,7 @@ project (XSC_XML_Generation) : xscdefaults { } } -project (XSC_XML_Handlers) : acelib, xerces, dance_lib, ciao_xml_utils { +project (XSC_XML_Handlers) : install, acelib, xerces, dance_lib, ciao_xml_utils { sharedname += XSC_XML_Handlers dynamicflags = XSC_XML_HANDLERS_BUILD_DLL macros += XML_USE_PTHREADS @@ -64,7 +64,7 @@ project (XSC_XML_Handlers) : acelib, xerces, dance_lib, ciao_xml_utils { } -project (XSC_Config_Handlers) : dance_deployment_stub, dance_config_handlers_base, ciao_lib, dance, dance_logger { +project (XSC_Config_Handlers) : install, dance_deployment_stub, dance_config_handlers_base, ciao_lib, dance, dance_logger { after += XSC_DynAny_Handler \ XSC_Config_Handlers_Common @@ -105,7 +105,7 @@ project (XSC_Config_Handlers) : dance_deployment_stub, dance_config_handlers_bas } -project (XSC_Config_Handlers_Common) : dance_deployment_stub, dance_config_handlers_base, ciao_lib, dance { +project (XSC_Config_Handlers_Common) : install, dance_deployment_stub, dance_config_handlers_base, ciao_lib, dance { after += XSC_DynAny_Handler sharedname = XSC_Config_Handlers_Common dynamicflags = CONFIG_HANDLERS_COMMON_BUILD_DLL diff --git a/modules/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc b/modules/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc index 1004dde9243..e17bcb7ec7e 100644 --- a/modules/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc +++ b/modules/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc @@ -1,6 +1,6 @@ // $Id$ -project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, dance_deployment_stub, \ +project (XSC_DynAny_Handler) : install, xerces, dynamicany, typecodefactory, dance_deployment_stub, \ dance_config_handlers_base, dance_lib, dance, ifr_client { after += XSC_XML_Handlers libs += XSC_XML_Handlers @@ -19,4 +19,8 @@ project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, dance_deploy Header_Files { DynAny_Handler_Export.h } + + specific { + install_dir = Config_Handlers/DynAny_Handler + } } diff --git a/modules/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/modules/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc index d631343c9e5..88e8efcce27 100644 --- a/modules/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc +++ b/modules/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc @@ -1,6 +1,6 @@ // $Id$ -project (Package_Config_Handlers) : acelib, dance_deployment_stub, dance_config_handlers_base, dance, typecodefactory, dance_output { +project (Package_Config_Handlers) : install, acelib, dance_deployment_stub, dance_config_handlers_base, dance, typecodefactory, dance_output { sharedname = Package_Config_Handlers dynamicflags = PACKAGING_HANDLERS_BUILD_DLL @@ -39,5 +39,8 @@ project (Package_Config_Handlers) : acelib, dance_deployment_stub, dance_config_ SID_Handler.h } + specific { + install_dir = Config_Handlers/Package_Handlers + } } diff --git a/modules/CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp b/modules/CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp index dd386b5efb8..e1647f17815 100644 --- a/modules/CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp +++ b/modules/CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp @@ -18,9 +18,9 @@ namespace CIAO { DANCE_TRACE("RDD_Handler::resource_deployment_descr"); - dest.requirementName = src.requirementName ().c_str (); + dest.requirementName = ACE_TEXT_ALWAYS_CHAR (src.requirementName ().c_str ()); - dest.resourceName= src.resourceName ().c_str (); + dest.resourceName= ACE_TEXT_ALWAYS_CHAR (src.resourceName ().c_str ()); std::for_each (src.begin_property (), src.end_property (), diff --git a/modules/CIAO/DAnCE/DomainApplication/DomainApplication.mpc b/modules/CIAO/DAnCE/DomainApplication/DomainApplication.mpc index 5decf2fe05f..250adc02864 100644 --- a/modules/CIAO/DAnCE/DomainApplication/DomainApplication.mpc +++ b/modules/CIAO/DAnCE/DomainApplication/DomainApplication.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: dance_lib, dance_output, dance_domainapplication_skel, \ +project: install, dance_lib, dance_output, dance_domainapplication_skel, \ dance_nodeapplicationmanager_stub, \ dance_nodeapplicationmanager_skel, \ dance_tools, dance_logger { @@ -11,5 +11,8 @@ project: dance_lib, dance_output, dance_domainapplication_skel, \ Source_Files { Domain_Application_Impl.cpp } -} + specific { + install_dir = DAnCE/DomainApplication + } +} diff --git a/modules/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp b/modules/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp index de20ce6132a..5f7a39dda14 100644 --- a/modules/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp +++ b/modules/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp @@ -713,7 +713,7 @@ namespace DAnCE void DA_NA_ReplyHandlerImpl::finishLaunch_excep ( ::Messaging::ExceptionHolder * excep_holder) { - DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DA_NA_ReplyHandlerImpl::finishLaunch_excep called"))); + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DA_NA_ReplyHandlerImpl::finishLaunch_excep called\n"))); try { @@ -778,7 +778,7 @@ namespace DAnCE void DA_NA_ReplyHandlerImpl::start_excep ( ::Messaging::ExceptionHolder * excep_holder) { - DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DA_NA_ReplyHandlerImpl::start_excep called"))); + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DA_NA_ReplyHandlerImpl::start_excep called\n"))); try { diff --git a/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc b/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc index d7e7fcf4c33..8e33849cf58 100644 --- a/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc +++ b/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : dance_lib, dance_output, dance_domainapplicationmanager_skel, \ +project : install, dance_lib, dance_output, dance_domainapplicationmanager_skel, \ dance_domainapplication, dance_nodemanager_stub, \ dance_nodemanager_skel, naming, \ dance_split_plan, dance_tools { @@ -18,5 +18,8 @@ project : dance_lib, dance_output, dance_domainapplicationmanager_skel, \ DomainApplicationManager_Impl.h DomainApplicationManager_Export.h } -} + specific { + install_dir = DAnCE/DomainApplicationManager + } +} diff --git a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc index a4194865137..c646f409d6e 100644 --- a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc +++ b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Execution_Manager_Exec) : dance_exe, naming, \ +project(Execution_Manager_Exec) : install, dance_exe, naming, \ dance_domainapplicationmanager, \ dance_executionmanager_skel, \ utils, dance_logger, avoids_minimum_corba, \ diff --git a/modules/CIAO/DAnCE/Logger/Logger.mpc b/modules/CIAO/DAnCE/Logger/Logger.mpc index 649d5ff71fc..2e1fb2ccfd2 100644 --- a/modules/CIAO/DAnCE/Logger/Logger.mpc +++ b/modules/CIAO/DAnCE/Logger/Logger.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(DAnCE_Logger): dance_lib, taolib, acelib { +project(DAnCE_Logger): install, dance_lib, taolib, acelib { sharedname = DAnCE_Logger dynamicflags = DANCE_LOGGER_BUILD_DLL @@ -9,8 +9,13 @@ project(DAnCE_Logger): dance_lib, taolib, acelib { Logger_Service.cpp Log_Macros.cpp } -} - + Header_Files { + DAnCE_Logger_Export.h + } + specific { + install_dir = DAnCE/Logger + } +} diff --git a/modules/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/modules/CIAO/DAnCE/NodeApplication/NodeApplication.mpc index 8310a34f58b..29b3a24cf06 100644 --- a/modules/CIAO/DAnCE/NodeApplication/NodeApplication.mpc +++ b/modules/CIAO/DAnCE/NodeApplication/NodeApplication.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(DAnCE_NodeApplication): dance_lib, dynamicinterface, \ +project(DAnCE_NodeApplication): install, dance_lib, dynamicinterface, \ dance_nodeapplication_skel, \ dance_logger, iortable, naming, dance_locality_handler, \ gen_ostream, avoids_ace_for_tao, dance_applicationmanager_stub { @@ -21,7 +21,8 @@ project(DAnCE_NodeApplication): dance_lib, dynamicinterface, \ Name_Utilities.h LocalityActivator_Impl.h } -} - - + specific { + install_dir = DAnCE/NodeApplication + } +} diff --git a/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc index 8f04c1c33d5..098ca4815f9 100644 --- a/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc +++ b/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (DAnCE_NodeApplicationManager) : dance_lib, naming, dance_nodeapplicationmanager_skel, \ +project (DAnCE_NodeApplicationManager) : install, dance_lib, naming, dance_nodeapplicationmanager_skel, \ dynamicinterface, \ dance_nodeapplication, avoids_ace_for_tao { sharedname = DAnCE_NodeApplicationManager @@ -10,4 +10,8 @@ project (DAnCE_NodeApplicationManager) : dance_lib, naming, dance_nodeapplicatio Source_Files { NodeApplicationManager_Impl.cpp } + + specific { + install_dir = DAnCE/NodeApplicationManager + } } diff --git a/modules/CIAO/DAnCE/NodeManager/NodeManager.mpc b/modules/CIAO/DAnCE/NodeManager/NodeManager.mpc index e55a38fdf14..bf2e551197c 100644 --- a/modules/CIAO/DAnCE/NodeManager/NodeManager.mpc +++ b/modules/CIAO/DAnCE/NodeManager/NodeManager.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Node_Manager_Exec) : utils, dance_exe, naming, avoids_ace_for_tao, \ +project(Node_Manager_Exec) : install, utils, dance_exe, naming, avoids_ace_for_tao, \ dance_nodeapplicationmanager, dance_nodemanager_skel, dance_stub, ciao_logger { exename = dance_node_manager diff --git a/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp index 31fda2fe441..b4e30a4c1fd 100644 --- a/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp +++ b/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp @@ -195,7 +195,7 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) ACE_TEXT("server-args")) == 0) { DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ") - ACE_TEXT("Using provided compoent server arguments: '%s'\n"), + ACE_TEXT("Using provided component server arguments: '%s'\n"), get_opts.opt_arg ())); this->options_.server_args_ = get_opts.opt_arg (); } diff --git a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc index a71f9629b57..7b07746a696 100644 --- a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc +++ b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(DAnCE_Plan_Launcher_Impl) : dance_lib, dance_logger, dance_convert_plan, \ +project(DAnCE_Plan_Launcher_Impl) : install_lib, dance_lib, dance_logger, dance_convert_plan, \ dance_executionmanager_stub, \ dance_domainapplication_stub, \ dance_domainapplicationmanager_stub, \ @@ -21,7 +21,7 @@ project(DAnCE_Plan_Launcher_Impl) : dance_lib, dance_logger, dance_convert_plan, } } -project(Plan_Launcher_Exec) : dance_exe, dance_plan_launcher { +project(Plan_Launcher_Exec) : install, dance_exe, dance_plan_launcher { exename = dance_plan_launcher Source_Files { Plan_Launcher.cpp diff --git a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc index beaef6efe88..1c72eac5225 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc +++ b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc @@ -1,14 +1,17 @@ // -*- MPC -*- // $Id$ -project (DAnCE_RepositoryManagerDaemon_IDL) : taoidldefaults { +project (DAnCE_RepositoryManagerDaemon_IDL) : install, taoidldefaults { custom_only = 1 IDL_Files { RepositoryManagerDaemon.idl } + specific { + install_dir = DAnCE/RepositoryManager + } } -project (DAnCE_RepositoryManager_Exec) : dance_logger, dance_config_handlers, dance_repositorymanagerbase, dance_repositorymanager_skel, naming, iortable, utils, zlib, minizip, dance_exe { +project (DAnCE_RepositoryManager_Exec) : install, dance_logger, dance_config_handlers, dance_repositorymanagerbase, dance_repositorymanager_skel, naming, iortable, utils, zlib, minizip, dance_exe { exename = dance_repository_manager after += DAnCE_RepositoryManagerDaemon_IDL requires += zlib @@ -29,9 +32,12 @@ project (DAnCE_RepositoryManager_Exec) : dance_logger, dance_config_handlers, da } IDL_Files { } + specific { + install_dir = DAnCE/RepositoryManager + } } -project (DAnCE_RepositoryManager_Admin_Exec) : dance_repositorymanager_stub, dance_config_handlers, naming, dance_exe, dance_logger { +project (DAnCE_RepositoryManager_Admin_Exec) : install, dance_repositorymanager_stub, dance_config_handlers, naming, dance_exe, dance_logger { exename = dance_rm_admin after += DAnCE_RepositoryManagerDaemon_IDL diff --git a/modules/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp b/modules/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp index adea0525518..c9c33264aa3 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp +++ b/modules/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp @@ -20,8 +20,8 @@ struct Options { Options (void) - : rm_ior_ (""), - domain_nc_ (""), + : rm_ior_ (ACE_TEXT("")), + domain_nc_ (ACE_TEXT("")), list_ (false), shutdown_ (false) { diff --git a/modules/CIAO/DAnCE/TargetManager/TargetManager.mpc b/modules/CIAO/DAnCE/TargetManager/TargetManager.mpc index ade06accf16..0b463a07526 100644 --- a/modules/CIAO/DAnCE/TargetManager/TargetManager.mpc +++ b/modules/CIAO/DAnCE/TargetManager/TargetManager.mpc @@ -1,6 +1,6 @@ // $Id$ -project (DAnCE_TargetManager_Exec) : iortable, utils, naming, dance_logger, \ +project (DAnCE_TargetManager_Exec) : install, iortable, utils, naming, dance_logger, \ dance_nodemanager_stub, dance_nodemanager_skel, dance_exe, \ dance_config_handlers, dance_targetmanager_skel { exename = dance_target_manager diff --git a/modules/CIAO/DAnCE/tests/NameServiceTest/clt_main.cpp b/modules/CIAO/DAnCE/tests/NameServiceTest/clt_main.cpp index ca0266e8206..90a4a6d4427 100644 --- a/modules/CIAO/DAnCE/tests/NameServiceTest/clt_main.cpp +++ b/modules/CIAO/DAnCE/tests/NameServiceTest/clt_main.cpp @@ -1,6 +1,6 @@ // $Id$ #include "ace/String_Base.h" -#include <orbsvcs/orbsvcs/CosNamingC.h> +#include <orbsvcs/CosNamingC.h> #include "DAnCE/Logger/Log_Macros.h" #include "RegistrationPath.h" #include "DummyC.h" diff --git a/modules/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp b/modules/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp index 2d501da9b54..ce8bc37abe6 100644 --- a/modules/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp +++ b/modules/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/OS_NS_stdio.h" -#include <orbsvcs/orbsvcs/CosNamingC.h> -#include <orbsvcs/orbsvcs/Naming/Naming_Loader.h> +#include <orbsvcs/CosNamingC.h> +#include <orbsvcs/Naming/Naming_Loader.h> #include "DAnCE/Logger/Log_Macros.h" #include "DummyC.h" diff --git a/modules/CIAO/DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc b/modules/CIAO/DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc index 44882ded9ff..d0b55846b36 100644 --- a/modules/CIAO/DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc +++ b/modules/CIAO/DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc @@ -1,6 +1,7 @@ // $Id$ project : dance_exe, dance_nodemanager_stub, dance_logger { exename = NodeManagerNodeApplicationManagerTest + exeout = . Source_Files { test.cpp diff --git a/modules/CIAO/DAnCE/tools/Completion/CompletionHandler_T.h b/modules/CIAO/DAnCE/tools/Completion/CompletionHandler_T.h index af01a0a85f5..a2c601a91c2 100644 --- a/modules/CIAO/DAnCE/tools/Completion/CompletionHandler_T.h +++ b/modules/CIAO/DAnCE/tools/Completion/CompletionHandler_T.h @@ -26,12 +26,11 @@ namespace DAnCE { public: virtual ~CompletionHandler () {} - + virtual void handle_completion (PROCESSOR *processor) = 0; virtual void handle_exception (CORBA::Exception* local_ex) = 0; }; - - }; /* DAnCE */ + } /* DAnCE */ #include /**/ "ace/post.h" diff --git a/modules/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.h b/modules/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.h index 231b066584d..27ed08c5cf1 100644 --- a/modules/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.h +++ b/modules/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.h @@ -55,7 +55,7 @@ namespace DAnCE unsigned int fail_count_; }; - }; /* DAnCE */ + } /* DAnCE */ #if defined (__ACE_INLINE__) #include "Completion/Completion_Counter_Base.inl" diff --git a/modules/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.inl b/modules/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.inl index 719cb531741..a7a84048ca4 100644 --- a/modules/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.inl +++ b/modules/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.inl @@ -9,7 +9,7 @@ namespace DAnCE ACE_INLINE Completion_Counter_Base<ACE_LOCK>::~Completion_Counter_Base () { } - + template <class ACE_LOCK> ACE_INLINE Completion_Counter_Base<ACE_LOCK>::Completion_Counter_Base ( unsigned int exec_count, @@ -89,4 +89,4 @@ namespace DAnCE return this->fail_count_; } - }; /*DAnCE */ + } /*DAnCE */ diff --git a/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp b/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp index 2f36ffe88b1..7832da6e03b 100644 --- a/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp +++ b/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp @@ -10,8 +10,8 @@ #include "Convert_Plan_Impl.h" -const char *input_filename = 0; -const char *output_filename = 0; +const ACE_TCHAR *input_filename = 0; +const ACE_TCHAR *output_filename = 0; void usage (void) { diff --git a/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp b/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp index 5eb5f6667e0..d8bccfd42e1 100644 --- a/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp +++ b/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp @@ -9,7 +9,7 @@ namespace DAnCE { Deployment::DeploymentPlan * - Convert_Plan::read_xml_plan (const char *filename) + Convert_Plan::read_xml_plan (const ACE_TCHAR *filename) { if (!filename) { @@ -27,7 +27,7 @@ namespace DAnCE } Deployment::DeploymentPlan * - Convert_Plan::read_cdr_plan (const char *filename) + Convert_Plan::read_cdr_plan (const ACE_TCHAR *filename) { if (!filename) { @@ -41,7 +41,7 @@ namespace DAnCE if (!file) { DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Convert_Plan::read_cdr_plan - ") - ACE_TEXT ("Error: Unable to open file for reasding %C\n"), + ACE_TEXT ("Error: Unable to open file for reading %s\n"), filename)); return 0; } @@ -107,13 +107,13 @@ namespace DAnCE input_cdr.reset_byte_order ((int) byte_order); DANCE_DEBUG (9, (LM_TRACE, DLINFO "Convert_Plan_Impl::read_cdr_plan - " - "Reading file %C in %s endian format with size %u\n", + "Reading file %s in %s endian format with size %u\n", filename, ACE_CDR_BYTE_ORDER ? ACE_TEXT("little") : ACE_TEXT("big"), bufsize)); - Deployment::DeploymentPlan *retval; + Deployment::DeploymentPlan *retval = 0; ACE_NEW_RETURN (retval, Deployment::DeploymentPlan (), 0); @@ -130,7 +130,7 @@ namespace DAnCE } bool - Convert_Plan::write_cdr_plan (const char *output_filename, Deployment::DeploymentPlan &plan) + Convert_Plan::write_cdr_plan (const ACE_TCHAR *output_filename, Deployment::DeploymentPlan &plan) { if (!output_filename) { @@ -146,7 +146,7 @@ namespace DAnCE if (file == 0) { - DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::write_cdr_plan - failed to open file %C\n", + DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::write_cdr_plan - failed to open file %s\n", output_filename)); return false; } diff --git a/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h b/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h index a54b542e886..114450cf59c 100644 --- a/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h +++ b/modules/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h @@ -17,9 +17,9 @@ namespace DAnCE class DAnCE_Convert_Plan_Export Convert_Plan { public: - static Deployment::DeploymentPlan * read_xml_plan (const char *filename); - static Deployment::DeploymentPlan * read_cdr_plan (const char *filename); - static bool write_cdr_plan (const char *filename, Deployment::DeploymentPlan &plan); + static Deployment::DeploymentPlan * read_xml_plan (const ACE_TCHAR *filename); + static Deployment::DeploymentPlan * read_cdr_plan (const ACE_TCHAR *filename); + static bool write_cdr_plan (const ACE_TCHAR *filename, Deployment::DeploymentPlan &plan); }; } diff --git a/modules/CIAO/DAnCE/tools/Split_Plan/Locality_Splitter.cpp b/modules/CIAO/DAnCE/tools/Split_Plan/Locality_Splitter.cpp index 73ebe985971..2a26cf22947 100644 --- a/modules/CIAO/DAnCE/tools/Split_Plan/Locality_Splitter.cpp +++ b/modules/CIAO/DAnCE/tools/Split_Plan/Locality_Splitter.cpp @@ -265,5 +265,4 @@ namespace DAnCE sub_plan.label = CORBA::string_dup (sub_label.c_str ()); } } - -}; +} diff --git a/modules/CIAO/DAnCE/tools/Split_Plan/Node_Splitter.cpp b/modules/CIAO/DAnCE/tools/Split_Plan/Node_Splitter.cpp index 512ad966054..1110c74dc44 100644 --- a/modules/CIAO/DAnCE/tools/Split_Plan/Node_Splitter.cpp +++ b/modules/CIAO/DAnCE/tools/Split_Plan/Node_Splitter.cpp @@ -54,5 +54,4 @@ namespace DAnCE sub_plan.label = CORBA::string_dup (sub_label.c_str ()); } } - -}; +} diff --git a/modules/CIAO/DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp b/modules/CIAO/DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp index 5c61b98ca35..09080fad832 100644 --- a/modules/CIAO/DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp +++ b/modules/CIAO/DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp @@ -32,5 +32,4 @@ namespace DAnCE { sub_plan.UUID = CORBA::string_dup (parent_plan.UUID.in ()); } - -}; +} diff --git a/modules/CIAO/MPC/config/dds4ccm_ts_default.mpb b/modules/CIAO/MPC/config/dds4ccm_ts_default.mpb index 113cdbb5ff7..1d5cfb5a724 100644 --- a/modules/CIAO/MPC/config/dds4ccm_ts_default.mpb +++ b/modules/CIAO/MPC/config/dds4ccm_ts_default.mpb @@ -8,13 +8,13 @@ feature(dds4ccm_opendds) : dds4ccm, dcps_ts_defaults, dcps { feature(dds4ccm_splice) : dds4ccm, splice_ts_defaults { Define_Custom(DDSGenerator) : SpliceTypeSupport { - keyword opendds_ts_flags = commandflags + keyword splice_ts_flags = commandflags } } feature(dds4ccm_ndds) : dds4ccm, ndds_ts_defaults, nddslib { Define_Custom(DDSGenerator) : NDDSTypeSupport { - commandflags += -typeSequenceSuffix RTISeq -enableEscapeChar -verbosity 1 + commandflags += -typeSequenceSuffix RTISeq -enableEscapeChar -verbosity 1 -I $(CIAO_ROOT)/connectors/dds4ccm/idl -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT) } dynamicflags += NDDS_USER_DLL_EXPORT @@ -28,11 +28,27 @@ feature(dds4ccm_ndds) : dds4ccm, ndds_ts_defaults, nddslib { feature(!dds4ccm_opendds) { // this allows the user's project to reference opendds_ts_flags, // which will simply be ignored - Define_Custom(DummyTypeSupport) { + Define_Custom(OpenDDSDummyTypeSupport) { keyword opendds_ts_flags } } +feature(!dds4ccm_ndds) { + // this allows the user's project to reference opendds_ts_flags, + // which will simply be ignored + Define_Custom(NDDSDummyTypeSupport) { + keyword ndds_ts_flags + } +} + +feature(!dds4ccm_splice) { + // this allows the user's project to reference opendds_ts_flags, + // which will simply be ignored + Define_Custom(SpliceDummyTypeSupport) { + keyword splice_ts_flags + } +} + feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) { Define_Custom(DDSGenerator) { } diff --git a/modules/CIAO/bin/ciao_tests.lst b/modules/CIAO/bin/ciao_tests.lst index 515d4be3cd8..1dbb942a4e6 100644 --- a/modules/CIAO/bin/ciao_tests.lst +++ b/modules/CIAO/bin/ciao_tests.lst @@ -41,6 +41,13 @@ TAO/CIAO/tests/CIAO_ComponentServer/Basic/run_test.pl: !STATIC !MINIMUM !CORBA_E TAO/CIAO/tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/tests/CIAO_ComponentServer/Local_Facet/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE NDDS TAO/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE NDDS @@ -89,11 +96,8 @@ TAO/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/descriptors/run_test.pl TAO/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS -TAO/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl: !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl: !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl: !ACE_FOR_TAO !ST NDDS -TAO/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST -TAO/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST - diff --git a/modules/CIAO/ccm/CCM_Home.idl b/modules/CIAO/ccm/CCM_Home.idl index b312eee6e14..eea3bfb3f14 100644 --- a/modules/CIAO/ccm/CCM_Home.idl +++ b/modules/CIAO/ccm/CCM_Home.idl @@ -14,9 +14,11 @@ module Components { typeprefix Components "omg.org"; +#if !defined (CCM_LW) exception DuplicateKeyValue {}; exception InvalidKey {}; exception UnknownKeyValue {}; +#endif interface CCMObject; diff --git a/modules/CIAO/ccm/CCM_Session2Context.idl b/modules/CIAO/ccm/CCM_Session2Context.idl index caf7f8f6d7b..ccac38db225 100644 --- a/modules/CIAO/ccm/CCM_Session2Context.idl +++ b/modules/CIAO/ccm/CCM_Session2Context.idl @@ -5,6 +5,8 @@ #define CCM_SESSION2CONTEXT_IDL #include "ccm/CCM_CCM2Context.idl" +#include "ccm/CCM_SessionContext.idl" +#include "tao/OctetSeq.pidl" // *************** Extended Container Interfaces *************** diff --git a/modules/CIAO/ccm/CCM_lem_stub.mpc b/modules/CIAO/ccm/CCM_lem_stub.mpc index 686e246cee4..f5e4c3ea8f7 100644 --- a/modules/CIAO/ccm/CCM_lem_stub.mpc +++ b/modules/CIAO/ccm/CCM_lem_stub.mpc @@ -1,6 +1,6 @@ // $Id$ -project(CCM_lem_stub_idl) : ciaolib_with_idl, valuetype { +project(CCM_lem_stub_idl) : install, ciaolib_with_idl, valuetype { idlflags += -Wb,stub_export_include=CCM_LEM_Stub_Export.h idlflags += -Wb,stub_export_macro=CCM_LEM_STUB_Export custom_only = 1 @@ -29,7 +29,7 @@ project(CCM_lem_stub_idl) : ciaolib_with_idl, valuetype { } -project(CCM_lem_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client { +project(CCM_lem_stub) : install, ciaolib_with_idl, ciao_output, valuetype, ifr_client { // This is necessary for MPC to pull in rules.ciao.GNU includes += $(CIAO_ROOT) dynamicflags = CCM_LEM_STUB_BUILD_DLL @@ -38,6 +38,10 @@ project(CCM_lem_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client { IDL_Files { } + Header_Files { + CCM_LEM_Stub_Export.h + } + Source_Files { CCM_CCMExceptionC.cpp CCM_ContextC.cpp diff --git a/modules/CIAO/ccm/CCM_stub.mpc b/modules/CIAO/ccm/CCM_stub.mpc index bf4a42933ce..1c5eeda0078 100644 --- a/modules/CIAO/ccm/CCM_stub.mpc +++ b/modules/CIAO/ccm/CCM_stub.mpc @@ -1,6 +1,6 @@ // $Id$ -project(CCM_stub_idl) : ciaolib_with_idl, valuetype { +project(CCM_stub_idl) : install, ciaolib_with_idl, valuetype { idlflags += -Wb,stub_export_include=CCM_Stub_Export.h idlflags += -Wb,stub_export_macro=CCM_Stub_Export idlflags += -Wb,skel_export_include=CCM_Svnt_Export.h @@ -49,7 +49,7 @@ project(CCM_stub_idl) : ciaolib_with_idl, valuetype { } -project(CCM_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client { +project(CCM_stub) : install, ciaolib_with_idl, ciao_output, valuetype, ifr_client { // This is necessary for MPC to pull in rules.ciao.GNU includes += $(CIAO_ROOT) dynamicflags = CCM_STUB_BUILD_DLL @@ -57,6 +57,10 @@ project(CCM_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client { IDL_Files { } + Header_Files { + CCM_Stub_Export.h + } + Source_Files { CCM_BaseC.cpp CCM_EventsC.cpp @@ -78,4 +82,10 @@ project(CCM_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client { CCM_ExceptionsC.cpp ComponentsC.cpp } + + verbatim(gnuace, postinstall) { +" mkdir -p $(INSTALL_PREFIX)/share/ciao/ccm" +" ln -sf $(INSTALL_PREFIX)/include/ccm/Components.idl $(INSTALL_PREFIX)/share/ciao/ccm" + } + } diff --git a/modules/CIAO/ccm/CCM_svnt.mpc b/modules/CIAO/ccm/CCM_svnt.mpc index 72371b28ea7..346c8e1045d 100644 --- a/modules/CIAO/ccm/CCM_svnt.mpc +++ b/modules/CIAO/ccm/CCM_svnt.mpc @@ -1,6 +1,6 @@ // $Id$ -project(CCM_svnt_idl) : ciaolib_with_idl, valuetype { +project(CCM_svnt_idl) : install, ciaolib_with_idl, valuetype { idlflags += -Wb,export_include=CCM_Svnt_Export.h idlflags += -Wb,export_macro=CCM_Svnt_Export custom_only = 1 @@ -27,7 +27,7 @@ project(CCM_svnt_idl) : ciaolib_with_idl, valuetype { } -project(CCM_svnt) : orbsvcslib, orbsvcs_output \ +project(CCM_svnt) : install, orbsvcslib, orbsvcs_output \ , portableserver \ , valuetype \ , ifr_client \ @@ -42,6 +42,13 @@ project(CCM_svnt) : orbsvcslib, orbsvcs_output \ IDL_Files { } + Header_Files { + CCM_Svnt_Export.h + CCM_BaseS.h + CCM_CookieS.h + CCM_ExceptionsS.h + } + Source_Files { CCM_TransactionC.cpp CosPersistentStateC.cpp @@ -70,6 +77,7 @@ project(CCM_svnt) : orbsvcslib, orbsvcs_output \ CCM_HomeFinderS.cpp CCM_NavigationS.cpp CCM_ReceptacleS.cpp + ComponentsS.cpp } } diff --git a/modules/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc b/modules/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc index a8d6e640caa..1030bc83a94 100644 --- a/modules/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc +++ b/modules/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CCM_ComponentServer_IDL) : ciaoidldefaults, anytypecode { +project(CCM_ComponentServer_IDL) : install, ciaoidldefaults, anytypecode { idlflags += -Wb,stub_export_macro=DANCE_COMPONENTSERVER_STUB_Export \ -Wb,stub_export_include=DAnCE_ComponentServer_stub_export.h \ -Wb,skel_export_macro=DANCE_COMPONENTSERVER_SVNT_Export \ @@ -23,9 +23,13 @@ project(CCM_ComponentServer_IDL) : ciaoidldefaults, anytypecode { idlflags += -Ssi CCM_ComponentServer.idl } + + specific { + install_dir = ccm/ComponentServer + } } -project(CCM_ComponentServer_stub) : ciaolib_with_idl, ciao_output, messaging, ccm_stub, anytypecode, ciao_lib { +project(CCM_ComponentServer_stub) : install, ciaolib_with_idl, ciao_output, messaging, ccm_stub, anytypecode, ciao_lib { dynamicflags = DANCE_COMPONENTSERVER_STUB_BUILD_DLL after += CCM_ComponentServer_IDL @@ -43,9 +47,13 @@ project(CCM_ComponentServer_stub) : ciaolib_with_idl, ciao_output, messaging, cc } IDL_Files { } + + specific { + install_dir = ccm/ComponentServer + } } -project(CCM_ComponentServer_svnt) : ciaolib_with_idl, ciao_output, messaging, ccm_componentserver_stub, anytypecode, ciao_lib { +project(CCM_ComponentServer_svnt) : install, ciaolib_with_idl, ciao_output, messaging, ccm_componentserver_stub, anytypecode, ciao_lib { dynamicflags = DANCE_COMPONENTSERVER_SVNT_BUILD_DLL Header_Files { @@ -61,5 +69,9 @@ project(CCM_ComponentServer_svnt) : ciaolib_with_idl, ciao_output, messaging, cc } IDL_Files { } + + specific { + install_dir = ccm/ComponentServer + } } diff --git a/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc b/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc index fd3eb551c68..4164685c266 100644 --- a/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc +++ b/modules/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc @@ -1,6 +1,6 @@ // $Id$ -project(CIAO_ComponentServer_IDL) : ciaoidldefaults, anytypecode { +project(CIAO_ComponentServer_IDL) : install, ciaoidldefaults, anytypecode { idlflags += -Wb,stub_export_macro=CIAO_COMPONENTSERVER_STUB_Export \ -Wb,stub_export_include=CIAO_ComponentServer_stub_export.h \ -Wb,skel_export_macro=CIAO_COMPONENTSERVER_SVNT_Export \ @@ -12,9 +12,12 @@ project(CIAO_ComponentServer_IDL) : ciaoidldefaults, anytypecode { IDL_Files { CIAO_ComponentServer.idl } + specific { + install_dir = ciao/ComponentServer + } } -project(CIAO_CS_Client_IDL) : ciaoidldefaults, anytypecode { +project(CIAO_CS_Client_IDL) : install, ciaoidldefaults, anytypecode { idlflags += -Wb,stub_export_macro=CIAO_COMPONENTSERVER_STUB_Export \ -Wb,stub_export_include=CIAO_ComponentServer_stub_export.h \ -Wb,skel_export_macro=CIAO_CS_CLIENT_SVNT_Export \ @@ -33,9 +36,12 @@ project(CIAO_CS_Client_IDL) : ciaoidldefaults, anytypecode { idlflags += -Sci -SS CIAO_FailureReasons.idl } + specific { + install_dir = ciao/ComponentServer + } } -project(CIAO_ComponentServer_stub) : ccm_componentserver_stub, ciaolib_with_idl, ciao_output, \ +project(CIAO_ComponentServer_stub) : install, ccm_componentserver_stub, ciaolib_with_idl, ciao_output, \ messaging, anytypecode, ciao_lib { after += CIAO_ComponentServer_IDL CIAO_CS_Client_IDL dynamicflags = CIAO_COMPONENTSERVER_STUB_BUILD_DLL @@ -52,9 +58,12 @@ project(CIAO_ComponentServer_stub) : ccm_componentserver_stub, ciaolib_with_idl, Header_Files { CIAO_ComponentServer_stub_export.h } + specific { + install_dir = ciao/ComponentServer + } } -project(CIAO_CS_Client_svnt) : ccm_svnt, ccm_componentserver_svnt, ciao_componentserver_stub, portableserver, \ +project(CIAO_CS_Client_svnt) : install, ccm_svnt, ccm_componentserver_svnt, ciao_componentserver_stub, portableserver, \ ciao_lib, threads, avoids_ace_for_tao, ciao_logger { dynamicflags = CIAO_CS_CLIENT_SVNT_BUILD_DLL after += CIAO_CS_Client_IDL @@ -71,9 +80,12 @@ project(CIAO_CS_Client_svnt) : ccm_svnt, ccm_componentserver_svnt, ciao_componen CIAO_CS_ClientS.h CIAO_CS_Client_svnt_export.h } + specific { + install_dir = ciao/ComponentServer + } } -project(CIAO_ComponentServer_svnt) : ccm_componentserver_svnt, ciao_componentserver_stub, portableserver, \ +project(CIAO_ComponentServer_svnt) : install, ccm_componentserver_svnt, ciao_componentserver_stub, portableserver, \ ciao_session_container, ciao_lib, ciao_cs_client { dynamicflags = CIAO_COMPONENTSERVER_SVNT_BUILD_DLL @@ -87,9 +99,12 @@ project(CIAO_ComponentServer_svnt) : ccm_componentserver_svnt, ciao_componentser Header_Files { CIAO_ComponentServer_svnt_export.h } + specific { + install_dir = ciao/ComponentServer + } } -project(CIAO_ComponentServer_exe) : ccm_componentserver_svnt, portableserver, ciao_componentserver_svnt, \ +project(CIAO_ComponentServer_exe) : install, ccm_componentserver_svnt, portableserver, ciao_componentserver_svnt, \ messaging, anytypecode, ciaoexe, ciao_session_container,\ ciao_logger { exename = ciao_componentserver @@ -101,9 +116,29 @@ project(CIAO_ComponentServer_exe) : ccm_componentserver_svnt, portableserver, ci } IDL_Files { } + + specific { + install_dir = ciao + } + InstallData_Files { + gendir = . + ../../COPYING + ../../NEWS + ../../PROBLEM-REPORT-FORM + ../../README + ../../VERSION + ../../docs + ../../MPC + } + verbatim(gnuace, postinstall) { +" cp ../../rules.ciao.GNU $(INSTALL_PREFIX)/share/ciao" +" perl -i -pe's!\\$$[{(]CIAO_ROOT[})]!$(INSTALL_PREFIX)/include!g;' -e'if (/ifndef TAO_IDL3_TO_IDL2\\b/) {print qq!TAO_IDL3_TO_IDL2=$(INSTALL_PREFIX)/share/ciao/bin/tao_idl3_to_idl2\\nTAO_IDL3_TO_IDL2_DEP=\\$$(TAO_IDL3_TO_IDL2)\\$$(EXEEXT)\\n!}' $(INSTALL_PREFIX)/share/ciao/rules.ciao.GNU" +" echo export CIAO_ROOT=$(INSTALL_PREFIX)/share/ciao> $(INSTALL_PREFIX)/share/ciao/ciao-devel.sh" +" echo export DANCE_ROOT=$(INSTALL_PREFIX)/share/DAnCE>> $(INSTALL_PREFIX)/share/ciao/ciao-devel.sh" + } } -project(CIAO_RTComponentServer_exe) : ccm_componentserver_svnt, portableserver, ciao_componentserver_svnt, \ +project(CIAO_RTComponentServer_exe) : install, ccm_componentserver_svnt, portableserver, ciao_componentserver_svnt, \ messaging, anytypecode, ciaoexe, ciao_session_container,\ ciao_logger, rt_server, rtportableserver { exename = ciao_rtcomponentserver @@ -115,5 +150,6 @@ project(CIAO_RTComponentServer_exe) : ccm_componentserver_svnt, portableserver, } IDL_Files { } + } diff --git a/modules/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc b/modules/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc index 9f9843fc0b5..660a57e26ab 100644 --- a/modules/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc +++ b/modules/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc @@ -1,6 +1,6 @@ // $Id$ -project(CIAO_Servant_Activator_stub_idl) : ciaoidldefaults { +project(CIAO_Servant_Activator_stub_idl) : install, ciaoidldefaults { custom_only = 1 idlflags += -Wb,stub_export_include=CIAO_Servant_Activator_export.h \ -Wb,stub_export_macro=CIAO_SERVANT_ACTIVATOR_Export \ @@ -8,9 +8,12 @@ project(CIAO_Servant_Activator_stub_idl) : ciaoidldefaults { IDL_Files { CIAO_Servant_Activator.idl } + specific { + install_dir = ciao/Containers + } } -project(CIAO_Servant_Activator_stub) : ciao_lib, portableserver, ciao_port_activator_stub, avoids_minimum_corba, ciao_logger { +project(CIAO_Servant_Activator_stub) : install, ciao_lib, portableserver, ciao_port_activator_stub, avoids_minimum_corba, ciao_logger { after += CIAO_Servant_Activator_stub_idl dynamicflags = CIAO_SERVANT_ACTIVATOR_BUILD_DLL @@ -20,5 +23,11 @@ project(CIAO_Servant_Activator_stub) : ciao_lib, portableserver, ciao_port_activ Servant_Activator.cpp CIAO_Servant_ActivatorC.cpp } + Header_Files { + CIAO_Servant_Activator_export.h + } + specific { + install_dir = ciao/Containers + } } diff --git a/modules/CIAO/ciao/Containers/Containers.mpc b/modules/CIAO/ciao/Containers/Containers.mpc index 3e17afdb9fd..136477fc2af 100644 --- a/modules/CIAO/ciao/Containers/Containers.mpc +++ b/modules/CIAO/ciao/Containers/Containers.mpc @@ -1,6 +1,6 @@ // $Id$ -project(CIAO_Container_Base_idl) : taoidldefaults { +project(CIAO_Container_Base_idl) : install, taoidldefaults { custom_only = 1 idlflags += -Wb,export_include=Container_Base_export.h \ @@ -10,8 +10,11 @@ project(CIAO_Container_Base_idl) : taoidldefaults { IDL_Files { Container_Base.idl } + specific { + install_dir = ciao/Containers + } } -project(CIAO_Container_Base) : ciao_lib, ccm_svnt, ciao_servant_activator, ciao_port_activator_stub { +project(CIAO_Container_Base) : install, ciao_lib, ccm_svnt, ciao_servant_activator, ciao_port_activator_stub { after += CIAO_Container_Base_idl dynamicflags += CIAO_CONTAINER_BASE_BUILD_DLL @@ -26,5 +29,9 @@ project(CIAO_Container_Base) : ciao_lib, ccm_svnt, ciao_servant_activator, ciao_ } Header_Files { Container_Base.h + Container_Base_export.h + } + specific { + install_dir = ciao/Containers } } diff --git a/modules/CIAO/ciao/Containers/Session/Session_Container.mpc b/modules/CIAO/ciao/Containers/Session/Session_Container.mpc index 261a5eb0e45..5532d41d81c 100644 --- a/modules/CIAO/ciao/Containers/Session/Session_Container.mpc +++ b/modules/CIAO/ciao/Containers/Session/Session_Container.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CIAO_Session_Container_idl) : ciaoidldefaults { +project(CIAO_Session_Container_idl) : install, ciaoidldefaults { custom_only = 1 idlflags += -Wb,export_include=Session_Container_export.h \ -Wb,export_macro=SESSION_CONTAINER_Export \ @@ -9,9 +9,12 @@ project(CIAO_Session_Container_idl) : ciaoidldefaults { IDL_Files { Session_Container.idl } + specific { + install_dir = ciao/Containers/Session + } } -project(CIAO_Session_Container) : ccm_svnt, ciao_lib, ciao_container_base, utils, \ +project(CIAO_Session_Container) : install, ccm_svnt, ciao_lib, ciao_container_base, utils, \ ccm_componentserver_stub, ciao_servant_activator, ciao_servant { after += CIAO_Session_Container_idl dynamicflags += SESSION_CONTAINER_BUILD_DLL @@ -27,4 +30,7 @@ project(CIAO_Session_Container) : ccm_svnt, ciao_lib, ciao_container_base, utils Header_Files { Session_Container.h } + specific { + install_dir = ciao/Containers/Session + } } diff --git a/modules/CIAO/ciao/Contexts/Context.mpc b/modules/CIAO/ciao/Contexts/Context.mpc index 955521cfa3b..f6e75a1b519 100644 --- a/modules/CIAO/ciao/Contexts/Context.mpc +++ b/modules/CIAO/ciao/Contexts/Context.mpc @@ -1,5 +1,5 @@ //$Id$ -project(CIAO_Context_Impl) : ccm_svnt, ciao_container_base, portableserver, ciao_output { +project(CIAO_Context_Impl) : install, ccm_svnt, ciao_container_base, portableserver, ciao_output { dynamicflags = CONTEXT_IMPL_BUILD_DLL Source_Files { Context_Impl_Base.cpp @@ -13,4 +13,7 @@ project(CIAO_Context_Impl) : ccm_svnt, ciao_container_base, portableserver, ciao Inline_Files { Context_Impl_Base.inl } + specific { + install_dir = ciao/Contexts + } } diff --git a/modules/CIAO/ciao/Logger/Logger.mpc b/modules/CIAO/ciao/Logger/Logger.mpc index 987e3a384c4..5144fb2ebe7 100644 --- a/modules/CIAO/ciao/Logger/Logger.mpc +++ b/modules/CIAO/ciao/Logger/Logger.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CIAO_Logger): ciao_lib, taolib, acelib { +project(CIAO_Logger): install, ciao_lib, taolib, acelib { sharedname = CIAO_Logger dynamicflags = CIAO_LOGGER_BUILD_DLL @@ -9,8 +9,13 @@ project(CIAO_Logger): ciao_lib, taolib, acelib { Logger_Service.cpp Log_Macros.cpp } -} - + Header_Files { + CIAO_Logger_Export.h + } + specific { + install_dir = ciao/Logger + } +} diff --git a/modules/CIAO/ciao/Servants/Servants.mpc b/modules/CIAO/ciao/Servants/Servants.mpc index 315ca21218c..b9187986b01 100644 --- a/modules/CIAO/ciao/Servants/Servants.mpc +++ b/modules/CIAO/ciao/Servants/Servants.mpc @@ -1,5 +1,5 @@ // $Id$ -project(CIAO_Port_Activator_stub_idl) : ciaoidldefaults { +project(CIAO_Port_Activator_stub_idl) : install, ciaoidldefaults { custom_only = 1 idlflags += -Wb,stub_export_include=CIAO_Port_Activator_export.h \ -Wb,stub_export_macro=CIAO_PORT_ACTIVATOR_Export \ @@ -7,9 +7,13 @@ project(CIAO_Port_Activator_stub_idl) : ciaoidldefaults { IDL_Files { CIAO_Port_Activator.idl } + + specific { + install_dir = ciao/Servants + } } -project(CIAO_Port_Activator_stub) : portableserver, ciao_lib { +project(CIAO_Port_Activator_stub) : install, portableserver, ciao_lib { dynamicflags = CIAO_PORT_ACTIVATOR_BUILD_DLL after += CIAO_Port_Activator_stub_idl IDL_Files { @@ -19,9 +23,12 @@ project(CIAO_Port_Activator_stub) : portableserver, ciao_lib { } Header_Files { } + specific { + install_dir = ciao/Servants + } } -project(CIAO_Servant_Impl) : ciao_servant_activator, ciao_port_activator_stub, ciao_container_base, ccm_svnt, ciao_output { +project(CIAO_Servant_Impl) : install, ciao_servant_activator, ciao_port_activator_stub, ciao_container_base, ccm_svnt, ciao_output { dynamicflags = CIAO_SERVANT_IMPL_BUILD_DLL IDL_Files { } @@ -37,7 +44,7 @@ project(CIAO_Servant_Impl) : ciao_servant_activator, ciao_port_activator_stub, c } Template_Files { - Connector_Servant_Impl_Utils.cpp + Connector_Servant_Impl_Utils_T.cpp Servant_Impl_Utils_T.cpp Port_Activator_T.cpp } @@ -52,9 +59,11 @@ project(CIAO_Servant_Impl) : ciao_servant_activator, ciao_port_activator_stub, c StandardConfigurator_Impl.h Port_Activator.h Port_Activator_T.h + CIAO_Port_Activator_export.h } - Inline_Files { - Port_Activator.inl - } + specific { + install_dir = ciao/Servants + } + } diff --git a/modules/CIAO/ciao/Valuetype_Factories/Factories.mpc b/modules/CIAO/ciao/Valuetype_Factories/Factories.mpc index c03e88e1ec8..4b112b0b2d1 100644 --- a/modules/CIAO/ciao/Valuetype_Factories/Factories.mpc +++ b/modules/CIAO/ciao/Valuetype_Factories/Factories.mpc @@ -1,23 +1,31 @@ //$Id$ -project(CCM_Cookie_Factory) : ccm_stub, ciao_lib { +project(CCM_Cookie_Factory) : install, ccm_stub, ciao_lib { dynamicflags = COOKIE_FACTORY_BUILD_DLL Source_Files { Cookies.cpp } Header_Files { Cookies.h + Cookie_Export.h } Inline_Files { Cookies.inl } + specific { + install_dir = ciao/Valuetype_Factories + } } -project(CCM_ConfigValue_Factory) : ccm_stub, ciao_lib { +project(CCM_ConfigValue_Factory) : install, ccm_stub, ciao_lib { dynamicflags = CONFIGVALUE_FACTORY_BUILD_DLL Source_Files { ConfigValue.cpp } Header_Files { ConfigValue.h + ConfigValue_Export.h } + specific { + install_dir = ciao/Valuetype_Factories + } } diff --git a/modules/CIAO/ciao/install_versionh.mpc b/modules/CIAO/ciao/install_versionh.mpc new file mode 100644 index 00000000000..9af4e0ee187 --- /dev/null +++ b/modules/CIAO/ciao/install_versionh.mpc @@ -0,0 +1,12 @@ +// $Id$ +project : install { + custom_only = 1 + Define_Custom(InstallHeader) { + } + InstallHeader_Files { + Version.h + } + specific { + custom_inst_tags = installheader_files + } +} diff --git a/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl b/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl index 1d572fd554d..ad43df11f04 100644 --- a/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl +++ b/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl @@ -21,21 +21,21 @@ module CCM_AMI { }; - connector AMI_Base + connector AMI4CCM_Base { }; - module Connector_T<interface T, interface AMI_T> + module Connector_T<interface T, interface AMI4CCM_T> { - porttype AMI_Port + porttype AMI4CCM_Port { - provides AMI_T sendc_run; - uses T run; + provides AMI4CCM_T ami4ccm_provides; + uses T ami4ccm_uses; }; - connector The_Connector : AMI_Base + connector AMI4CCM_Connector : AMI4CCM_Base { - port AMI_Port The_Port; + port AMI4CCM_Port ami4ccm_port; }; }; }; diff --git a/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc b/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc index d039fd5d7bf..3cf10040be3 100644 --- a/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc +++ b/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc @@ -1,6 +1,6 @@ // $Id$ -project(AMI4CCM_idl_gen) : componentidldefaults { +project(AMI4CCM_idl_gen) : install, componentidldefaults { custom_only = 1 idlflags += -Wb,stub_export_macro=AMI4CCM_STUB_Export \ -Wb,stub_export_include=ami4ccm_stub_export.h \ @@ -14,7 +14,7 @@ project(AMI4CCM_idl_gen) : componentidldefaults { } } -project (AMI4CCM_lem_gen) : ciaoidldefaults { +project (AMI4CCM_lem_gen) : install, ciaoidldefaults { custom_only = 1 after += AMI4CCM_idl_gen idlflags += -I$(CIAO_ROOT)/connectors \ @@ -27,7 +27,7 @@ project (AMI4CCM_lem_gen) : ciaoidldefaults { } } -project(AMI4CCM_stub) : ciao_lib, messaging, ccm_stub { +project(AMI4CCM_stub) : install, ciao_lib, messaging, ccm_stub { after += AMI4CCM_idl_gen sharedname = AMI4CCM_stub dynamicflags = AMI4CCM_STUB_BUILD_DLL @@ -45,14 +45,13 @@ project(AMI4CCM_stub) : ciao_lib, messaging, ccm_stub { } Inline_Files { - ami4ccmC.inl } IDL_Files { } } -project (AMI4CCM_lem_stub) : ccm_lem_stub, ciao_lib, ciao_output, taolib, valuetype, ifr_client { +project (AMI4CCM_lem_stub) : install, ccm_lem_stub, ciao_lib, ciao_output, taolib, valuetype, ifr_client { after += AMI4CCM_stub AMI4CCM_lem_gen libs += AMI4CCM_stub includes += $(CIAO_ROOT)/connectors @@ -75,7 +74,7 @@ project (AMI4CCM_lem_stub) : ccm_lem_stub, ciao_lib, ciao_output, taolib, valuet } } -project (AMI4CCM_svnt) : ciao_servant, ciao_lib { +project (AMI4CCM_svnt) : install, ciao_servant, ciao_lib { after += AMI4CCM_lem_stub libs += AMI4CCM_lem_stub AMI4CCM_stub includes += $(CIAO_ROOT)/connectors @@ -98,6 +97,5 @@ project (AMI4CCM_svnt) : ciao_servant, ciao_lib { Inline_Files { ami4ccmS.inl - ami4ccm_svnt.inl } } diff --git a/modules/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc b/modules/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc index 459fd381e26..4c56294f14a 100644 --- a/modules/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc +++ b/modules/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc @@ -41,7 +41,7 @@ project(AMI_Hello_lema_gen) : ciaoidldefaults { -Wb,svnt_export_include=Hello_svnt_export.h \ -Wb,skel_export_macro=HELLO_SKEL_Export \ -Wb,skel_export_include=Hello_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv + -I.. -Gsv -Gcn -Glem -GM -Gxhst -Gxhsv IDL_Files { HelloA.idl @@ -161,7 +161,7 @@ project(AMI_Hello_conn) : ciao_executor, ami, ami4ccm_lem_stub { Header_Files { HelloA_conn.h - HelloA_conn_export.h + Hello_conn_export.h } Inline_Files { diff --git a/modules/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/modules/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp index 1050cb0deda..d52ad10d002 100644 --- a/modules/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp +++ b/modules/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp @@ -141,8 +141,8 @@ namespace CIAO_Hello_Sender_Impl //============================================================ // Worker thread for asynchronous invocations for MyFoo //============================================================ - asynch_foo_generator::asynch_foo_generator (::Hello::AMI_MyFoo_ptr my_foo_ami) - : my_foo_ami_ (::Hello::AMI_MyFoo::_duplicate (my_foo_ami)) + asynch_foo_generator::asynch_foo_generator (::Hello::AMI4CCM_MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::Hello::AMI4CCM_MyFoo::_duplicate (my_foo_ami)) { } @@ -293,7 +293,7 @@ namespace CIAO_Hello_Sender_Impl void Sender_exec_i::ccm_activate (void) { - ::Hello::AMI_MyFoo_var asynch_foo = + ::Hello::AMI4CCM_MyFoo_var asynch_foo = this->context_->get_connection_sendc_run_my_foo(); asynch_foo_generator* asynch_foo_gen = new asynch_foo_generator (asynch_foo); diff --git a/modules/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/modules/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h index fcf69d9bdee..4e104fb4cfd 100644 --- a/modules/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h +++ b/modules/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h @@ -31,12 +31,12 @@ namespace CIAO_Hello_Sender_Impl class asynch_foo_generator : public virtual ACE_Task_Base { public: - asynch_foo_generator (::Hello::AMI_MyFoo_ptr my_foo_ami); + asynch_foo_generator (::Hello::AMI4CCM_MyFoo_ptr my_foo_ami); virtual int svc (void); private: - ::Hello::AMI_MyFoo_var my_foo_ami_; + ::Hello::AMI4CCM_MyFoo_var my_foo_ami_; }; /// Worker thread for synchronous invocations @@ -52,7 +52,7 @@ namespace CIAO_Hello_Sender_Impl }; class MyFoo_callback_exec_i - : public virtual ::Hello::CCM_AMI_MyFooCallback, + : public virtual ::Hello::CCM_AMI4CCM_MyFooReplyHandler, public virtual ::CORBA::LocalObject { public: diff --git a/modules/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp b/modules/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp index 519c4bbabdc..f5d75b42e1a 100644 --- a/modules/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp @@ -117,7 +117,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_AMI_MyFoo_Connector_Impl</string> + <string>create_Hello_AMI4CCM_MyFoo_Connector_Impl</string> </value> </value> </execParameter> @@ -139,7 +139,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> @@ -223,7 +223,8 @@ <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_sendc_run</portName> + <portName>ami4ccm_port_ami4ccm_provides</portName> + <!--portName>The_Port_sendc_run</portName--> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" /> @@ -239,7 +240,8 @@ <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Receiver" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_run</portName> + <!-->portName>The_Port_run</portName--> + <portName>ami4ccm_port_ami4ccm_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" /> @@ -274,7 +276,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> @@ -292,7 +294,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_AMI_MyFoo_Connector_Impl</string> + <string>create_Hello_AMI4CCM_MyFoo_Connector_Impl</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl new file mode 100644 index 00000000000..4ac047eb2a1 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl @@ -0,0 +1,36 @@ +// $Id$ + +#ifndef DELREPLYH_IDL +#define DELREPLYH_IDL + +#pragma ciao lem "Base/DelReplyHE.idl" +#pragma ciao ami4ccm interface "DelReplyH::MyFoo" +#pragma ciao lem "Base/DelReplyHAE.idl" + +module DelReplyH +{ + exception InternalError + { + long id; + string error_string; + }; + + // Sender/Receiver interface + interface MyFoo + { + long foo (in string in_str, out string answer) + raises (InternalError); + // void hello (out long answer) + // raises (InternalError); + + // attribute short rw_attrib + // getraises (InternalError) + // setraises (InternalError); + + // readonly attribute short ro_attrib + // raises (InternalError); + }; +}; + +#endif + diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc new file mode 100644 index 00000000000..9ff98f3698e --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc @@ -0,0 +1,196 @@ +// $Id$ + +project(AMI_DelReplyH_idl_gen) : componentidldefaults, ami, ami4ccm_stub { + custom_only = 1 + idlflags += -Wb,stub_export_macro=DELREPLYH_STUB_Export \ + -Wb,stub_export_include=DelReplyH_stub_export.h \ + -Wb,skel_export_macro=DELREPLYH_SKEL_Export \ + -Wb,skel_export_include=DelReplyH_skel_export.h \ + -Wb,conn_export_macro=DELREPLYH_CONN_Export \ + -Wb,conn_export_include=DelReplyH_conn_export.h \ + -Wb,exec_export_macro=DELREPLYH_EXEC_Export \ + -Wb,exec_export_include=DelReplyH_exec_export.h \ + -I.. -GM -Gxhcn + idlflags -= -Gsv + + IDL_Files { + DelReplyH.idl + } +} + +project(AMI_DelReplyH_lem_gen) : ciaoidldefaults { + after += AMI_DelReplyH_idl_gen AMI_DelReplyH_lema_gen + custom_only = 1 + idlflags += -Wb,export_macro=DELREPLYH_LEM_STUB_Export \ + -Wb,export_include=DelReplyH_lem_stub_export.h \ + -I.. -SS -Gxhst + + IDL_Files { + DelReplyHE.idl + } +} + +project(AMI_DelReplyH_lema_gen) : ciaoidldefaults { + after += AMI_DelReplyH_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=DELREPLYH_STUB_Export \ + -Wb,stub_export_include=DelReplyH_stub_export.h \ + -Wb,conn_export_macro=DELREPLYH_CONN_Export \ + -Wb,conn_export_include=DelReplyH_conn_export.h \ + -Wb,svnt_export_macro=DELREPLYH_SVNT_Export \ + -Wb,svnt_export_include=DelReplyH_svnt_export.h \ + -Wb,skel_export_macro=DELREPLYH_SKEL_Export \ + -Wb,skel_export_include=DelReplyH_skel_export.h \ + -I.. -Gsv -Gcn -Glem -GM -Gxhst -Gxhsv + + IDL_Files { + DelReplyHA.idl + } +} + +project(AMI_DelReplyH_lemae_gen) : ciaoidldefaults { + after += AMI_DelReplyH_lema_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=DELREPLYH_LEM_STUB_Export \ + -Wb,stub_export_include=DelReplyH_lem_stub_export.h \ + -I.. -SS + + IDL_Files { + DelReplyHAE.idl + } +} + +project(AMI_DelReplyH_stub) : ccm_stub, ami, ami4ccm_stub { + after += AMI_DelReplyH_lem_gen + libs += + libout = ../lib + libpaths += ../lib + includes += .. + + sharedname = DelReplyH_stub + dynamicflags = DELREPLYH_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + DelReplyHC.cpp + DelReplyHAC.cpp + } + + Header_Files { + DelReplyHC.h + DelReplyH_stub_export.h +} + + Inline_Files { + DelReplyHC.inl + } +} + +project(AMI_DelReplyH_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { + after += AMI_DelReplyH_lem_gen AMI_DelReplyH_stub AMI_DelReplyH_lemae_gen AMI_DelReplyH_skel + libs += DelReplyH_stub DelReplyH_skel + libout = ../lib + libpaths += ../lib + includes += .. + + sharedname = DelReplyH_lem_stub + dynamicflags = DELREPLYH_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + DelReplyHEC.cpp + DelReplyHAEC.cpp + } + + Header_Files { + DelReplyHEC.h + DelReplyH_lem_stub_export.h +} + + Inline_Files { + DelReplyHEC.inl + } +} + +project(AMI_DelReplyH_skel) : ciao_executor, ami, ami4ccm_servant { + after += AMI_DelReplyH_stub + sharedname = DelReplyH_skel + libs += DelReplyH_stub + libout = ../lib + libpaths += ../lib + includes += .. + + dynamicflags = DELREPLYH_SKEL_BUILD_DLL + + IDL_Files { + } + + Source_Files { + DelReplyHS.cpp + DelReplyHAS.cpp + } + + Header_Files { + DelReplyHS.h + + DelReplyH_skel_export.h + } + + Inline_Files { + DelReplyHS.inl + + } +} + +project(AMI_DelReplyH_conn) : ciao_executor, ami, ami4ccm_lem_stub { + after += AMI_DelReplyH_lem_stub DelReplyH_Base_AMI_stub AMI_DelReplyH_skel AMI_DelReplyH_lema_gen AMI_DelReplyH_lemae_gen + sharedname = DelReplyH_conn + libs += DelReplyH_stub DelReplyH_skel DelReplyH_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = DELREPLYH_CONN_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyHA_conn.cpp + } + + Header_Files { + DelReplyHA_conn.h + DelReplyH_conn_export.h + } + + Inline_Files { + } +} + +project(AMI_DelReplyH_svnt) : ciao_servant, ami, ami4ccm_servant { + after += AMI_DelReplyH_lem_stub DelReplyH_Base_AMI_stub AMI_DelReplyH_skel AMI_DelReplyH_lema_gen AMI_DelReplyH_lemae_gen AMI_DelReplyH_conn + sharedname = DelReplyH_svnt + libs += DelReplyH_stub DelReplyH_skel DelReplyH_lem_stub DelReplyH_conn + libpaths += ../lib + libout = ../lib + dynamicflags = DELREPLYH_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyHA_svnt.cpp + } + + Header_Files { + DelReplyHA_svnt.h + DelReplyHA_svnt_export.h + } + + Inline_Files { + } +} + diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl new file mode 100644 index 00000000000..0121d62b119 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl @@ -0,0 +1,18 @@ +// $Id$ + +#ifndef DELREPLYH_RECEIVER_IDL +#define DELREPLYH_RECEIVER_IDL + +#include <Components.idl> + +#include "Base/DelReplyH.idl" + +module DelReplyH +{ + component Receiver + { + /// Provides + provides MyFoo do_my_foo; + }; +}; +#endif diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc new file mode 100644 index 00000000000..3869f6f33bd --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc @@ -0,0 +1,134 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p DelReplyH_Base DelReplyH_Receiver" + +project(AMI_DelReplyH_Base_Receiver_idl_gen) : componentidldefaults { + custom_only = 1 + after += AMI_DelReplyH_idl_gen + idlflags += -Wb,stub_export_macro=DELREPLYH_RECEIVER_STUB_Export \ + -Wb,stub_export_include=DelReplyH_Receiver_stub_export.h \ + -Wb,skel_export_macro=DELREPLYH_RECEIVER_SVNT_Export \ + -Wb,skel_export_include=DelReplyH_Receiver_svnt_export.h \ + -Wb,exec_export_macro=DELREPLYH_RECEIVER_EXEC_Export \ + -Wb,exec_export_include=DelReplyH_Receiver_exec_export.h \ + -Glem -I.. + + IDL_Files { + DelReplyH_Receiver.idl + } +} + +project(AMI_DelReplyH_Base_Receiver_lem_gen) : ciaoidldefaults { + after += AMI_DelReplyH_Base_Receiver_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=DELREPLYH_RECEIVER_LEM_STUB_Export \ + -Wb,stub_export_include=DelReplyH_Receiver_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + DelReplyH_ReceiverE.idl + } +} + +project(AMI_DelReplyH_Base_Receiver_l_stub) : ccm_svnt, messaging { + after += AMI_DelReplyH_Base_Receiver_lem_gen AMI_DelReplyH_Base_Receiver_stub AMI_DelReplyH_stub + libs += DelReplyH_stub DelReplyH_Receiver_stub + libpaths += ../lib + libout = ../lib + sharedname = DelReplyH_Receiver_lem_stub + dynamicflags = DELREPLYH_RECEIVER_LEM_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyH_ReceiverEC.cpp + } + + Header_Files { + DelReplyH_ReceiverEC.h + DelReplyH_Receiver_lem_stub_export.h + } + + Inline_Files { + DelReplyH_ReceiverEC.inl + } +} + +project(AMI_DelReplyH_Base_Receiver_stub) : ccm_stub, messaging { + after += AMI_DelReplyH_Base_Receiver_idl_gen AMI_DelReplyH_stub + libs += DelReplyH_stub + libpaths += ../lib + libout = ../lib + sharedname = DelReplyH_Receiver_stub + dynamicflags = DELREPLYH_RECEIVER_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyH_ReceiverC.cpp + } + + Header_Files { + DelReplyH_ReceiverC.h + DelReplyH_Receiver_stub_export.h + } + + Inline_Files { + DelReplyH_ReceiverC.inl + } +} + +project(AMI_DelReplyH_Base_Receiver_exec) : ciao_executor, messaging { + after += AMI_DelReplyH_Base_Receiver_l_stub AMI_DelReplyH_Base_Receiver_stub AMI_DelReplyH_stub AMI_DelReplyH_lem_stub + sharedname = DelReplyH_Receiver_exec + libs += DelReplyH_Receiver_stub DelReplyH_Receiver_lem_stub DelReplyH_stub DelReplyH_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = DELREPLYH_RECEIVER_EXEC_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyH_Receiver_exec.cpp + } + + Header_Files { + DelReplyH_Receiver_exec.h + DelReplyH_Receiver_exec_export.h + } + + Inline_Files { + } +} + +project(AMI_DelReplyH_Base_Receiver_svnt) : ciao_servant, messaging { + after += AMI_DelReplyH_Base_skel AMI_DelReplyH_Base_Receiver_l_stub AMI_DelReplyH_stub AMI_DelReplyH_skel AMI_DelReplyH_lem_stub + sharedname = DelReplyH_Receiver_svnt + libs += DelReplyH_Receiver_stub DelReplyH_Receiver_lem_stub \ + DelReplyH_skel \ + DelReplyH_stub DelReplyH_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = DELREPLYH_RECEIVER_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyH_ReceiverS.cpp + DelReplyH_Receiver_svnt.cpp + } + + Header_Files { + DelReplyH_ReceiverS.h + DelReplyH_Receiver_svnt.h + DelReplyH_Receiver_svnt_export.h + } + + Inline_Files { + DelReplyH_ReceiverS.inl + } +} + diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp new file mode 100644 index 00000000000..bee33daebb0 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp @@ -0,0 +1,92 @@ +// -*- C++ -*- +// $Id$ + +#include "DelReplyH_Receiver_exec.h" +#include "ace/OS_NS_unistd.h" + +namespace CIAO_DelReplyH_Receiver_Impl +{ + MyFoo_exec_i::MyFoo_exec_i (void) + { + } + + MyFoo_exec_i::~MyFoo_exec_i (void) + { + } + + ::CORBA::Long + MyFoo_exec_i::foo (const char * in_str, ::CORBA::String_out answer) + { + if (ACE_OS::strlen (in_str) == 0) + { + DelReplyH::InternalError ex (42, "Hello world"); + throw ex; + } + else + { + ACE_OS::sleep (ACE_OS::rand () % 2); + answer = CORBA::string_dup ("This is my answer : Hi"); + return 1; + } + } + + Receiver_exec_i::Receiver_exec_i (void) + { + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + } + + ::DelReplyH::CCM_MyFoo_ptr + Receiver_exec_i::get_do_my_foo (void) + { + return new MyFoo_exec_i (); + } + + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = ::DelReplyH::CCM_Receiver_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Receiver_exec_i::configuration_complete (void) + { + } + + void + Receiver_exec_i::ccm_activate (void) + { + } + + void + Receiver_exec_i::ccm_passivate (void) + { + } + + void + Receiver_exec_i::ccm_remove (void) + { + } + + extern "C" ::Components::EnterpriseComponent_ptr + create_DelReplyH_AMI_Receiver_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_RETURN ( + retval, + Receiver_exec_i, + ::Components::EnterpriseComponent::_nil ()); + + return retval; + } +} diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h new file mode 100644 index 00000000000..c7d94637f1e --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h @@ -0,0 +1,56 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_DELREPLYH_RECEIVER_EXEC_H_ +#define CIAO_DELREPLYH_RECEIVER_EXEC_H_ + +#include "DelReplyH_ReceiverEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "DelReplyH_Receiver_exec_export.h" + +namespace CIAO_DelReplyH_Receiver_Impl +{ + + class MyFoo_exec_i + : public virtual ::DelReplyH::CCM_MyFoo, + public virtual ::CORBA::LocalObject + { + public: + MyFoo_exec_i (void); + virtual ~MyFoo_exec_i (void); + + virtual ::CORBA::Long foo (const char * in_str, ::CORBA::String_out answer); + }; + + class Receiver_exec_i + : public virtual Receiver_Exec, + public virtual ::CORBA::LocalObject + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + virtual ::DelReplyH::CCM_MyFoo_ptr get_do_my_foo (void); + + 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: + ::DelReplyH::CCM_Receiver_Context_var context_; + }; + + extern "C" DELREPLYH_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_DelReplyH_AMI_Receiver_Impl (void); +} + +#endif /* ifndef */ diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl new file mode 100644 index 00000000000..b7166344466 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl @@ -0,0 +1,21 @@ +// $Id$ + +#ifndef DELREPLYH_SENDER_IDL +#define DELREPLYH_SENDER_IDL + +#include <Components.idl> + +#include "Base/DelReplyH.idl" + +#pragma ciao ami4ccm receptacle "DelReplyH::Sender::run_my_foo" + +module DelReplyH +{ + component Sender + { + /// For synchronous invocation + uses MyFoo run_my_foo; + }; +}; + +#endif diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc new file mode 100644 index 00000000000..121aa35211a --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc @@ -0,0 +1,134 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p DelReplyH_Base DelReplyH_Sender" + +project(AMI_DelReplyH_Base_Sender_idl_gen) : componentidldefaults { + after += Conn_DelReplyH_Base_idl_gen AMI_DelReplyH_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=DELREPLYH_SENDER_STUB_Export \ + -Wb,stub_export_include=DelReplyH_Sender_stub_export.h \ + -Wb,skel_export_macro=DELREPLYH_SENDER_SVNT_Export \ + -Wb,skel_export_include=DelReplyH_Sender_svnt_export.h \ + -Wb,exec_export_macro=DELREPLYH_SENDER_EXEC_Export \ + -Wb,exec_export_include=DelReplyH_Sender_exec_export.h \ + -I.. -GM + + IDL_Files { + DelReplyH_Sender.idl + } +} + +project(AMI_DelReplyH_Base_Sender_lem_gen) : ciaoidldefaults { + after += AMI_DelReplyH_Base_Sender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=DELREPLYH_SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=DelReplyH_Sender_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + DelReplyH_SenderE.idl + } +} + +project(AMI_DelReplyH_Base_Sender_lem_stub) : ccm_svnt, ami { + after += AMI_DelReplyH_Base_Sender_lem_gen AMI_DelReplyH_stub Conn_DelReplyH_Base_stub + libs += DelReplyH_stub + libpaths += ../lib + libout = ../lib + sharedname = DelReplyH_Sender_lem_stub + dynamicflags = DELREPLYH_SENDER_LEM_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyH_SenderEC.cpp + } + + Header_Files { + DelReplyH_SenderEC.h + DelReplyH_Sender_lem_stub_export.h + } + + Inline_Files { + DelReplyH_SenderEC.inl + } +} + +project(AMI_DelReplyH_Base_Sender_stub) : ccm_stub, ami { + after += AMI_DelReplyH_Base_Sender_idl_gen AMI_DelReplyH_Base_stub AMI_DelReplyH_stub Conn_DelReplyH_Base_stub + libs += DelReplyH_stub + libpaths += ../lib + libout = ../lib + sharedname = DelReplyH_Sender_stub + dynamicflags = DELREPLYH_SENDER_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyH_SenderC.cpp + } + + Header_Files { + DelReplyH_SenderC.h + DelReplyH_Sender_stub_export.h + } + + Inline_Files { + DelReplyH_SenderC.inl + } +} + +project(AMI_DelReplyH_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { + after += AMI_DelReplyH_Base_Sender_lem_stub AMI_DelReplyH_Base_Sender_stub AMI_DelReplyH_Base_exec Conn_DelReplyH_Base_stub AMI_DelReplyH_lem_stub + sharedname = DelReplyH_Sender_exec + libs += DelReplyH_Sender_stub DelReplyH_Sender_lem_stub DelReplyH_stub DelReplyH_stub DelReplyH_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = DELREPLYH_SENDER_EXEC_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyH_Sender_exec.cpp + } + + Header_Files { + DelReplyH_Sender_exec.h + DelReplyH_Sender_exec_export.h + } + + Inline_Files { + } +} + +project(AMI_DelReplyH_Base_Sender_svnt) : ciao_servant, ami { + after += AMI_DelReplyH_Base_skel AMI_DelReplyH_Base_Sender_lem_stub AMI_DelReplyH_Base_exec AMI_DelReplyH_skel + sharedname = DelReplyH_Sender_svnt + libs += DelReplyH_Sender_stub DelReplyH_Sender_lem_stub \ + DelReplyH_skel \ + DelReplyH_stub + libpaths += ../lib + libout = ../lib + dynamicflags = DELREPLYH_SENDER_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + DelReplyH_SenderS.cpp + DelReplyH_Sender_svnt.cpp + } + + Header_Files { + DelReplyH_SenderS.h + DelReplyH_Sender_svnt.h + DelReplyH_Sender_svnt_export.h + } + + Inline_Files { + DelReplyH_SenderS.inl + } +} + diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp new file mode 100644 index 00000000000..4709cb60ff5 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp @@ -0,0 +1,206 @@ +// -*- C++ -*- +// $Id$ + +#include "DelReplyH_Sender_exec.h" +#include "ace/OS_NS_unistd.h" + +namespace CIAO_DelReplyH_Sender_Impl +{ + Atomic_UShort nr_callbacks = 0; + Atomic_UShort nr_exceptions = 0; + + //============================================================ + // Facet Executor Implementation Class: MyFoo_callback_exec_i + //============================================================ + MyFoo_callback_exec_i::MyFoo_callback_exec_i (void) + { + ACE_DEBUG ((LM_DEBUG,"CONSTRUCTOR replyhandle\n")); + ++nr_callbacks; + } + + MyFoo_callback_exec_i::~MyFoo_callback_exec_i (void) + { + ACE_DEBUG ((LM_DEBUG,"DESTRUCTOR replyhandle\n")); + --nr_callbacks; + } + + void + MyFoo_callback_exec_i::_add_ref (void) + { + ACE_DEBUG ((LM_DEBUG,"add_ref replyhandle\n")); + ::CORBA::Object::_add_ref (); + } + + void + MyFoo_callback_exec_i::_remove_ref (void) + { + ACE_DEBUG ((LM_DEBUG,"remove_ref replyhandle\n")); + ::CORBA::Object::_remove_ref (); + } + + //============================================================ + // Operations from ::CCM_AMI::MyFoo_callback + //============================================================ + + // FOO methods + void + MyFoo_callback_exec_i::foo ( + ::CORBA::Long /*ami_return_val*/, + const char * answer) + { + ACE_DEBUG ((LM_DEBUG, "OK: ASYNCH foo() returns answer: %C.\n", + answer)); + } + + void + MyFoo_callback_exec_i::foo_excep ( + ::CCM_AMI::ExceptionHolder * /*excep_holder*/) + { + ++nr_exceptions; + } + + //============================================================ + // Worker thread for asynchronous invocations for MyFoo + //============================================================ + asynch_foo_generator::asynch_foo_generator ( + ::DelReplyH::AMI4CCM_MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::DelReplyH::AMI4CCM_MyFoo::_duplicate (my_foo_ami)) + { + } + + int asynch_foo_generator::svc () + { + ACE_OS::sleep (3); + if (CORBA::is_nil (my_foo_ami_)) + { + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + return 1; + } + else + { + //Invoke Asynchronous calls + //test with replyhandler. + ::DelReplyH::CCM_AMI4CCM_MyFooReplyHandler_var cb = + new MyFoo_callback_exec_i (); + my_foo_ami_->sendc_foo(cb.in(), + "Do something asynchronous"); + + } + //Invoke Asynchronous calls to test exception handling + ::DelReplyH::CCM_AMI4CCM_MyFooReplyHandler_var cb2 = + new MyFoo_callback_exec_i (); + my_foo_ami_->sendc_foo (cb2.in (), ""); + + return 0; + } + + //============================================================ + // Worker thread for synchronous invocations for MyFoo + //============================================================ + synch_foo_generator::synch_foo_generator (::DelReplyH::MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::DelReplyH::MyFoo::_duplicate (my_foo_ami)) + { + } + + int synch_foo_generator::svc () + { + ACE_OS::sleep (3); + //run some synch calls + try + { + char *answer = 0; + my_foo_ami_->foo("synchroon call", answer); + ACE_DEBUG ((LM_DEBUG, "OK: SYNCH foo returns <%C>.\n", + answer)); + } + catch (const DelReplyH::InternalError& ) + { + ACE_ERROR ((LM_ERROR, "ERROR: SYNCH foo(): " + "Unexpected return.\n")); + } + return 0; + } + + //============================================================ + // Component Executor Implementation Class: Sender_exec_i + //============================================================ + Sender_exec_i::Sender_exec_i (void) + : global_foo_callback_ (0) + { + } + + Sender_exec_i::~Sender_exec_i (void) + { + } + + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = ::DelReplyH::CCM_Sender_Context::_narrow (ctx); + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + } + + void + Sender_exec_i::ccm_activate (void) + { + ::DelReplyH::AMI4CCM_MyFoo_var asynch_foo = + this->context_->get_connection_sendc_run_my_foo(); + asynch_foo_generator* asynch_foo_gen = + new asynch_foo_generator (asynch_foo); + asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); + + ::DelReplyH::MyFoo_var synch_foo = + this->context_->get_connection_run_my_foo (); + synch_foo_generator* synch_foo_gen = + new synch_foo_generator (synch_foo); + synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); + } + + void + Sender_exec_i::ccm_passivate (void) + { + } + + void + Sender_exec_i::ccm_remove (void) + { + if (nr_callbacks.value() != 0) + { + ACE_ERROR ((LM_ERROR, "ERROR: Not all ReplyHandlers were " + "deleted, %d left.\n", nr_callbacks.value ())); + } + if (nr_exceptions.value() != 1) + { + ACE_ERROR ((LM_ERROR, "ERROR: Wrong number of exceptions received. " + "Expected : 1, Received = %u.\n",nr_exceptions.value())); + } + if ((nr_callbacks.value() == 0) && (nr_exceptions.value() == 1)) + { + ACE_DEBUG ((LM_DEBUG, + "OK: All constructed ReplyHandlers were deleted.\n")); + } + } + + extern "C" ::Components::EnterpriseComponent_ptr + create_DelReplyH_AMI_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_RETURN ( + retval, + Sender_exec_i, + ::Components::EnterpriseComponent::_nil ()); + + return retval; + } +} diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h new file mode 100644 index 00000000000..9edac4c3cab --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h @@ -0,0 +1,91 @@ +// -*- C++ -*- +// +// $Id$ + +#ifndef CIAO_DELREPLYH_SENDER_EXEC_H_ +#define CIAO_DELREPLYH_SENDER_EXEC_H_ + +#include "DelReplyH_SenderEC.h" +#include "DelReplyH_Sender_exec_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "ace/Task.h" + +namespace CIAO_DelReplyH_Sender_Impl +{ + + typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::UShort > Atomic_UShort; + + /// Worker thread for asynchronous invocations + class asynch_foo_generator : public virtual ACE_Task_Base + { + public: + asynch_foo_generator (::DelReplyH::AMI4CCM_MyFoo_ptr my_foo_ami); + + virtual int svc (void); + + private: + ::DelReplyH::AMI4CCM_MyFoo_var my_foo_ami_; + }; + + /// Worker thread for synchronous invocations + class synch_foo_generator : public virtual ACE_Task_Base + { + public: + synch_foo_generator (::DelReplyH::MyFoo_ptr my_foo_ami); + + virtual int svc (void); + + private: + ::DelReplyH::MyFoo_var my_foo_ami_; + }; + + class MyFoo_callback_exec_i + : public virtual ::DelReplyH::CCM_AMI4CCM_MyFooReplyHandler, + public virtual ::CORBA::LocalObject + { + public: + MyFoo_callback_exec_i (void); + virtual ~MyFoo_callback_exec_i (void); + + virtual void foo (::CORBA::Long ami_return_val, const char * answer); + + virtual void foo_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void _add_ref (void); + + virtual void _remove_ref (void); + }; + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + 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: + ::DelReplyH::CCM_Sender_Context_var context_; + MyFoo_callback_exec_i* global_foo_callback_; + }; + + extern "C" DELREPLYH_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_DelReplyH_AMI_Sender_Impl (void); +} + +#endif /* ifndef */ diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/Plan.cdp b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/Plan.cdp new file mode 100644 index 00000000000..dbb355c867b --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/Plan.cdp @@ -0,0 +1,373 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<Deployment:DeploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <UUID>6D382DAE-9024-4C4D-B91B-A0F9176AFACF</UUID> + + <implementation xmi:id="DelReplyH_ReceiverHomeImplementation"> + <name>DelReplyH_ReceiverHomeImplementation</name> + <source/> + <artifact xmi:idref="DelReplyH_Receiver_ExecArtifact"/> + <artifact xmi:idref="DelReplyH_Receiver_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>DelReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>DelReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="DelReplyH_SenderHomeImplementation"> + <name>DelReplyH_SenderHomeImplementation</name> + <source/> + <artifact xmi:idref="DelReplyH_Sender_ExecArtifact"/> + <artifact xmi:idref="DelReplyH_Sender_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>DelReplyH.ImplementationArtifacts.SenderArtifacts.Sender_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>DelReplyH.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="DelReplyH_AMIHomeImplementation"> + <name>DelReplyH_AMIHomeImplementation</name> + <source/> + <artifact xmi:idref="DelReplyH_AMI_ExecArtifact"/> + <artifact xmi:idref="DelReplyH_AMI_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI4CCM_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>DelReplyH.ImplementationArtifacts.AMIArtifacts.AMI_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>DelReplyH.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Receiver"> + <name>DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Receiver</name> + <node>Receiver</node> + <source/> + <implementation xmi:idref="DelReplyH_ReceiverHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Sender"> + <name>DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Sender</name> + <node>Sender</node> + <source/> + <implementation xmi:idref="DelReplyH_SenderHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.AMI"> + <name>DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.AMI</name> + <node>Sender</node> + <source/> + <implementation xmi:idref="DelReplyH_AMIHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>AMI.ior</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>run_asynch_foo_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>sendc_run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Sender" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_provides</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>do_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_uses</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>synch_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Sender" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="DelReplyH_AMI_SvntArtifact"> + <name>DelReplyH.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name> + <source/> + <node/> + <location>DelReplyH_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="DelReplyH_AMI_ExecArtifact"> + <name>DelReplyH.ImplementationArtifacts.AMIArtifacts.AMI_exec</name> + <source/> + <node/> + <location>DelReplyH_conn</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="DelReplyH_Receiver_SvntArtifact"> + <name>DelReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name> + <source/> + <node/> + <location>DelReplyH_Receiver_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="DelReplyH_Receiver_ExecArtifact"> + <name>DelReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name> + <source/> + <node/> + <location>DelReplyH_Receiver_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI_ReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="DelReplyH_Sender_SvntArtifact"> + <name>DelReplyH.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name> + <source/> + <node/> + <location>DelReplyH_Sender_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="DelReplyH_Sender_ExecArtifact"> + <name>DelReplyH.ImplementationArtifacts.SenderArtifacts.Sender_exec</name> + <source/> + <node/> + <location>DelReplyH_Sender_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_DelReplyH_AMI_SenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + +</Deployment:DeploymentPlan> diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl new file mode 100644 index 00000000000..b450136def5 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl @@ -0,0 +1,244 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 3; +@ports = ( 60000, 60001 ); +@iorbases = ( "Sender.ior", "Receiver.ior", "AMI.ior" ); +@iorfiles = 0; +@nodenames = ( "Sender", "Receiver" ); + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('ciao_componentserver'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$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) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); + +$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 30 seconds to allow task to complete\n"; +sleep (30); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc index 85cc44f118a..b84f3267139 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc +++ b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc @@ -41,7 +41,7 @@ project(AMI_ExceptionT_lema_gen) : ciaoidldefaults { -Wb,svnt_export_include=ExceptionT_svnt_export.h \ -Wb,skel_export_macro=EXCEPTION_T_SKEL_Export \ -Wb,skel_export_include=ExceptionT_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv + -I.. -Gsv -Gcn -Glem -GM -Gxhst -Gxhsv IDL_Files { ExceptionTA.idl @@ -163,7 +163,7 @@ project(AMI_ExceptionT_conn) : ciao_executor, ami, ami4ccm_lem_stub { Header_Files { ExceptionTA_conn.h - ExceptionTA_conn_export.h + ExceptionT_conn_export.h } Inline_Files { diff --git a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp index a2556c8c77f..49bc4421984 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp +++ b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp @@ -157,8 +157,8 @@ namespace CIAO_ExceptionT_Sender_Impl // Worker thread for asynchronous invocations for MyFoo //============================================================ asynch_foo_generator::asynch_foo_generator ( - ::ExceptionT::AMI_MyFoo_ptr my_foo_ami) - : my_foo_ami_ (::ExceptionT::AMI_MyFoo::_duplicate (my_foo_ami)) + ::ExceptionT::AMI4CCM_MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::ExceptionT::AMI4CCM_MyFoo::_duplicate (my_foo_ami)) { } @@ -306,7 +306,7 @@ namespace CIAO_ExceptionT_Sender_Impl void Sender_exec_i::ccm_activate (void) { - ::ExceptionT::AMI_MyFoo_var asynch_foo = + ::ExceptionT::AMI4CCM_MyFoo_var asynch_foo = this->context_->get_connection_sendc_run_my_foo(); asynch_foo_generator* asynch_foo_gen = new asynch_foo_generator (asynch_foo); diff --git a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h index 4ec1c63d104..eced59e7c42 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h +++ b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h @@ -32,12 +32,12 @@ namespace CIAO_ExceptionT_Sender_Impl class asynch_foo_generator : public virtual ACE_Task_Base { public: - asynch_foo_generator (::ExceptionT::AMI_MyFoo_ptr my_foo_ami); + asynch_foo_generator (::ExceptionT::AMI4CCM_MyFoo_ptr my_foo_ami); virtual int svc (void); private: - ::ExceptionT::AMI_MyFoo_var my_foo_ami_; + ::ExceptionT::AMI4CCM_MyFoo_var my_foo_ami_; }; /// Worker thread for synchronous invocations @@ -53,7 +53,7 @@ namespace CIAO_ExceptionT_Sender_Impl }; class MyFoo_callback_exec_i - : public virtual ::ExceptionT::CCM_AMI_MyFooCallback, + : public virtual ::ExceptionT::CCM_AMI4CCM_MyFooReplyHandler, public virtual ::CORBA::LocalObject { public: diff --git a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp index 097753214de..72bc44aa6ba 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp @@ -117,7 +117,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_ExceptionT_AMI_MyFoo_Connector_Impl</string> + <string>create_ExceptionT_AMI4CCM_MyFoo_Connector_Impl</string> </value> </value> </execParameter> @@ -139,7 +139,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_ExceptionT_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_ExceptionT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> @@ -223,7 +223,7 @@ <instance xmi:idref="ExceptionT.ComponentImplementations.ExceptionTImplementation.ExceptionT.Sender" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_sendc_run</portName> + <portName>ami4ccm_port_ami4ccm_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="ExceptionT.ComponentImplementations.ExceptionTImplementation.ExceptionT.AMI" /> @@ -239,7 +239,7 @@ <instance xmi:idref="ExceptionT.ComponentImplementations.ExceptionTImplementation.ExceptionT.Receiver" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_run</portName> + <portName>ami4ccm_port_ami4ccm_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="ExceptionT.ComponentImplementations.ExceptionTImplementation.ExceptionT.AMI" /> @@ -274,7 +274,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_ExceptionT_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_ExceptionT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> @@ -292,7 +292,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_ExceptionT_AMI_MyFoo_Connector_Impl</string> + <string>create_ExceptionT_AMI4CCM_MyFoo_Connector_Impl</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc b/modules/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc index b8746918152..7691c75c263 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc +++ b/modules/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc @@ -41,7 +41,7 @@ project(AMI4CCM_IDL_Test_lema_gen) : ciaoidldefaults { -Wb,svnt_export_include=Hello_svnt_export.h \ -Wb,skel_export_macro=HELLO_SKEL_Export \ -Wb,skel_export_include=Hello_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv + -I.. -Gsv -Gcn -Glem -GM -Gxhst -Gxhsv IDL_Files { HelloA.idl @@ -164,7 +164,7 @@ project(AMI4CCM_IDL_Test_conn) : ciao_executor, ami, ami4ccm_lem_stub { Header_Files { HelloA_conn.h - HelloA_conn_export.h + Hello_conn_export.h } Inline_Files { diff --git a/modules/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl b/modules/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl index f5a32b6b461..22c7415daa1 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl +++ b/modules/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl @@ -6,7 +6,9 @@ #pragma ciao lem "HelloE.idl" #pragma ciao ami4ccm interface "Hello::MyFoo" #pragma ciao ami4ccm interface "Hello::MyDerived" +#pragma ciao ami4ccm interface "Hello::MyBar" #pragma ciao ami4ccm interface "Foo::MyFoo" +#pragma ciao ami4ccm interface "Foo::MyBar" module Hello { @@ -39,15 +41,38 @@ module Hello long do_someting (in string str); attribute long my_attribute; }; + + interface MyBar : MyDerived + { + double bar_return (in string in_str, in string answer) + raises (InternalError); + void bye (out long answer, out double db) + raises (InternalError); + attribute short rw_bar_attrib + getraises (InternalError) + setraises (InternalError); + readonly attribute short ro_bar_attrib + raises (InternalError); + }; }; module Foo { + struct TestTopic + { + string key; + long x; + }; + interface MyFoo { - long myop (in string str); + long myop (in TestTopic topic); + }; + + interface MyBar : MyFoo + { + TestTopic mybarop (in string str, in long lg, out double db); }; }; #endif - diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc index 42dc36a30a8..a618f1564fd 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc +++ b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc @@ -41,7 +41,7 @@ project(AMI_InterInArgsT_lema_gen) : ciaoidldefaults { -Wb,svnt_export_include=InterInArgsT_svnt_export.h \ -Wb,skel_export_macro=INTERINARGS_T_SKEL_Export \ -Wb,skel_export_include=InterInArgsT_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv + -I.. -Gsv -Gcn -Glem -GM -Gxhst -Gxhsv IDL_Files { InterInArgsTA.idl @@ -163,7 +163,7 @@ project(AMI_InterInArgsT_conn) : ciao_executor, ami, ami4ccm_lem_stub { Header_Files { InterInArgsTA_conn.h - InterInArgsTA_conn_export.h + InterInArgsT_conn_export.h } Inline_Files { diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp index c16ddd102b9..e4a2f2f59e1 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp +++ b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp @@ -35,7 +35,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl } void - MyFoo_exec_i::var_ins (const char * in_str, + MyFoo_exec_i::var_ins (const char * /*in_str*/, ::CORBA::String_out answer, ::CORBA::Double cmd) { @@ -67,7 +67,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl "received the wrong struct, " "expected key 'aaa', x = 10," " received key '%C' , x = %u\n", - test_topic.key,test_topic.x)); + test_topic.key.in(),test_topic.x)); error = true; } if ((ACE_OS::strcmp (topic_str.key, "bbb") != 0) || @@ -77,7 +77,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl "received the wrong struct, " "expected key 'bbb', x = 'ccc'," " received key '%C' , x = %C\n", - topic_str.key ,topic_str.x_str)); + topic_str.key.in() ,topic_str.x_str.in())); error = true; } if ((ACE_OS::strcmp (topic_arr.key, "ddd") != 0) || @@ -87,7 +87,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl "received the wrong struct, " "expected key 'ddd', elem 11" " received key '%C', elem %u\n", - topic_arr.key,topic_arr.x_array[0] )); + topic_arr.key.in(),topic_arr.x_array[0] )); error = true; } answer = CORBA::string_dup ("This is my answer from var_div_ins"); @@ -110,7 +110,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl "received the wrong struct, " "expected key 'eee', x = 11," " received key '%C' , x = %u\n", - topic_union.key,topic_union.x_uni.x_long())); + topic_union.key.in(),topic_union.x_uni.x_long())); error = true; } if ((ACE_OS::strcmp (seq[0].x_teststr, "fff") != 0)|| @@ -120,7 +120,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl "received the wrong struct, " "expected key 'fff', x = 10," " received key '%C' , x = %u\n", - seq[0].x_teststr,seq[0].x_test)); + seq[0].x_teststr.in(),seq[0].x_test)); error = true; } answer = CORBA::string_dup ("This is my answer from var_div2_ins"); diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp index ab8144635fe..fd66210d987 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp +++ b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp @@ -126,8 +126,8 @@ namespace CIAO_InterInArgsT_Sender_Impl // Worker thread for asynchronous invocations for MyFoo //============================================================ asynch_foo_generator::asynch_foo_generator ( - ::InterInArgsT::AMI_MyFoo_ptr my_foo_ami) - : my_foo_ami_ (::InterInArgsT::AMI_MyFoo::_duplicate (my_foo_ami)) + ::InterInArgsT::AMI4CCM_MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::InterInArgsT::AMI4CCM_MyFoo::_duplicate (my_foo_ami)) { } @@ -256,7 +256,7 @@ namespace CIAO_InterInArgsT_Sender_Impl void Sender_exec_i::ccm_activate (void) { - ::InterInArgsT::AMI_MyFoo_var asynch_foo = + ::InterInArgsT::AMI4CCM_MyFoo_var asynch_foo = this->context_->get_connection_sendc_run_my_foo(); asynch_foo_generator* asynch_foo_gen = new asynch_foo_generator (asynch_foo); diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h index e1b78fdfc1d..0bf40288c49 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h +++ b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h @@ -28,12 +28,12 @@ namespace CIAO_InterInArgsT_Sender_Impl class asynch_foo_generator : public virtual ACE_Task_Base { public: - asynch_foo_generator (::InterInArgsT::AMI_MyFoo_ptr my_foo_ami); + asynch_foo_generator (::InterInArgsT::AMI4CCM_MyFoo_ptr my_foo_ami); virtual int svc (void); private: - ::InterInArgsT::AMI_MyFoo_var my_foo_ami_; + ::InterInArgsT::AMI4CCM_MyFoo_var my_foo_ami_; }; /// Worker thread for synchronous invocations @@ -49,7 +49,7 @@ namespace CIAO_InterInArgsT_Sender_Impl }; class MyFoo_callback_exec_i - : public virtual ::InterInArgsT::CCM_AMI_MyFooCallback, + : public virtual ::InterInArgsT::CCM_AMI4CCM_MyFooReplyHandler, public virtual ::CORBA::LocalObject { public: diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp index 1b0a94f09be..c75c95c5e6c 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp @@ -117,7 +117,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_InterInArgsT_AMI_MyFoo_Connector_Impl</string> + <string>create_InterInArgsT_AMI4CCM_MyFoo_Connector_Impl</string> </value> </value> </execParameter> @@ -139,7 +139,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_InterInArgsT_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_InterInArgsT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> @@ -223,7 +223,7 @@ <instance xmi:idref="InterInArgsT.ComponentImplementations.InterInArgsTImplementation.InterInArgsT.Sender" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_sendc_run</portName> + <portName>ami4ccm_port_ami4ccm_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="InterInArgsT.ComponentImplementations.InterInArgsTImplementation.InterInArgsT.AMI" /> @@ -239,7 +239,7 @@ <instance xmi:idref="InterInArgsT.ComponentImplementations.InterInArgsTImplementation.InterInArgsT.Receiver" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_run</portName> + <portName>ami4ccm_port_ami4ccm_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="InterInArgsT.ComponentImplementations.InterInArgsTImplementation.InterInArgsT.AMI" /> @@ -274,7 +274,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_InterInArgsT_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_InterInArgsT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> @@ -292,7 +292,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_InterInArgsT_AMI_MyFoo_Connector_Impl</string> + <string>create_InterInArgsT_AMI4CCM_MyFoo_Connector_Impl</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc index 72a5ad8d026..912264a1793 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc +++ b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc @@ -41,7 +41,7 @@ project(AMI_InterOutArgsT_lema_gen) : ciaoidldefaults { -Wb,svnt_export_include=InterOutArgsT_svnt_export.h \ -Wb,skel_export_macro=INTEROUTARGS_T_SKEL_Export \ -Wb,skel_export_include=InterOutArgsT_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv + -I.. -Gsv -Gcn -Glem -GM -Gxhst -Gxhsv IDL_Files { InterOutArgsTA.idl @@ -163,7 +163,7 @@ project(AMI_InterOutArgsT_conn) : ciao_executor, ami, ami4ccm_lem_stub { Header_Files { InterOutArgsTA_conn.h - InterOutArgsTA_conn_export.h + InterOutArgsT_conn_export.h } Inline_Files { diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp index 99f3936fc69..c1b86ed4ad8 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp +++ b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp @@ -15,7 +15,7 @@ namespace CIAO_InterOutArgsT_Receiver_Impl } void - MyFoo_exec_i::var_outs (const char * in_str, + MyFoo_exec_i::var_outs (const char * /*in_str*/, ::CORBA::String_out answer, ::CORBA::Double_out d_cmd, ::CORBA::Long_out l_cmd) diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp index 642bcb95025..a7122b21f53 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp +++ b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp @@ -26,7 +26,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl // FOO methods void MyFoo_callback_exec_i::var_outs ( - const char * answer, CORBA::Double d_cmd, CORBA::Long l_cmd ) + const char * /*answer*/, CORBA::Double d_cmd, CORBA::Long l_cmd ) { if (d_cmd != 3.14) { @@ -68,7 +68,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl "received the wrong struct, " "expected key 'aaa', x = 10," " received key '%C' , x = %u\n", - test_topic.key,test_topic.x)); + test_topic.key.in(),test_topic.x)); error = true; } if (( ACE_OS::strcmp (topic_str.key,"bbb") != 0) || @@ -78,7 +78,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl "received the wrong struct, " "expected key 'bbb', x = 'ccc'," " received key '%C' , x = %C\n", - topic_str.key ,topic_str.x_str)); + topic_str.key.in() ,topic_str.x_str.in())); error = true; } if (( ACE_OS::strcmp (topic_arr.key,"ddd") != 0) || @@ -88,7 +88,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl "received the wrong struct, " "expected key 'ddd', second elem 100 ," " received key '%C', second elem %u\n", - topic_arr.key, topic_arr.x_array[1])); + topic_arr.key.in(), topic_arr.x_array[1])); error = true; } if (error == false) @@ -127,7 +127,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl "received the wrong sequence, " "expected key 'fff', x = 12," " received key '%C' , x = %u\n", - seq[0].x_teststr,seq[0].x_test)); + seq[0].x_teststr.in(),seq[0].x_test)); error = true; } if (error == false) @@ -147,8 +147,8 @@ namespace CIAO_InterOutArgsT_Sender_Impl // Worker thread for asynchronous invocations for MyFoo //============================================================ asynch_foo_generator::asynch_foo_generator ( - ::InterOutArgsT::AMI_MyFoo_ptr my_foo_ami) - : my_foo_ami_ (::InterOutArgsT::AMI_MyFoo::_duplicate (my_foo_ami)) + ::InterOutArgsT::AMI4CCM_MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::InterOutArgsT::AMI4CCM_MyFoo::_duplicate (my_foo_ami)) { } @@ -264,7 +264,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl void Sender_exec_i::ccm_activate (void) { - ::InterOutArgsT::AMI_MyFoo_var asynch_foo = + ::InterOutArgsT::AMI4CCM_MyFoo_var asynch_foo = this->context_->get_connection_sendc_run_my_foo(); asynch_foo_generator* asynch_foo_gen = new asynch_foo_generator (asynch_foo); diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h index 44ba3995990..91e7c5547d4 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h +++ b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h @@ -21,12 +21,12 @@ namespace CIAO_InterOutArgsT_Sender_Impl class asynch_foo_generator : public virtual ACE_Task_Base { public: - asynch_foo_generator (::InterOutArgsT::AMI_MyFoo_ptr my_foo_ami); + asynch_foo_generator (::InterOutArgsT::AMI4CCM_MyFoo_ptr my_foo_ami); virtual int svc (void); private: - ::InterOutArgsT::AMI_MyFoo_var my_foo_ami_; + ::InterOutArgsT::AMI4CCM_MyFoo_var my_foo_ami_; }; /// Worker thread for synchronous invocations @@ -42,7 +42,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl }; class MyFoo_callback_exec_i - : public virtual ::InterOutArgsT::CCM_AMI_MyFooCallback, + : public virtual ::InterOutArgsT::CCM_AMI4CCM_MyFooReplyHandler, public virtual ::CORBA::LocalObject { public: diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp index e2387e781b9..f277d4159af 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp @@ -117,7 +117,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_InterOutArgsT_AMI_MyFoo_Connector_Impl</string> + <string>create_InterOutArgsT_AMI4CCM_MyFoo_Connector_Impl</string> </value> </value> </execParameter> @@ -139,7 +139,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_InterOutArgsT_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_InterOutArgsT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> @@ -223,7 +223,7 @@ <instance xmi:idref="InterOutArgsT.ComponentImplementations.InterOutArgsTImplementation.InterOutArgsT.Sender" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_sendc_run</portName> + <portName>ami4ccm_port_ami4ccm_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="InterOutArgsT.ComponentImplementations.InterOutArgsTImplementation.InterOutArgsT.AMI" /> @@ -239,7 +239,7 @@ <instance xmi:idref="InterOutArgsT.ComponentImplementations.InterOutArgsTImplementation.InterOutArgsT.Receiver" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_run</portName> + <portName>ami4ccm_port_ami4ccm_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="InterOutArgsT.ComponentImplementations.InterOutArgsTImplementation.InterOutArgsT.AMI" /> @@ -274,7 +274,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_InterOutArgsT_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_InterOutArgsT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl new file mode 100644 index 00000000000..704907330a5 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl @@ -0,0 +1,70 @@ +// $Id$ + +#ifndef INTERRETURN_T_IDL +#define INTERRETURN_T_IDL + +#pragma ciao lem "Base/InterReturnTE.idl" +#pragma ciao ami4ccm interface "InterReturnT::MyFoo" +#pragma ciao lem "Base/InterReturnTAE.idl" + +module InterReturnT +{ + // Mixed struct + struct TestStruct { + string key; + long x; + }; + + // Array + struct TestArr { + string key; + short x_array[5]; + }; + + typedef TestArr TestArray[5]; + + // Union + union X_Union switch (short) { + case 0: + string x_test; + case 1: + long x_long; + }; + + // Sequence + struct test { + short x_test; + string x_teststr; + }; + typedef sequence<test> TestSeq; + + exception InternalError + { + long id; + string error_string; + }; + + // Sender/Receiver interface + interface MyFoo + { + void ret_void (in string in_str, out string answer, out long l_cmd) + raises (InternalError); + long ret_long (in string in_str, out string answer, out long l_cmd) + raises (InternalError); + double ret_double (in string in_str, out string answer, out long l_cmd) + raises (InternalError); + TestStruct ret_struct ( in string in_str, out string answer, + out long l_cmd) + raises (InternalError); + TestArray ret_array (in string in_str, out string answer, + out long l_cmd) + raises (InternalError); + TestSeq ret_seq (in string in_str, out string answer, out long l_cmd) + raises (InternalError); + X_Union ret_union (in string in_str, out string answer, out long l_cmd) + raises (InternalError); + }; +}; + +#endif + diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc new file mode 100644 index 00000000000..40d553b78ad --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc @@ -0,0 +1,196 @@ +// $Id$ + +project(AMI_InterReturnT_idl_gen) : componentidldefaults, ami, ami4ccm_stub { + custom_only = 1 + idlflags += -Wb,stub_export_macro=INTERRETURN_T_STUB_Export \ + -Wb,stub_export_include=InterReturnT_stub_export.h \ + -Wb,skel_export_macro=INTERRETURN_T_SKEL_Export \ + -Wb,skel_export_include=InterReturnT_skel_export.h \ + -Wb,conn_export_macro=INTERRETURN_T_CONN_Export \ + -Wb,conn_export_include=InterReturnT_conn_export.h \ + -Wb,exec_export_macro=INTERRETURN_T_EXEC_Export \ + -Wb,exec_export_include=InterReturnT_exec_export.h \ + -I.. -GM -Gxhcn + idlflags -= -Gsv + + IDL_Files { + InterReturnT.idl + } +} + +project(AMI_InterReturnT_lem_gen) : ciaoidldefaults { + after += AMI_InterReturnT_idl_gen AMI_InterReturnT_lema_gen + custom_only = 1 + idlflags += -Wb,export_macro=INTERRETURN_T_LEM_STUB_Export \ + -Wb,export_include=InterReturnT_lem_stub_export.h \ + -I.. -SS -Gxhst + + IDL_Files { + InterReturnTE.idl + } +} + +project(AMI_InterReturnT_lema_gen) : ciaoidldefaults { + after += AMI_InterReturnT_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=INTERRETURN_T_STUB_Export \ + -Wb,stub_export_include=InterReturnT_stub_export.h \ + -Wb,conn_export_macro=INTERRETURN_T_CONN_Export \ + -Wb,conn_export_include=InterReturnT_conn_export.h \ + -Wb,svnt_export_macro=INTERRETURN_T_SVNT_Export \ + -Wb,svnt_export_include=InterReturnT_svnt_export.h \ + -Wb,skel_export_macro=INTERRETURN_T_SKEL_Export \ + -Wb,skel_export_include=InterReturnT_skel_export.h \ + -I.. -Gsv -Gcn -Glem -GM -Gxhst -Gxhsv + + IDL_Files { + InterReturnTA.idl + } +} + +project(AMI_InterReturnT_lemae_gen) : ciaoidldefaults { + after += AMI_InterReturnT_lema_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=INTERRETURN_T_LEM_STUB_Export \ + -Wb,stub_export_include=InterReturnT_lem_stub_export.h \ + -I.. -SS + + IDL_Files { + InterReturnTAE.idl + } +} + +project(AMI_InterReturnT_stub) : ccm_stub, ami, ami4ccm_stub { + after += AMI_InterReturnT_lem_gen + libs += + libout = ../lib + libpaths += ../lib + includes += .. + + sharedname = InterReturnT_stub + dynamicflags = INTERRETURN_T_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + InterReturnTC.cpp + InterReturnTAC.cpp + } + + Header_Files { + InterReturnTC.h + InterReturnT_stub_export.h +} + + Inline_Files { + InterReturnTC.inl + } +} + +project(AMI_InterReturnT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { + after += AMI_InterReturnT_lem_gen AMI_InterReturnT_stub AMI_InterReturnT_lemae_gen AMI_InterReturnT_skel + libs += InterReturnT_stub InterReturnT_skel + libout = ../lib + libpaths += ../lib + includes += .. + + sharedname = InterReturnT_lem_stub + dynamicflags = INTERRETURN_T_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + InterReturnTEC.cpp + InterReturnTAEC.cpp + } + + Header_Files { + InterReturnTEC.h + InterReturnT_lem_stub_export.h +} + + Inline_Files { + InterReturnTEC.inl + } +} + +project(AMI_InterReturnT_skel) : ciao_executor, ami, ami4ccm_servant { + after += AMI_InterReturnT_stub + sharedname = InterReturnT_skel + libs += InterReturnT_stub + libout = ../lib + libpaths += ../lib + includes += .. + + dynamicflags = INTERRETURN_T_SKEL_BUILD_DLL + + IDL_Files { + } + + Source_Files { + InterReturnTS.cpp + InterReturnTAS.cpp + } + + Header_Files { + InterReturnTS.h + + InterReturnT_skel_export.h + } + + Inline_Files { + InterReturnTS.inl + + } +} + +project(AMI_InterReturnT_conn) : ciao_executor, ami, ami4ccm_lem_stub { + after += AMI_InterReturnT_lem_stub InterReturnT_Base_AMI_stub AMI_InterReturnT_skel AMI_InterReturnT_lema_gen AMI_InterReturnT_lemae_gen + sharedname = InterReturnT_conn + libs += InterReturnT_stub InterReturnT_skel InterReturnT_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = INTERRETURN_T_CONN_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnTA_conn.cpp + } + + Header_Files { + InterReturnTA_conn.h + InterReturnT_conn_export.h + } + + Inline_Files { + } +} + +project(AMI_InterReturnT_svnt) : ciao_servant, ami, ami4ccm_servant { + after += AMI_InterReturnT_lem_stub InterReturnT_Base_AMI_stub AMI_InterReturnT_skel AMI_InterReturnT_lema_gen AMI_InterReturnT_lemae_gen AMI_InterReturnT_conn + sharedname = InterReturnT_svnt + libs += InterReturnT_stub InterReturnT_skel InterReturnT_lem_stub InterReturnT_conn + libpaths += ../lib + libout = ../lib + dynamicflags = INTERRETURN_T_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnTA_svnt.cpp + } + + Header_Files { + InterReturnTA_svnt.h + InterReturnTA_svnt_export.h + } + + Inline_Files { + } +} + diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl new file mode 100644 index 00000000000..9f0740cb97f --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl @@ -0,0 +1,18 @@ +// $Id$ + +#ifndef INTERRETURN_T_RECEIVER_IDL +#define INTERRETURN_T_RECEIVER_IDL + +#include <Components.idl> + +#include "Base/InterReturnT.idl" + +module InterReturnT +{ + component Receiver + { + /// Provides + provides MyFoo do_my_foo; + }; +}; +#endif diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc new file mode 100644 index 00000000000..8c762392b25 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc @@ -0,0 +1,134 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p InterReturnT_Base InterReturnT_Receiver" + +project(AMI_ReturnT_Base_Receiver_idl_gen) : componentidldefaults { + custom_only = 1 + after += AMI_InterReturnT_idl_gen + idlflags += -Wb,stub_export_macro=INTERRETURN_T_RECEIVER_STUB_Export \ + -Wb,stub_export_include=InterReturnT_Receiver_stub_export.h \ + -Wb,skel_export_macro=INTERRETURN_T_RECEIVER_SVNT_Export \ + -Wb,skel_export_include=InterReturnT_Receiver_svnt_export.h \ + -Wb,exec_export_macro=INTERRETURN_T_RECEIVER_EXEC_Export \ + -Wb,exec_export_include=InterReturnT_Receiver_exec_export.h \ + -Glem -I.. + + IDL_Files { + InterReturnT_Receiver.idl + } +} + +project(AMI_ReturnT_Base_Receiver_lem_gen) : ciaoidldefaults { + after += AMI_ReturnT_Base_Receiver_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=INTERRETURN_T_RECEIVER_LEM_STUB_Export \ + -Wb,stub_export_include=InterReturnT_Receiver_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + InterReturnT_ReceiverE.idl + } +} + +project(AMI_ReturnT_Base_Receiver_l_stub) : ccm_svnt, messaging { + after += AMI_ReturnT_Base_Receiver_lem_gen AMI_InterReturnT_Base_Receiver_stub AMI_InterReturnT_stub + libs += InterReturnT_stub InterReturnT_Receiver_stub + libpaths += ../lib + libout = ../lib + sharedname = InterReturnT_Receiver_lem_stub + dynamicflags = INTERRETURN_T_RECEIVER_LEM_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnT_ReceiverEC.cpp + } + + Header_Files { + InterReturnT_ReceiverEC.h + InterReturnT_Receiver_lem_stub_export.h + } + + Inline_Files { + InterReturnT_ReceiverEC.inl + } +} + +project(AMI_InterReturnT_Base_Receiver_stub) : ccm_stub, messaging { + after += AMI_ReturnT_Base_Receiver_idl_gen AMI_InterReturnT_stub + libs += InterReturnT_stub + libpaths += ../lib + libout = ../lib + sharedname = InterReturnT_Receiver_stub + dynamicflags = INTERRETURN_T_RECEIVER_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnT_ReceiverC.cpp + } + + Header_Files { + InterReturnT_ReceiverC.h + InterReturnT_Receiver_stub_export.h + } + + Inline_Files { + InterReturnT_ReceiverC.inl + } +} + +project(AMI_InterReturnT_Base_Receiver_exec) : ciao_executor, messaging { + after += AMI_ReturnT_Base_Receiver_l_stub AMI_InterReturnT_Base_Receiver_stub AMI_InterReturnT_stub AMI_InterReturnT_lem_stub + sharedname = InterReturnT_Receiver_exec + libs += InterReturnT_Receiver_stub InterReturnT_Receiver_lem_stub InterReturnT_stub InterReturnT_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = INTERRETURN_T_RECEIVER_EXEC_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnT_Receiver_exec.cpp + } + + Header_Files { + InterReturnT_Receiver_exec.h + InterReturnT_Receiver_exec_export.h + } + + Inline_Files { + } +} + +project(AMI_InterReturnT_Base_Receiver_svnt) : ciao_servant, messaging { + after += AMI_InterReturnT_Base_skel AMI_ReturnT_Base_Receiver_l_stub AMI_InterReturnT_stub AMI_InterReturnT_skel AMI_InterReturnT_lem_stub + sharedname = InterReturnT_Receiver_svnt + libs += InterReturnT_Receiver_stub InterReturnT_Receiver_lem_stub \ + InterReturnT_skel \ + InterReturnT_stub InterReturnT_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = INTERRETURN_T_RECEIVER_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnT_ReceiverS.cpp + InterReturnT_Receiver_svnt.cpp + } + + Header_Files { + InterReturnT_ReceiverS.h + InterReturnT_Receiver_svnt.h + InterReturnT_Receiver_svnt_export.h + } + + Inline_Files { + InterReturnT_ReceiverS.inl + } +} + diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp new file mode 100644 index 00000000000..1bee4680ab5 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp @@ -0,0 +1,160 @@ +// -*- C++ -*- +// $Id$ + +#include "InterReturnT_Receiver_exec.h" +#include "ace/OS_NS_unistd.h" + +namespace CIAO_InterReturnT_Receiver_Impl +{ + MyFoo_exec_i::MyFoo_exec_i (void) + { + } + + MyFoo_exec_i::~MyFoo_exec_i (void) + { + } + + void MyFoo_exec_i::ret_void (const char * /*in_str*/, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd ) + { + answer = CORBA::string_dup ("This is my answer from ret_void"); + l_cmd = 1; + }; + + CORBA::Long MyFoo_exec_i::ret_long (const char * /*in_str*/, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd) + { + answer = CORBA::string_dup ("This is my answer from ret_long"); + l_cmd = 2; + return 200; + }; + + CORBA::Double MyFoo_exec_i::ret_double (const char * /*in_str*/, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd) + { + answer = CORBA::string_dup ("This is my answer from ret_double"); + l_cmd = 3; + return 3.14; + }; + + InterReturnT::TestStruct * MyFoo_exec_i::ret_struct (const char * /*in_str*/, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd) + { + answer = CORBA::string_dup ("This is my answer from ret_struct"); + l_cmd = 4; + InterReturnT::TestStruct *test_struct = new InterReturnT::TestStruct(); + test_struct->key = CORBA::string_dup("aaa"); + test_struct->x = 10; + return test_struct; + }; + + InterReturnT::TestArray_slice * MyFoo_exec_i::ret_array ( + const char * /*in_str*/, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd) + { + answer = CORBA::string_dup ("This is my answer from ret_array"); + l_cmd = 5; + InterReturnT::TestArray test_array; + for ( CORBA::UShort i = 0; i < 5; i ++) + { + test_array[i].key = CORBA::string_dup("bbb"); + for (CORBA::UShort y = 0; y < 5; y ++) + { + test_array[i].x_array[y] = i * 100 + y ; + } + } + return InterReturnT::TestArray_dup(test_array); + }; + + InterReturnT::TestSeq * MyFoo_exec_i::ret_seq (const char * /*in_str*/, + ::CORBA::String_out, + ::CORBA::Long_out l_cmd) + { + l_cmd = 6; + InterReturnT::test ttt; + ttt.x_test = 12; + ttt.x_teststr = CORBA::string_dup("ccc"); + InterReturnT::TestSeq *seq = new InterReturnT::TestSeq(); + seq->length(2); + (*seq)[0]= ttt; + ttt.x_teststr = CORBA::string_dup("ddd"); + (*seq)[1]= ttt; + return seq; + }; + + InterReturnT::X_Union *MyFoo_exec_i::ret_union (const char * /*in_str*/, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd) + { + answer = CORBA::string_dup ("This is my answer from ret_union"); + l_cmd = 7; + InterReturnT::X_Union *x_uni = new InterReturnT::X_Union(); + x_uni->x_long(11); + return x_uni; + }; + + Receiver_exec_i::Receiver_exec_i (void) + { + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + } + + ::InterReturnT::CCM_MyFoo_ptr + Receiver_exec_i::get_do_my_foo (void) + { + return new MyFoo_exec_i (); + } + + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = ::InterReturnT::CCM_Receiver_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Receiver_exec_i::configuration_complete (void) + { + } + + void + Receiver_exec_i::ccm_activate (void) + { + } + + void + Receiver_exec_i::ccm_passivate (void) + { + } + + void + Receiver_exec_i::ccm_remove (void) + { + } + + extern "C" ::Components::EnterpriseComponent_ptr + create_InterReturnT_AMI_Receiver_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_RETURN ( + retval, + Receiver_exec_i, + ::Components::EnterpriseComponent::_nil ()); + + return retval; + } +} diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h new file mode 100644 index 00000000000..34b9546bb06 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h @@ -0,0 +1,74 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_INTERRETURN_T_RECEIVER_EXEC_H_ +#define CIAO_INTERRETURN_T_RECEIVER_EXEC_H_ + +#include "InterReturnT_ReceiverEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "InterReturnT_Receiver_exec_export.h" + +namespace CIAO_InterReturnT_Receiver_Impl +{ + class MyFoo_exec_i + : public virtual ::InterReturnT::CCM_MyFoo, + public virtual ::CORBA::LocalObject + { + public: + MyFoo_exec_i (void); + virtual ~MyFoo_exec_i (void); + virtual void ret_void (const char * in_str, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd ); + virtual CORBA::Long ret_long (const char * in_str, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd); + virtual CORBA::Double ret_double (const char * in_str, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd); + virtual InterReturnT::TestStruct *ret_struct ( const char * in_str, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd); + virtual InterReturnT::TestArray_slice *ret_array (const char * in_str, + ::CORBA::String_out answer, + ::CORBA::Long_out l_cmd); + virtual InterReturnT::TestSeq *ret_seq (const char * in_str, + ::CORBA::String_out, + ::CORBA::Long_out l_cmd); + virtual InterReturnT::X_Union *ret_union (const char * in_str, + ::CORBA::String_out, + ::CORBA::Long_out l_cmd); + }; + + class Receiver_exec_i + : public virtual Receiver_Exec, + public virtual ::CORBA::LocalObject + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + virtual ::InterReturnT::CCM_MyFoo_ptr get_do_my_foo (void); + + 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: + ::InterReturnT::CCM_Receiver_Context_var context_; + }; + + extern "C" INTERRETURN_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_InterReturnT_AMI_Receiver_Impl (void); +} + +#endif /* ifndef */ diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl new file mode 100644 index 00000000000..a47f82627b8 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl @@ -0,0 +1,21 @@ +// $Id$ + +#ifndef INTERRETURN_T_SENDER_IDL +#define INTERRETURN_T_SENDER_IDL + +#include <Components.idl> + +#include "Base/InterReturnT.idl" + +#pragma ciao ami4ccm receptacle "InterReturnT::Sender::run_my_foo" + +module InterReturnT +{ + component Sender + { + /// For synchronous invocation + uses MyFoo run_my_foo; + }; +}; + +#endif diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc new file mode 100644 index 00000000000..4e9d59cf158 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc @@ -0,0 +1,135 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p InterReturnT_Base InterReturnT_Sender" + +project(AMI_InterReturnT_Base_Sender_idl_gen) : componentidldefaults { + after += Conn_InterReturnT_Base_idl_gen AMI_InterReturnT_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=INTERRETURN_T_SENDER_STUB_Export \ + -Wb,stub_export_include=InterReturnT_Sender_stub_export.h \ + -Wb,skel_export_macro=INTERRETURN_T_SENDER_SVNT_Export \ + -Wb,skel_export_include=InterReturnT_Sender_svnt_export.h \ + -Wb,exec_export_macro=INTERRETURN_T_SENDER_EXEC_Export \ + -Wb,exec_export_include=InterReturnT_Sender_exec_export.h \ + -I.. -GM + + IDL_Files { + InterReturnT_Sender.idl + } +} + +project(AMI_InterReturnT_Base_Sender_lem_gen) : ciaoidldefaults { + after += AMI_InterReturnT_Base_Sender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=INTERRETURN_T_SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=InterReturnT_Sender_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + InterReturnT_SenderE.idl + } +} + +project(AMI_ReturnT_Base_Sender_lem_stub) : ccm_svnt, ami { + after += AMI_InterReturnT_Base_Sender_lem_gen AMI_InterReturnT_stub Conn_InterReturnT_Base_stub + libs += InterReturnT_stub + libpaths += ../lib + libout = ../lib + sharedname = InterReturnT_Sender_lem_stub + dynamicflags = INTERRETURN_T_SENDER_LEM_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnT_SenderEC.cpp + } + + Header_Files { + InterReturnT_SenderEC.h + InterReturnT_Sender_lem_stub_export.h + } + + Inline_Files { + InterReturnT_SenderEC.inl + } +} + +project(AMI_InterReturnT_Base_Sender_stub) : ccm_stub, ami { + after += AMI_InterReturnT_Base_Sender_idl_gen AMI_InterReturnT_Base_stub AMI_InterReturnT_stub Conn_InterReturnT_Base_stub + libs += InterReturnT_stub + libpaths += ../lib + libout = ../lib + sharedname = InterReturnT_Sender_stub + dynamicflags = INTERRETURN_T_SENDER_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnT_SenderC.cpp + } + + Header_Files { + InterReturnT_SenderC.h + InterReturnT_Sender_stub_export.h + } + + Inline_Files { + InterReturnT_SenderC.inl + } +} + +project(AMI_InterReturnT_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { + after += AMI_ReturnT_Base_Sender_lem_stub AMI_InterReturnT_Base_Sender_stub AMI_InterReturnT_Base_exec Conn_InterReturnT_Base_stub AMI_InterReturnT_lem_stub + sharedname = InterReturnT_Sender_exec + libs += InterReturnT_Sender_stub InterReturnT_Sender_lem_stub InterReturnT_stub InterReturnT_stub InterReturnT_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = INTERRETURN_T_SENDER_EXEC_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnT_Sender_exec.cpp + } + + Header_Files { + InterReturnT_Sender_exec.h + InterReturnT_Sender_exec_export.h + } + + Inline_Files { + } +} + +project(AMI_InterReturnT_Base_Sender_svnt) : ciao_servant, ami { + after += AMI_InterReturnT_Base_skel AMI_ReturnT_Base_Sender_lem_stub AMI_InterReturnT_Base_exec AMI_InterReturnT_skel + sharedname = InterReturnT_Sender_svnt + libs += InterReturnT_Sender_stub InterReturnT_Sender_lem_stub \ + InterReturnT_skel \ + InterReturnT_stub + libpaths += ../lib + libout = ../lib + dynamicflags = INTERRETURN_T_SENDER_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + InterReturnT_SenderS.cpp + InterReturnT_Sender_svnt.cpp + } + + Header_Files { + InterReturnT_SenderS.h + InterReturnT_Sender_svnt.h + InterReturnT_Sender_svnt_export.h + } + + Inline_Files { + InterReturnT_SenderS.inl + } +} + + diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp new file mode 100644 index 00000000000..a7a538e65a8 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp @@ -0,0 +1,384 @@ +// -*- C++ -*- +// $Id$ + +// test of different return values +#include "InterReturnT_Sender_exec.h" +#include "ace/OS_NS_unistd.h" + +namespace CIAO_InterReturnT_Sender_Impl +{ + CORBA::Short nr_of_received = 0; + + //============================================================ + // Facet Executor Implementation Class: MyFoo_callback_exec_i + //============================================================ + MyFoo_callback_exec_i::MyFoo_callback_exec_i (void) + { + } + + MyFoo_callback_exec_i::~MyFoo_callback_exec_i (void) + { + } + + //============================================================ + // Operations from ::CCM_AMI::MyFoo_callback + //============================================================ + // FOO methods + void + MyFoo_callback_exec_i::ret_void (const char * /*answer*/, CORBA::Long l_cmd) + { + if (l_cmd != 1) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_void: " + "received the wrong long, expected 1," + " received %lu\n", + l_cmd)); + } + else + { + ++nr_of_received; + } + }; + + void + MyFoo_callback_exec_i::ret_void_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + excep_holder->raise_exception (); + } + + void + MyFoo_callback_exec_i::ret_long (::CORBA::Long ami_return_val, + const char * /*answer*/, CORBA::Long l_cmd) + { + if ((l_cmd != 2) || (ami_return_val != 200)) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_long: " + "received the wrong longs, expected 2 and 200," + " received %lu and %lu\n", + l_cmd, ami_return_val)); + } + else + { + ++nr_of_received; + } + }; + + void + MyFoo_callback_exec_i::ret_long_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + excep_holder->raise_exception (); + }; + + void + MyFoo_callback_exec_i::ret_double (::CORBA::Double ami_return_val, + const char * /*answer*/, CORBA::Long l_cmd) + { + if ((l_cmd != 3) || (ami_return_val != 3.14)) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_double: " + "received the wrong returns, expected 3 " + "and 3.14,received %u and %2.2f\n", + l_cmd, ami_return_val)); + } + else + { + ++nr_of_received; + } + }; + + void + MyFoo_callback_exec_i::ret_double_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + excep_holder->raise_exception (); + }; + + void + MyFoo_callback_exec_i::ret_struct ( + const InterReturnT::TestStruct &ami_return_val, + const char * /*answer*/, CORBA::Long l_cmd) + { + if (l_cmd != 4) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_struct: " + "received the wrong long, expected 4," + " received %u\n", + l_cmd)); + } + else if ((ACE_OS::strcmp (ami_return_val.key.in(), "aaa") != 0) || + (ami_return_val.x != 10)) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_struct: " + "received the struct return, expected 'aaa' " + "and 10, received %C and %u\n", + ami_return_val.key.in(), ami_return_val.x)); + } + else + { + ++nr_of_received; + } + }; + + void + MyFoo_callback_exec_i::ret_struct_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + excep_holder->raise_exception (); + }; + + void + MyFoo_callback_exec_i::ret_array ( + const InterReturnT::TestArr ami_return_val[], + const char * /*answer*/, CORBA::Long l_cmd) + { + if ((l_cmd != 5) || (ami_return_val[1].x_array[2] != 102)) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_array: " + "received the wrong long or array, expected 5 " + "and 102,received %u and %u\n", + l_cmd, ami_return_val[1].x_array[2])); + } + else + { + ++nr_of_received; + } + }; + + void + MyFoo_callback_exec_i::ret_array_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + excep_holder->raise_exception (); + }; + + void + MyFoo_callback_exec_i::ret_seq (const InterReturnT::TestSeq &ami_return_val, + const char * /*answer*/, CORBA::Long l_cmd) + { + if (l_cmd != 6) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_seq: " + "received the wrong long, expected 6," + " received %lu\n", + l_cmd)); + } + else if ((ACE_OS::strcmp (ami_return_val[0].x_teststr, "ccc") != 0) || + (ami_return_val[1].x_test != 12)) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_seq: " + "didn't receive the expected sequence," + " received %C and %lu\n", + ami_return_val[0].x_teststr.in(), + ami_return_val[1].x_test)); + } + else + { + ++nr_of_received; + } + }; + + void + MyFoo_callback_exec_i::ret_seq_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + excep_holder->raise_exception (); + }; + + void + MyFoo_callback_exec_i::ret_union ( + const InterReturnT::X_Union &ami_return_val, + const char * /*answer*/, CORBA::Long l_cmd) + { + if ((l_cmd != 7) || (ami_return_val.x_long() != 11)) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_union: " + "received the wrong long or union, expected 7" + " and 11, received %u and %u\n", + l_cmd, ami_return_val.x_long())); + } + else + { + ++nr_of_received; + } + }; + + void + MyFoo_callback_exec_i::ret_union_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + excep_holder->raise_exception (); + }; + + //============================================================ + // Worker thread for asynchronous invocations for MyFoo + //============================================================ + asynch_foo_generator::asynch_foo_generator ( + ::InterReturnT::AMI4CCM_MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::InterReturnT::AMI4CCM_MyFoo::_duplicate (my_foo_ami)) + { + } + + int asynch_foo_generator::svc () + { + ACE_OS::sleep (3); + if (CORBA::is_nil (my_foo_ami_)) + { + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + return 1; + } + else + { + //Invoke Asynchronous calls to test + my_foo_ami_->sendc_ret_void (new MyFoo_callback_exec_i (), "Send me a void." ); + my_foo_ami_->sendc_ret_long (new MyFoo_callback_exec_i (),"Send me a long."); + my_foo_ami_->sendc_ret_double (new MyFoo_callback_exec_i (),"Send me a double."); + my_foo_ami_->sendc_ret_struct (new MyFoo_callback_exec_i (), "Send me a struct."); + my_foo_ami_->sendc_ret_array (new MyFoo_callback_exec_i (),"Send me an array."); + my_foo_ami_->sendc_ret_seq (new MyFoo_callback_exec_i (),"Send me a sequence."); + my_foo_ami_->sendc_ret_union (new MyFoo_callback_exec_i (),"Send me a union."); + } + return 0; + } + + //============================================================ + // Worker thread for synchronous invocations for MyFoo + //============================================================ + synch_foo_generator::synch_foo_generator ( + ::InterReturnT::MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::InterReturnT::MyFoo::_duplicate (my_foo_ami)) + { + } + + int synch_foo_generator::svc () + { + ACE_OS::sleep (3); + //run some synch calls + InterReturnT::TestStruct_var test_topic = 0; + InterReturnT::TestArray_var topic_arr = 0; + CORBA::Long l_cmd = 0; + char * out_str = 0; + try + { + CORBA::Double ret = + my_foo_ami_->ret_double ("Send me synch double",out_str, l_cmd); + if ( (ret == 3.14 ) && (l_cmd == 3)) + { + ++nr_of_received; + } + } + catch (const InterReturnT::InternalError&) + { + ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::ret_double: " + "Unexpected exception.\n")); + } + try + { + InterReturnT::TestArray_slice *arr = + my_foo_ami_->ret_array ("Send me synch array",out_str, l_cmd); + arr++; + if ((l_cmd != 5) || (arr->x_array[2] != 102)) + { + ACE_ERROR ((LM_ERROR, "ERROR MyFoo synchroon ret_array: " + "received the wrong long or array, expected 5 " + "and 102, received %u and %u\n", + l_cmd, arr->x_array[2])); + } + else + { + ++nr_of_received; + } + } + + catch (const InterReturnT::InternalError&) + { + ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::ret_array: " + "Unexpected exception.\n")); + } + return 0; + } + + //============================================================ + // Component Executor Implementation Class: Sender_exec_i + //============================================================ + Sender_exec_i::Sender_exec_i (void) + : global_foo_callback_ (0) + { + } + + Sender_exec_i::~Sender_exec_i (void) + { + } + + // Supported operations and attributes. + // Component attributes. + // Operations from Components::SessionComponent. + + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = + ::InterReturnT::CCM_Sender_Context::_narrow (ctx); + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + } + + void + Sender_exec_i::ccm_activate (void) + { + ::InterReturnT::AMI4CCM_MyFoo_var asynch_foo = + this->context_->get_connection_sendc_run_my_foo(); + asynch_foo_generator* asynch_foo_gen = + new asynch_foo_generator (asynch_foo); + asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); + + ::InterReturnT::MyFoo_var synch_foo = + this->context_->get_connection_run_my_foo (); + synch_foo_generator* synch_foo_gen = + new synch_foo_generator (synch_foo); + synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); + } + + void + Sender_exec_i::ccm_passivate (void) + { + } + + void + Sender_exec_i::ccm_remove (void) + { + if (nr_of_received == 9) + { + ACE_DEBUG ((LM_DEBUG, "OK: Received all expected data" + " for syn- and asynchronous calls\n")); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR: Received not all expected data" + " for syn- and asynchronous calls\n")); + } + } + + extern "C" ::Components::EnterpriseComponent_ptr + create_InterReturnT_AMI_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_RETURN ( + retval, + Sender_exec_i, + ::Components::EnterpriseComponent::_nil ()); + + return retval; + } +} diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h new file mode 100644 index 00000000000..b28c35cc209 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h @@ -0,0 +1,114 @@ +// -*- C++ -*- +// +// $Id$ + +#ifndef CIAO_INTERRETURN_T_SENDER_EXEC_H_ +#define CIAO_INTERRETURN_T_SENDER_EXEC_H_ + +#include "InterReturnT_SenderEC.h" +#include "InterReturnT_Sender_exec_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "ace/Task.h" + +namespace CIAO_InterReturnT_Sender_Impl +{ + /// Worker thread for asynchronous invocations + class asynch_foo_generator : public virtual ACE_Task_Base + { + public: + asynch_foo_generator (::InterReturnT::AMI4CCM_MyFoo_ptr my_foo_ami); + + virtual int svc (void); + + private: + ::InterReturnT::AMI4CCM_MyFoo_var my_foo_ami_; + }; + + /// Worker thread for synchronous invocations + class synch_foo_generator : public virtual ACE_Task_Base + { + public: + synch_foo_generator (::InterReturnT::MyFoo_ptr my_foo_ami); + + virtual int svc (void); + + private: + ::InterReturnT::MyFoo_var my_foo_ami_; + }; + + class MyFoo_callback_exec_i + : public virtual ::InterReturnT::CCM_AMI4CCM_MyFooReplyHandler, + public virtual ::CORBA::LocalObject + { + public: + MyFoo_callback_exec_i (void); + virtual ~MyFoo_callback_exec_i (void); + + virtual void ret_void (const char * answer, CORBA::Long l_cmd); + virtual void ret_void_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void ret_long (::CORBA::Long ami_return_val, + const char * answer, CORBA::Long l_cmd); + virtual void ret_long_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void ret_double (::CORBA::Double ami_return_val, + const char * answer, CORBA::Long l_cmd); + virtual void ret_double_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void ret_struct (const InterReturnT::TestStruct &ami_return_val, + const char * answer, CORBA::Long l_cmd); + virtual void ret_struct_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void ret_array (const InterReturnT::TestArr ami_return_val[], + const char * answer, CORBA::Long l_cmd); + virtual void ret_array_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void ret_seq (const InterReturnT::TestSeq &ami_return_val, + const char * answer, CORBA::Long l_cmd); + virtual void ret_seq_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void ret_union (const InterReturnT::X_Union &ami_return_val, + const char * answer, CORBA::Long l_cmd); + virtual void ret_union_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + }; + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + 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: + ::InterReturnT::CCM_Sender_Context_var context_; + MyFoo_callback_exec_i* global_foo_callback_; + }; + + extern "C" INTERRETURN_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_InterReturnT_AMI_Sender_Impl (void); +} + +#endif /* ifndef */ diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp new file mode 100644 index 00000000000..50bb6f8a1b9 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp @@ -0,0 +1,373 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<Deployment:DeploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <UUID>6D382DAE-9024-4C4D-B91B-A0F9176AFACF</UUID> + + <implementation xmi:id="InterReturnT_ReceiverHomeImplementation"> + <name>InterReturnT_ReceiverHomeImplementation</name> + <source/> + <artifact xmi:idref="InterReturnT_Receiver_ExecArtifact"/> + <artifact xmi:idref="InterReturnT_Receiver_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="InterReturnT_SenderHomeImplementation"> + <name>InterReturnT_SenderHomeImplementation</name> + <source/> + <artifact xmi:idref="InterReturnT_Sender_ExecArtifact"/> + <artifact xmi:idref="InterReturnT_Sender_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="InterReturnT_AMIHomeImplementation"> + <name>InterReturnT_AMIHomeImplementation</name> + <source/> + <artifact xmi:idref="InterReturnT_AMI_ExecArtifact"/> + <artifact xmi:idref="InterReturnT_AMI_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI4CCM_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Receiver"> + <name>InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Receiver</name> + <node>Receiver</node> + <source/> + <implementation xmi:idref="InterReturnT_ReceiverHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender"> + <name>InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender</name> + <node>Sender</node> + <source/> + <implementation xmi:idref="InterReturnT_SenderHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI"> + <name>InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI</name> + <node>Sender</node> + <source/> + <implementation xmi:idref="InterReturnT_AMIHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>AMI.ior</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>run_asynch_foo_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>sendc_run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_provides</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>do_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_uses</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>synch_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="InterReturnT_AMI_SvntArtifact"> + <name>InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name> + <source/> + <node/> + <location>InterReturnT_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="InterReturnT_AMI_ExecArtifact"> + <name>InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_exec</name> + <source/> + <node/> + <location>InterReturnT_conn</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI4CCM_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="InterReturnT_Receiver_SvntArtifact"> + <name>InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name> + <source/> + <node/> + <location>InterReturnT_Receiver_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="InterReturnT_Receiver_ExecArtifact"> + <name>InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name> + <source/> + <node/> + <location>InterReturnT_Receiver_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI_ReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="InterReturnT_Sender_SvntArtifact"> + <name>InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name> + <source/> + <node/> + <location>InterReturnT_Sender_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="InterReturnT_Sender_ExecArtifact"> + <name>InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_exec</name> + <source/> + <node/> + <location>InterReturnT_Sender_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_InterReturnT_AMI_SenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + +</Deployment:DeploymentPlan> diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl new file mode 100644 index 00000000000..2153984dbdd --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl @@ -0,0 +1,244 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 3; +@ports = ( 60000, 60001 ); +@iorbases = ( "Sender.ior", "Receiver.ior", "AMI.ior" ); +@iorfiles = 0; +@nodenames = ( "Sender", "Receiver" ); + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('ciao_componentserver'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$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) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 30 seconds to allow task to complete\n"; +sleep (30); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc index a3bc84a017e..c9bebab9d81 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc +++ b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc @@ -41,7 +41,7 @@ project(AMI_NoReplyH_lema_gen) : ciaoidldefaults { -Wb,svnt_export_include=NoReplyH_svnt_export.h \ -Wb,skel_export_macro=NOREPLYH_SKEL_Export \ -Wb,skel_export_include=NoReplyH_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv + -I.. -Gsv -Gcn -Glem -GM -Gxhst -Gxhsv IDL_Files { NoReplyHA.idl @@ -163,7 +163,7 @@ project(AMI_NoReplyH_conn) : ciao_executor, ami, ami4ccm_lem_stub { Header_Files { NoReplyHA_conn.h - NoReplyHA_conn_export.h + NoReplyH_conn_export.h } Inline_Files { diff --git a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp index 63c46f71e89..02ef00c2d16 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp +++ b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp @@ -117,8 +117,8 @@ namespace CIAO_NoReplyH_Sender_Impl // Worker thread for asynchronous invocations for MyFoo //============================================================ asynch_foo_generator::asynch_foo_generator ( - ::NoReplyH::AMI_MyFoo_ptr my_foo_ami) - : my_foo_ami_ (::NoReplyH::AMI_MyFoo::_duplicate (my_foo_ami)) + ::NoReplyH::AMI4CCM_MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::NoReplyH::AMI4CCM_MyFoo::_duplicate (my_foo_ami)) { } @@ -138,18 +138,18 @@ namespace CIAO_NoReplyH_Sender_Impl "Do something asynchronous"); //test without replyhandlers. - my_foo_ami_->sendc_foo ( NoReplyH::AMI_MyFooCallback::_nil (), + my_foo_ami_->sendc_foo ( NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), "Do something asynchronous with no replyhandler"); - my_foo_ami_->sendc_hello ( NoReplyH::AMI_MyFooCallback::_nil ()); - my_foo_ami_->sendc_get_rw_attrib (NoReplyH::AMI_MyFooCallback::_nil ()); - my_foo_ami_->sendc_set_rw_attrib (NoReplyH::AMI_MyFooCallback::_nil (), + my_foo_ami_->sendc_hello ( NoReplyH::AMI4CCM_MyFooReplyHandler::_nil ()); + my_foo_ami_->sendc_get_rw_attrib (NoReplyH::AMI4CCM_MyFooReplyHandler::_nil ()); + my_foo_ami_->sendc_set_rw_attrib (NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), 15); - my_foo_ami_->sendc_get_ro_attrib (NoReplyH::AMI_MyFooCallback::_nil ()); + my_foo_ami_->sendc_get_ro_attrib (NoReplyH::AMI4CCM_MyFooReplyHandler::_nil ()); } //Invoke Asynchronous calls to test exception handling //without replyhandlers. - my_foo_ami_->sendc_foo ( NoReplyH::AMI_MyFooCallback::_nil (), ""); - my_foo_ami_->sendc_set_rw_attrib (NoReplyH::AMI_MyFooCallback::_nil (), + my_foo_ami_->sendc_foo ( NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), ""); + my_foo_ami_->sendc_set_rw_attrib (NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), 0); return 0; @@ -235,7 +235,7 @@ namespace CIAO_NoReplyH_Sender_Impl void Sender_exec_i::ccm_activate (void) { - ::NoReplyH::AMI_MyFoo_var asynch_foo = + ::NoReplyH::AMI4CCM_MyFoo_var asynch_foo = this->context_->get_connection_sendc_run_my_foo(); asynch_foo_generator* asynch_foo_gen = new asynch_foo_generator (asynch_foo); diff --git a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h index 3f56bd680dd..705e0d2703e 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h +++ b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h @@ -31,12 +31,12 @@ namespace CIAO_NoReplyH_Sender_Impl class asynch_foo_generator : public virtual ACE_Task_Base { public: - asynch_foo_generator (::NoReplyH::AMI_MyFoo_ptr my_foo_ami); + asynch_foo_generator (::NoReplyH::AMI4CCM_MyFoo_ptr my_foo_ami); virtual int svc (void); private: - ::NoReplyH::AMI_MyFoo_var my_foo_ami_; + ::NoReplyH::AMI4CCM_MyFoo_var my_foo_ami_; }; /// Worker thread for synchronous invocations @@ -52,7 +52,7 @@ namespace CIAO_NoReplyH_Sender_Impl }; class MyFoo_callback_exec_i - : public virtual ::NoReplyH::CCM_AMI_MyFooCallback, + : public virtual ::NoReplyH::CCM_AMI4CCM_MyFooReplyHandler, public virtual ::CORBA::LocalObject { public: diff --git a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp index 0995aef0749..e45a92dee46 100644 --- a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp @@ -117,7 +117,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_NoReplyH_AMI_MyFoo_Connector_Impl</string> + <string>create_NoReplyH_AMI4CCM_MyFoo_Connector_Impl</string> </value> </value> </execParameter> @@ -139,7 +139,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_NoReplyH_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_NoReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> @@ -223,7 +223,7 @@ <instance xmi:idref="NoReplyH.ComponentImplementations.NoReplyHImplementation.NoReplyH.Sender" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_sendc_run</portName> + <portName>ami4ccm_port_ami4ccm_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="NoReplyH.ComponentImplementations.NoReplyHImplementation.NoReplyH.AMI" /> @@ -239,7 +239,7 @@ <instance xmi:idref="NoReplyH.ComponentImplementations.NoReplyHImplementation.NoReplyH.Receiver" /> </internalEndpoint> <internalEndpoint> - <portName>The_Port_run</portName> + <portName>ami4ccm_port_ami4ccm_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="NoReplyH.ComponentImplementations.NoReplyHImplementation.NoReplyH.AMI" /> @@ -274,7 +274,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_NoReplyH_AMI_MyFoo_Connector_The_Connector_Servant</string> + <string>create_NoReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl new file mode 100644 index 00000000000..d2a07b462f0 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl @@ -0,0 +1,26 @@ +// $Id$ + +#ifndef ONEPROCESS_IDL +#define ONEPROCESS_IDL + +#pragma ciao lem "Base/OneProcessE.idl" +#pragma ciao ami4ccm interface "OneProcess::MyFoo" +#pragma ciao lem "Base/OneProcessAE.idl" + +module OneProcess +{ + exception InternalError + { + long id; + string error_string; + }; + + // Sender/Receiver interface + interface MyFoo + { + long foo (in string in_str, in long cmd, out string answer) + raises (InternalError); + }; +}; + +#endif diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc new file mode 100644 index 00000000000..2ebf84fe1af --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc @@ -0,0 +1,196 @@ +// $Id$ + +project(AMI_OneProcess_idl_gen) : componentidldefaults, ami, ami4ccm_stub { + custom_only = 1 + idlflags += -Wb,stub_export_macro=ONEPROCESS_STUB_Export \ + -Wb,stub_export_include=OneProcess_stub_export.h \ + -Wb,skel_export_macro=ONEPROCESS_SKEL_Export \ + -Wb,skel_export_include=OneProcess_skel_export.h \ + -Wb,conn_export_macro=ONEPROCESS_CONN_Export \ + -Wb,conn_export_include=OneProcess_conn_export.h \ + -Wb,exec_export_macro=ONEPROCESS_EXEC_Export \ + -Wb,exec_export_include=OneProcess_exec_export.h \ + -I.. -GM -Gxhcn + idlflags -= -Gsv + + IDL_Files { + OneProcess.idl + } +} + +project(AMI_OneProcess_lem_gen) : ciaoidldefaults { + after += AMI_OneProcess_idl_gen AMI_OneProcess_lema_gen + custom_only = 1 + idlflags += -Wb,export_macro=ONEPROCESS_LEM_STUB_Export \ + -Wb,export_include=OneProcess_lem_stub_export.h \ + -I.. -SS -Gxhst + + IDL_Files { + OneProcessE.idl + } +} + +project(AMI_OneProcess_lema_gen) : ciaoidldefaults { + after += AMI_OneProcess_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=ONEPROCESS_STUB_Export \ + -Wb,stub_export_include=OneProcess_stub_export.h \ + -Wb,conn_export_macro=ONEPROCESS_CONN_Export \ + -Wb,conn_export_include=OneProcess_conn_export.h \ + -Wb,svnt_export_macro=ONEPROCESS_SVNT_Export \ + -Wb,svnt_export_include=OneProcess_svnt_export.h \ + -Wb,skel_export_macro=ONEPROCESS_SKEL_Export \ + -Wb,skel_export_include=OneProcess_skel_export.h \ + -I.. -Gsv -Gcn -Glem -GM -Gxhst -Gxhsv + + IDL_Files { + OneProcessA.idl + } +} + +project(AMI_OneProcess_lemae_gen) : ciaoidldefaults { + after += AMI_OneProcess_lema_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=ONEPROCESS_LEM_STUB_Export \ + -Wb,stub_export_include=OneProcess_lem_stub_export.h \ + -I.. -SS + + IDL_Files { + OneProcessAE.idl + } +} + +project(AMI_OneProcess_stub) : ccm_stub, ami, ami4ccm_stub { + after += AMI_OneProcess_lem_gen + libs += + libout = ../lib + libpaths += ../lib + includes += .. + + sharedname = OneProcess_stub + dynamicflags = ONEPROCESS_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OneProcessC.cpp + OneProcessAC.cpp + } + + Header_Files { + OneProcessC.h + OneProcess_stub_export.h +} + + Inline_Files { + OneProcessC.inl + } +} + +project(AMI_OneProcess_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { + after += AMI_OneProcess_lem_gen AMI_OneProcess_stub AMI_OneProcess_lemae_gen AMI_OneProcess_skel + libs += OneProcess_stub OneProcess_skel + libout = ../lib + libpaths += ../lib + includes += .. + + sharedname = OneProcess_lem_stub + dynamicflags = ONEPROCESS_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OneProcessEC.cpp + OneProcessAEC.cpp + } + + Header_Files { + OneProcessEC.h + OneProcess_lem_stub_export.h +} + + Inline_Files { + OneProcessEC.inl + } +} + +project(AMI_OneProcess_skel) : ciao_executor, ami, ami4ccm_servant { + after += AMI_OneProcess_stub + sharedname = OneProcess_skel + libs += OneProcess_stub + libout = ../lib + libpaths += ../lib + includes += .. + + dynamicflags = ONEPROCESS_SKEL_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OneProcessS.cpp + OneProcessAS.cpp + } + + Header_Files { + OneProcessS.h + + OneProcess_skel_export.h + } + + Inline_Files { + OneProcessS.inl + + } +} + +project(AMI_OneProcess_conn) : ciao_executor, ami, ami4ccm_lem_stub { + after += AMI_OneProcess_lem_stub OneProcess_Base_AMI_stub AMI_OneProcess_skel AMI_OneProcess_lema_gen AMI_OneProcess_lemae_gen + sharedname = OneProcess_conn + libs += OneProcess_stub OneProcess_skel OneProcess_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = ONEPROCESS_CONN_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcessA_conn.cpp + } + + Header_Files { + OneProcessA_conn.h + OneProcess_conn_export.h + } + + Inline_Files { + } +} + +project(AMI_OneProcess_svnt) : ciao_servant, ami, ami4ccm_servant { + after += AMI_OneProcess_lem_stub OneProcess_Base_AMI_stub AMI_OneProcess_skel AMI_OneProcess_lema_gen AMI_OneProcess_lemae_gen AMI_OneProcess_conn + sharedname = OneProcess_svnt + libs += OneProcess_stub OneProcess_skel OneProcess_lem_stub OneProcess_conn + libpaths += ../lib + libout = ../lib + dynamicflags = ONEPROCESS_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcessA_svnt.cpp + } + + Header_Files { + OneProcessA_svnt.h + OneProcessA_svnt_export.h + } + + Inline_Files { + } +} + diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl new file mode 100644 index 00000000000..ca77a65f758 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl @@ -0,0 +1,18 @@ +// $Id$ + +#ifndef ONEPROCESS_RECEIVER_IDL +#define ONEPROCESS_RECEIVER_IDL + +#include <Components.idl> + +#include "Base/OneProcess.idl" + +module OneProcess +{ + component Receiver + { + /// Provides + provides MyFoo do_my_foo; + }; +}; +#endif diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc new file mode 100644 index 00000000000..50698395eaa --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc @@ -0,0 +1,134 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p OneProcess_Base OneProcess_Receiver" + +project(AMI_OneProcess_Base_Receiver_idl_gen) : componentidldefaults { + custom_only = 1 + after += AMI_OneProcess_idl_gen + idlflags += -Wb,stub_export_macro=ONEPROCESS_RECEIVER_STUB_Export \ + -Wb,stub_export_include=OneProcess_Receiver_stub_export.h \ + -Wb,skel_export_macro=ONEPROCESS_RECEIVER_SVNT_Export \ + -Wb,skel_export_include=OneProcess_Receiver_svnt_export.h \ + -Wb,exec_export_macro=ONEPROCESS_RECEIVER_EXEC_Export \ + -Wb,exec_export_include=OneProcess_Receiver_exec_export.h \ + -Glem -I.. + + IDL_Files { + OneProcess_Receiver.idl + } +} + +project(AMI_OneProcess_Base_Receiver_lem_gen) : ciaoidldefaults { + after += AMI_OneProcess_Base_Receiver_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=ONEPROCESS_RECEIVER_LEM_STUB_Export \ + -Wb,stub_export_include=OneProcess_Receiver_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + OneProcess_ReceiverE.idl + } +} + +project(AMI_OneProcess_Base_Receiver_l_stub) : ccm_svnt, messaging { + after += AMI_OneProcess_Base_Receiver_lem_gen AMI_OneProcess_Base_Receiver_stub AMI_OneProcess_stub + libs += OneProcess_stub OneProcess_Receiver_stub + libpaths += ../lib + libout = ../lib + sharedname = OneProcess_Receiver_lem_stub + dynamicflags = ONEPROCESS_RECEIVER_LEM_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcess_ReceiverEC.cpp + } + + Header_Files { + OneProcess_ReceiverEC.h + OneProcess_Receiver_lem_stub_export.h + } + + Inline_Files { + OneProcess_ReceiverEC.inl + } +} + +project(AMI_OneProcess_Base_Receiver_stub) : ccm_stub, messaging { + after += AMI_OneProcess_Base_Receiver_idl_gen AMI_OneProcess_stub + libs += OneProcess_stub + libpaths += ../lib + libout = ../lib + sharedname = OneProcess_Receiver_stub + dynamicflags = ONEPROCESS_RECEIVER_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcess_ReceiverC.cpp + } + + Header_Files { + OneProcess_ReceiverC.h + OneProcess_Receiver_stub_export.h + } + + Inline_Files { + OneProcess_ReceiverC.inl + } +} + +project(AMI_OneProcess_Base_Receiver_exec) : ciao_executor, messaging { + after += AMI_OneProcess_Base_Receiver_l_stub AMI_OneProcess_Base_Receiver_stub AMI_OneProcess_stub AMI_OneProcess_lem_stub + sharedname = OneProcess_Receiver_exec + libs += OneProcess_Receiver_stub OneProcess_Receiver_lem_stub OneProcess_stub OneProcess_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = ONEPROCESS_RECEIVER_EXEC_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcess_Receiver_exec.cpp + } + + Header_Files { + OneProcess_Receiver_exec.h + OneProcess_Receiver_exec_export.h + } + + Inline_Files { + } +} + +project(AMI_OneProcess_Base_Receiver_svnt) : ciao_servant, messaging { + after += AMI_OneProcess_Base_skel AMI_OneProcess_Base_Receiver_l_stub AMI_OneProcess_stub AMI_OneProcess_skel AMI_OneProcess_lem_stub + sharedname = OneProcess_Receiver_svnt + libs += OneProcess_Receiver_stub OneProcess_Receiver_lem_stub \ + OneProcess_skel \ + OneProcess_stub OneProcess_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = ONEPROCESS_RECEIVER_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcess_ReceiverS.cpp + OneProcess_Receiver_svnt.cpp + } + + Header_Files { + OneProcess_ReceiverS.h + OneProcess_Receiver_svnt.h + OneProcess_Receiver_svnt_export.h + } + + Inline_Files { + OneProcess_ReceiverS.inl + } +} + diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp new file mode 100644 index 00000000000..7eb0ec9dad3 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp @@ -0,0 +1,92 @@ +// -*- C++ -*- +// $Id$ + +#include "OneProcess_Receiver_exec.h" +#include "ace/OS_NS_unistd.h" + +namespace CIAO_OneProcess_Receiver_Impl +{ + MyFoo_exec_i::MyFoo_exec_i (void) + { + } + + MyFoo_exec_i::~MyFoo_exec_i (void) + { + } + + ::CORBA::Long + MyFoo_exec_i::foo (const char * /*in_str*/,::CORBA::Long cmd, + ::CORBA::String_out answer) + { + if (cmd == 1) + { + ACE_OS::sleep(2); + answer = CORBA::string_dup ("ASYNCH answer"); + } + if (cmd == 2) + { + answer = CORBA::string_dup ("SYNCH answer"); + } + return cmd; + } + + Receiver_exec_i::Receiver_exec_i (void) + { + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + } + + ::OneProcess::CCM_MyFoo_ptr + Receiver_exec_i::get_do_my_foo (void) + { + return new MyFoo_exec_i (); + } + + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = ::OneProcess::CCM_Receiver_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Receiver_exec_i::configuration_complete (void) + { + } + + void + Receiver_exec_i::ccm_activate (void) + { + } + + void + Receiver_exec_i::ccm_passivate (void) + { + } + + void + Receiver_exec_i::ccm_remove (void) + { + } + + extern "C" ::Components::EnterpriseComponent_ptr + create_OneProcess_AMI_Receiver_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_RETURN ( + retval, + Receiver_exec_i, + ::Components::EnterpriseComponent::_nil ()); + + return retval; + } +} diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h new file mode 100644 index 00000000000..e2e043623d5 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h @@ -0,0 +1,56 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_ONEPROCESS_RECEIVER_EXEC_H_ +#define CIAO_ONEPROCESS_RECEIVER_EXEC_H_ + +#include "OneProcess_ReceiverEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "OneProcess_Receiver_exec_export.h" + +namespace CIAO_OneProcess_Receiver_Impl +{ + class MyFoo_exec_i + : public virtual ::OneProcess::CCM_MyFoo, + public virtual ::CORBA::LocalObject + { + public: + MyFoo_exec_i (void); + virtual ~MyFoo_exec_i (void); + + virtual ::CORBA::Long foo (const char * in_str, ::CORBA::Long cmd, + ::CORBA::String_out answer); + }; + + class Receiver_exec_i + : public virtual Receiver_Exec, + public virtual ::CORBA::LocalObject + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + virtual ::OneProcess::CCM_MyFoo_ptr get_do_my_foo (void); + + 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: + ::OneProcess::CCM_Receiver_Context_var context_; + }; + + extern "C" ONEPROCESS_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_OneProcess_AMI_Receiver_Impl (void); +} + +#endif /* ifndef */ diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl new file mode 100644 index 00000000000..e227ec7b6fd --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl @@ -0,0 +1,21 @@ +// $Id$ + +#ifndef ONEPROCESS_SENDER_IDL +#define ONEPROCESS_SENDER_IDL + +#include <Components.idl> + +#include "Base/OneProcess.idl" + +#pragma ciao ami4ccm receptacle "OneProcess::Sender::run_my_foo" + +module OneProcess +{ + component Sender + { + /// For synchronous invocation + uses MyFoo run_my_foo; + }; +}; + +#endif diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc new file mode 100644 index 00000000000..ffa6a4b6eee --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc @@ -0,0 +1,135 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p OneProcess_Base OneProcess_Sender" + +project(AMI_OneProcess_Base_Sender_idl_gen) : componentidldefaults { + after += Conn_OneProcess_Base_idl_gen AMI_OneProcess_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=ONEPROCESS_SENDER_STUB_Export \ + -Wb,stub_export_include=OneProcess_Sender_stub_export.h \ + -Wb,skel_export_macro=ONEPROCESS_SENDER_SVNT_Export \ + -Wb,skel_export_include=OneProcess_Sender_svnt_export.h \ + -Wb,exec_export_macro=ONEPROCESS_SENDER_EXEC_Export \ + -Wb,exec_export_include=OneProcess_Sender_exec_export.h \ + -I.. -GM + + IDL_Files { + OneProcess_Sender.idl + } +} + +project(AMI_OneProcess_Base_Sender_lem_gen) : ciaoidldefaults { + after += AMI_OneProcess_Base_Sender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=ONEPROCESS_SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=OneProcess_Sender_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + OneProcess_SenderE.idl + } +} + +project(AMI_OneProcess_Base_Sender_lem_stub) : ccm_svnt, ami { + after += AMI_OneProcess_Base_Sender_lem_gen AMI_OneProcess_stub Conn_OneProcess_Base_stub + libs += OneProcess_stub + libpaths += ../lib + libout = ../lib + sharedname = OneProcess_Sender_lem_stub + dynamicflags = ONEPROCESS_SENDER_LEM_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcess_SenderEC.cpp + } + + Header_Files { + OneProcess_SenderEC.h + OneProcess_Sender_lem_stub_export.h + } + + Inline_Files { + OneProcess_SenderEC.inl + } +} + +project(AMI_OneProcess_Base_Sender_stub) : ccm_stub, ami { + after += AMI_OneProcess_Base_Sender_idl_gen AMI_OneProcess_Base_stub AMI_OneProcess_stub Conn_OneProcess_Base_stub + libs += OneProcess_stub + libpaths += ../lib + libout = ../lib + sharedname = OneProcess_Sender_stub + dynamicflags = ONEPROCESS_SENDER_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcess_SenderC.cpp + } + + Header_Files { + OneProcess_SenderC.h + OneProcess_Sender_stub_export.h + } + + Inline_Files { + OneProcess_SenderC.inl + } +} + +project(AMI_OneProcess_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { + after += AMI_OneProcess_Base_Sender_lem_stub AMI_OneProcess_Base_Sender_stub AMI_OneProcess_Base_exec Conn_OneProcess_Base_stub AMI_OneProcess_lem_stub + sharedname = OneProcess_Sender_exec + libs += OneProcess_Sender_stub OneProcess_Sender_lem_stub OneProcess_stub OneProcess_stub OneProcess_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags = ONEPROCESS_SENDER_EXEC_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcess_Sender_exec.cpp + } + + Header_Files { + OneProcess_Sender_exec.h + OneProcess_Sender_exec_export.h + } + + Inline_Files { + } +} + +project(AMI_OneProcess_Base_Sender_svnt) : ciao_servant, ami { + after += AMI_OneProcess_Base_skel AMI_OneProcess_Base_Sender_lem_stub AMI_OneProcess_Base_exec AMI_OneProcess_skel + sharedname = OneProcess_Sender_svnt + libs += OneProcess_Sender_stub OneProcess_Sender_lem_stub \ + OneProcess_skel \ + OneProcess_stub + libpaths += ../lib + libout = ../lib + dynamicflags = ONEPROCESS_SENDER_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + OneProcess_SenderS.cpp + OneProcess_Sender_svnt.cpp + } + + Header_Files { + OneProcess_SenderS.h + OneProcess_Sender_svnt.h + OneProcess_Sender_svnt_export.h + } + + Inline_Files { + OneProcess_SenderS.inl + } +} + + diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp new file mode 100644 index 00000000000..0dcf6627c55 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp @@ -0,0 +1,212 @@ +// -*- C++ -*- +// $Id$ + +// sender, receiver and connector in one node: asynchronous callbacks. +#include "OneProcess_Sender_exec.h" +#include "ace/OS_NS_unistd.h" + +namespace CIAO_OneProcess_Sender_Impl +{ + Atomic_UShort nr_of_sent = 0; + CORBA::Boolean asynch = false; + //============================================================ + // Facet Executor Implementation Class: MyFoo_callback_exec_i + //============================================================ + MyFoo_callback_exec_i::MyFoo_callback_exec_i (void) + { + } + + MyFoo_callback_exec_i::~MyFoo_callback_exec_i (void) + { + } + + //============================================================ + // Operations from ::CCM_AMI::MyFoo_callback + //============================================================ + // FOO methods + void + MyFoo_callback_exec_i::foo ( + ::CORBA::Long ami_return_val, + const char * answer) + { + if (ami_return_val == 1) + { + ACE_DEBUG ((LM_DEBUG, "OK: GET ASYNCHROON CALLBACK, answer = <%C>\n", + answer)); + --nr_of_sent; + } + if (ami_return_val == 2) + { + ACE_ERROR ((LM_ERROR, "ERROR: GET ASYNCHROON CALLBACK " + "FROM SYNCHROON SENT MESSAGE\n")); + } + } + + void + MyFoo_callback_exec_i::foo_excep ( + ::CCM_AMI::ExceptionHolder * excep_holder) + { + excep_holder->raise_exception (); + } + //============================================================ + // Worker thread for asynchronous invocations for MyFoo + //============================================================ + asynch_foo_generator::asynch_foo_generator ( + ::OneProcess::AMI4CCM_MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::OneProcess::AMI4CCM_MyFoo::_duplicate (my_foo_ami)) + { + } + + int asynch_foo_generator::svc () + { + for (int i = 0; i < 5; ++i) + { + ACE_DEBUG ((LM_DEBUG, "OK: SEND ASYNCHROON\n")); + if (nr_of_sent.value() > 1) + { + ACE_DEBUG ((LM_DEBUG, "OK: number of asynchroon sent = %u\n", + nr_of_sent.value())); + asynch = true; + } + if (CORBA::is_nil (my_foo_ami_)) + { + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + return 1; + } + else + { + ++nr_of_sent; + //Invoke Asynchronous calls to test + my_foo_ami_->sendc_foo ( new MyFoo_callback_exec_i (), + "Hi", 1); + } + } + return 0; + } + + //============================================================ + // Worker thread for synchronous invocations for MyFoo + //============================================================ + synch_foo_generator::synch_foo_generator ( + ::OneProcess::MyFoo_ptr my_foo_ami) + : my_foo_ami_ (::OneProcess::MyFoo::_duplicate (my_foo_ami)) + { + } + + int synch_foo_generator::svc () + { + CORBA::Boolean wait = false; + for (int i = 0; i < 5; ++i) + { + ACE_DEBUG ((LM_DEBUG, "OK: SEND SYNCHROON\n")); + //run some synch calls + char * answer = 0; + try + { + if( wait==true) + { + ACE_ERROR ((LM_ERROR, + "ERROR: NOT RECEIVED SYNCHROON answer.\n")); + } + wait = true; + CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", + 2 , + answer); + if ( result == 2) + { + ACE_DEBUG ((LM_DEBUG, "OK: RECEIVED SYNCHROON answer <%C>\n", + answer)); + wait = false; + } + } + catch (const OneProcess::InternalError&) + { + ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " + "Unexpected exception.\n")); + } + } + return 0; + } + + //============================================================ + // Component Executor Implementation Class: Sender_exec_i + //============================================================ + Sender_exec_i::Sender_exec_i (void) + : global_foo_callback_ (0) + { + } + + Sender_exec_i::~Sender_exec_i (void) + { + } + + // Supported operations and attributes. + // Component attributes. + // Operations from Components::SessionComponent. + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = + ::OneProcess::CCM_Sender_Context::_narrow (ctx); + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + } + + void + Sender_exec_i::ccm_activate (void) + { + ::OneProcess::AMI4CCM_MyFoo_var asynch_foo = + this->context_->get_connection_sendc_run_my_foo(); + asynch_foo_generator* asynch_foo_gen = + new asynch_foo_generator (asynch_foo); + asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); + + ::OneProcess::MyFoo_var synch_foo = + this->context_->get_connection_run_my_foo (); + synch_foo_generator* synch_foo_gen = + new synch_foo_generator (synch_foo); + synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); + } + + void + Sender_exec_i::ccm_passivate (void) + { + } + + void + Sender_exec_i::ccm_remove (void) + { + if (asynch == false) + { + ACE_ERROR ((LM_ERROR, + "ERROR: All in one proces is not asynchroon!\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, + "OK: All in one proces is asynchroon\n")); + } + } + + extern "C" ::Components::EnterpriseComponent_ptr + create_OneProcess_AMI_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_RETURN ( + retval, + Sender_exec_i, + ::Components::EnterpriseComponent::_nil ()); + + return retval; + } +} diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h new file mode 100644 index 00000000000..5424e8958a5 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h @@ -0,0 +1,84 @@ +// -*- C++ -*- +// +// $Id$ + +#ifndef CIAO_ONEPROCESS_SENDER_EXEC_H_ +#define CIAO_ONEPROCESS_SENDER_EXEC_H_ + +#include "OneProcess_SenderEC.h" +#include "OneProcess_Sender_exec_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "ace/Task.h" + +namespace CIAO_OneProcess_Sender_Impl +{ + typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::UShort > Atomic_UShort; + + /// Worker thread for asynchronous invocations + class asynch_foo_generator : public virtual ACE_Task_Base + { + public: + asynch_foo_generator (::OneProcess::AMI4CCM_MyFoo_ptr my_foo_ami); + + virtual int svc (void); + + private: + ::OneProcess::AMI4CCM_MyFoo_var my_foo_ami_; + }; + + /// Worker thread for synchronous invocations + class synch_foo_generator : public virtual ACE_Task_Base + { + public: + synch_foo_generator (::OneProcess::MyFoo_ptr my_foo_ami); + virtual int svc (void); + + private: + ::OneProcess::MyFoo_var my_foo_ami_; + }; + + class MyFoo_callback_exec_i + : public virtual ::OneProcess::CCM_AMI4CCM_MyFooReplyHandler, + public virtual ::CORBA::LocalObject + { + public: + MyFoo_callback_exec_i (void); + virtual ~MyFoo_callback_exec_i (void); + + virtual void foo (::CORBA::Long ami_return_val, const char * answer); + virtual void foo_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); + }; + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + 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: + ::OneProcess::CCM_Sender_Context_var context_; + MyFoo_callback_exec_i* global_foo_callback_; + }; + + extern "C" ONEPROCESS_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_OneProcess_AMI_Sender_Impl (void); +} + +#endif /* ifndef */ diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp new file mode 100644 index 00000000000..54c9c405533 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp @@ -0,0 +1,373 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<Deployment:DeploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <UUID>6D382DAE-9024-4C4D-B91B-A0F9176AFACF</UUID> + + <implementation xmi:id="OneProcess_ReceiverHomeImplementation"> + <name>OneProcess_ReceiverHomeImplementation</name> + <source/> + <artifact xmi:idref="OneProcess_Receiver_ExecArtifact"/> + <artifact xmi:idref="OneProcess_Receiver_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="OneProcess_SenderHomeImplementation"> + <name>OneProcess_SenderHomeImplementation</name> + <source/> + <artifact xmi:idref="OneProcess_Sender_ExecArtifact"/> + <artifact xmi:idref="OneProcess_Sender_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="OneProcess_AMIHomeImplementation"> + <name>OneProcess_AMIHomeImplementation</name> + <source/> + <artifact xmi:idref="OneProcess_AMI_ExecArtifact"/> + <artifact xmi:idref="OneProcess_AMI_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI4CCM_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Receiver"> + <name>OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Receiver</name> + <node>Receiver</node> + <source/> + <implementation xmi:idref="OneProcess_ReceiverHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Sender"> + <name>OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Sender</name> + <node>Sender</node> + <source/> + <implementation xmi:idref="OneProcess_SenderHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.AMI"> + <name>OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.AMI</name> + <node>Sender</node> + <source/> + <implementation xmi:idref="OneProcess_AMIHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>AMI.ior</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>run_asynch_foo_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>sendc_run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Sender" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_provides</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>do_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_uses</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>synch_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Sender" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="OneProcess_AMI_SvntArtifact"> + <name>OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name> + <source/> + <node/> + <location>OneProcess_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_AMI_ExecArtifact"> + <name>OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_exec</name> + <source/> + <node/> + <location>OneProcess_conn</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI4CCM_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_Receiver_SvntArtifact"> + <name>OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name> + <source/> + <node/> + <location>OneProcess_Receiver_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_Receiver_ExecArtifact"> + <name>OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name> + <source/> + <node/> + <location>OneProcess_Receiver_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_ReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_Sender_SvntArtifact"> + <name>OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name> + <source/> + <node/> + <location>OneProcess_Sender_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_Sender_ExecArtifact"> + <name>OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_exec</name> + <source/> + <node/> + <location>OneProcess_Sender_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_SenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + +</Deployment:DeploymentPlan> diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/PlanOne.cdp b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/PlanOne.cdp new file mode 100644 index 00000000000..a80a350f2a4 --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/PlanOne.cdp @@ -0,0 +1,395 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<Deployment:DeploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <UUID>6D382DAE-9024-4C4D-B91B-A0F9176AFACF</UUID> + + <implementation xmi:id="OneProcess_ReceiverHomeImplementation"> + <name>OneProcess_ReceiverHomeImplementation</name> + <source/> + <artifact xmi:idref="OneProcess_Receiver_ExecArtifact"/> + <artifact xmi:idref="OneProcess_Receiver_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="OneProcess_SenderHomeImplementation"> + <name>OneProcess_SenderHomeImplementation</name> + <source/> + <artifact xmi:idref="OneProcess_Sender_ExecArtifact"/> + <artifact xmi:idref="OneProcess_Sender_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="OneProcess_AMIHomeImplementation"> + <name>OneProcess_AMIHomeImplementation</name> + <source/> + <artifact xmi:idref="OneProcess_AMI_ExecArtifact"/> + <artifact xmi:idref="OneProcess_AMI_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI4CCM_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Receiver"> + <name>OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Receiver</name> + <node>AllInOne</node> + <source/> + <implementation xmi:idref="OneProcess_ReceiverHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Sender"> + <name>OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Sender</name> + <node>AllInOne</node> + <source/> + <implementation xmi:idref="OneProcess_SenderHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentServer.Args</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-ORBAMICollocation 0</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.AMI"> + <name>OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.AMI</name> + <node>AllInOne</node> + <source/> + <implementation xmi:idref="OneProcess_AMIHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>AMI.ior</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentServer.Args</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-ORBAMICollocation 0</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>run_asynch_foo_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>sendc_run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Sender" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_provides</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>do_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_uses</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>synch_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Sender" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="OneProcess_AMI_SvntArtifact"> + <name>OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name> + <source/> + <node/> + <location>OneProcess_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_AMI_ExecArtifact"> + <name>OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_exec</name> + <source/> + <node/> + <location>OneProcess_conn</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI4CCM_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_Receiver_SvntArtifact"> + <name>OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name> + <source/> + <node/> + <location>OneProcess_Receiver_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_Receiver_ExecArtifact"> + <name>OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name> + <source/> + <node/> + <location>OneProcess_Receiver_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_ReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_Sender_SvntArtifact"> + <name>OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name> + <source/> + <node/> + <location>OneProcess_Sender_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="OneProcess_Sender_ExecArtifact"> + <name>OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_exec</name> + <source/> + <node/> + <location>OneProcess_Sender_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_OneProcess_AMI_SenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + +</Deployment:DeploymentPlan> diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl new file mode 100644 index 00000000000..2153984dbdd --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl @@ -0,0 +1,244 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 3; +@ports = ( 60000, 60001 ); +@iorbases = ( "Sender.ior", "Receiver.ior", "AMI.ior" ); +@iorfiles = 0; +@nodenames = ( "Sender", "Receiver" ); + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('ciao_componentserver'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$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) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 30 seconds to allow task to complete\n"; +sleep (30); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl new file mode 100644 index 00000000000..e6d9179bdbd --- /dev/null +++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl @@ -0,0 +1,245 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 3; +@ports = ( 60000, 60001 ); +@iorbases = ( "Sender.ior", "Receiver.ior", "AMI.ior" ); +@iorfiles = 0; +#@nodenames = ( "Sender", "Receiver" ); +@nodenames = ( "AllInOne"); + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "PlanOne.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('ciao_componentserver'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$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) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 30 seconds to allow task to complete\n"; +sleep (30); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/modules/CIAO/connectors/dds4ccm/docs/DDS4CCM FTF2 Issue List batch1.doc b/modules/CIAO/connectors/dds4ccm/docs/DDS4CCM FTF2 Issue List batch1.doc Binary files differnew file mode 100644 index 00000000000..3061c28a78b --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/docs/DDS4CCM FTF2 Issue List batch1.doc diff --git a/modules/CIAO/connectors/dds4ccm/docs/DDS4CCM v1-1 b1.odt b/modules/CIAO/connectors/dds4ccm/docs/DDS4CCM v1-1 b1.odt Binary files differnew file mode 100644 index 00000000000..5a04aa87750 --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/docs/DDS4CCM v1-1 b1.odt diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl b/modules/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl index f3c49a5a087..f7cf81d392c 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl @@ -14,14 +14,7 @@ #pragma ciao lem "Connector/Hello_ConnectorE.idl" -module Hello -{ - module ::CCM_DDS::Typed <::DDSHello, ::DDSHelloSeq> HelloConn; - - connector Hello_Connector : HelloConn::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Hello; #endif /* HELLO_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl b/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl index b2cb9fc83d5..e55eee08cdc 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl @@ -14,7 +14,7 @@ module Hello { component Receiver { - port HelloConn::DDS_Listen info_out; + port Hello::DDS_Listen info_out; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; attribute string name; diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp index 7661d512983..47a7abf574d 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp @@ -208,7 +208,7 @@ namespace CIAO_Hello_Receiver_Impl } // Port operations. - ::Hello::HelloConn::CCM_Listener_ptr + ::Hello::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new DDSHello RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h index f04b0e85720..2e7bb44dd59 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h @@ -20,7 +20,7 @@ namespace CIAO_Hello_Receiver_Impl typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong; class HELLO_RECEIVER_EXEC_Export DDSHello_Listener_exec_i - : public virtual ::Hello::HelloConn::CCM_Listener, + : public virtual ::Hello::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -120,7 +120,7 @@ namespace CIAO_Hello_Receiver_Impl virtual char * name (void); virtual void name (const char *name); - virtual ::Hello::HelloConn::CCM_Listener_ptr + virtual ::Hello::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl index 7dbae7b2ce4..6465298ae11 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl @@ -16,7 +16,7 @@ module Hello { component Sender { - port HelloConn::DDS_Write info_in; + port Hello::DDS_Write info_in; attribute unsigned long rate; attribute unsigned long iterations; attribute string message; diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h index 8806da5da94..8c7245023b5 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h @@ -14,7 +14,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "ace/Task.h" #include "ace/Reactor.h" #include <map> @@ -127,7 +126,7 @@ namespace CIAO_Hello_Sender_Impl private: ::Hello::CCM_Sender_Context_var context_; - Hello::HelloConn::Writer_var writer_; + Hello::Writer_var writer_; pulse_Generator * ticker_; CORBA::ULong rate_; CORBA::ULong iteration_, iterations_; diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp index 7fa83efc8d3..14f57a33f70 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Impl</string> + <string>create_Hello_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Servant</string> + <string>create_Hello_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp index 2c6429403b9..4cf2e82c039 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp @@ -74,7 +74,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Impl</string> + <string>create_Hello_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -85,7 +85,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Servant</string> + <string>create_Hello_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp index c358229d69c..b7cba3b9462 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp @@ -74,7 +74,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Impl</string> + <string>create_Hello_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -85,7 +85,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Servant</string> + <string>create_Hello_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp index de44d461117..8e66dd765a8 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Impl</string> + <string>create_Hello_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Servant</string> + <string>create_Hello_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp index 5a71dfa85e2..9e17e911359 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Impl</string> + <string>create_Hello_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Servant</string> + <string>create_Hello_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp index 5bd769432db..9fc480339a1 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp @@ -74,7 +74,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Impl</string> + <string>create_Hello_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -85,7 +85,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Servant</string> + <string>create_Hello_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp index f79157f2c56..e7ffe3f0d92 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp +++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp @@ -74,7 +74,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Impl</string> + <string>create_Hello_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -85,7 +85,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Hello_Hello_Connector_Servant</string> + <string>create_Hello_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc b/modules/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc index 088aad9efe0..14ac3aeb06e 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc +++ b/modules/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc @@ -32,7 +32,7 @@ project(Large_Connector_lem_gen) : ciaoidldefaults, dds4ccm_base { } project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += Large_Connector_lem_gen Large_Connector_stub_stub Large_Deployment_stub + after += Large_Connector_lem_gen Large_Connector_stub Large_Deployment_stub libs += Large_Connector_stub Large_Deployment_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl index 905e7154a13..3ad320915d3 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl @@ -14,7 +14,7 @@ module Quoter { component Broker { - port CCM_DDS::Quoter::DDS_Listen info_out; + port ::Quoter::DDS_Listen info_out; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp index 3436cb80cd1..eecff8c06cb 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp @@ -243,7 +243,7 @@ namespace CIAO_Quoter_Broker_Impl // Port operations. - ::CCM_DDS::Quoter::CCM_Listener_ptr + ::Quoter::CCM_Listener_ptr Broker_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, "*************** out listener\n")); diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h index 487d058c5cd..bc953aa7923 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h +++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h @@ -43,7 +43,7 @@ namespace CIAO_Quoter_Broker_Impl }; class BROKER_EXEC_Export Stock_Info_Listener_exec_i - : public virtual ::CCM_DDS::Quoter::CCM_Listener, + : public virtual ::Quoter::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -94,7 +94,7 @@ namespace CIAO_Quoter_Broker_Impl // Port operations. - virtual ::CCM_DDS::Quoter::CCM_Listener_ptr + virtual ::Quoter::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -120,8 +120,8 @@ namespace CIAO_Quoter_Broker_Impl private: ::Quoter::CCM_Broker_Context_var context_; read_action_Generator * ticker_; - ::CCM_DDS::Quoter::Reader_var reader_; - ::CCM_DDS::Quoter::Getter_var getter_; + ::Quoter::Reader_var reader_; + ::Quoter::Getter_var getter_; }; extern "C" BROKER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl index be88f9381fe..e6780ddc620 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl @@ -14,16 +14,6 @@ #pragma ciao lem "Connector/Quoter_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::Quoter::Stock_Info, ::Quoter::Stock_InfoSeq> Quoter; -}; - -module Quoter -{ - connector Quoter_Connector : ::CCM_DDS::Quoter::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::Quoter::Stock_Info, ::Quoter::Stock_InfoSeq> Quoter; #endif /* QUOTER_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl index 57dd4bd9e8e..2744ca82141 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl @@ -24,7 +24,7 @@ module Quoter component Distributor supports Trigger { - port CCM_DDS::Quoter::DDS_Write info_in; + port Quoter::DDS_Write info_in; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; attribute unsigned long rate; }; diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp index 5fd9c63fed7..44e9c79c216 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp @@ -8,7 +8,6 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_time.h" #include "tao/ORB_Core.h" -#include <iostream> namespace CIAO_Quoter_Distributor_Impl { diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h index 1ab67b20547..9e1fac8b6eb 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h +++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h @@ -27,7 +27,8 @@ namespace CIAO_Quoter_Distributor_Impl /** * @class pulse generator * - * @brief an active object used by StockDistributor to perform periodical pulse generation + * @brief An active object used by StockDistributor to perform periodical + * pulse generation * */ class pulse_Generator : public ACE_Event_Handler @@ -35,7 +36,7 @@ namespace CIAO_Quoter_Distributor_Impl public: pulse_Generator (Distributor_exec_i &callback); - ~pulse_Generator (); + virtual ~pulse_Generator (); /// Handle the timeout. virtual int handle_timeout (const ACE_Time_Value &tv, @@ -43,7 +44,6 @@ namespace CIAO_Quoter_Distributor_Impl private: /// Maintains a handle that actually process the event Distributor_exec_i &pulse_callback_; - }; class DISTRIBUTOR_EXEC_Export ConnectorStatusListener_exec_i @@ -56,13 +56,13 @@ class DISTRIBUTOR_EXEC_Export ConnectorStatusListener_exec_i virtual void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, - const DDS::InconsistentTopicStatus & status); + const DDS::InconsistentTopicStatus & status); virtual void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader, const DDS::RequestedIncompatibleQosStatus & status); virtual - void on_sample_rejected( ::DDS::DataReader_ptr the_reader, - const DDS::SampleRejectedStatus & status); + void on_sample_rejected(::DDS::DataReader_ptr the_reader, + const DDS::SampleRejectedStatus & status); virtual void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer, const DDS::OfferedDeadlineMissedStatus & status); @@ -70,8 +70,8 @@ class DISTRIBUTOR_EXEC_Export ConnectorStatusListener_exec_i void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, const DDS::OfferedIncompatibleQosStatus & status); virtual - void on_unexpected_status( ::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind); + void on_unexpected_status(::DDS::Entity_ptr the_entity, + ::DDS::StatusKind status_kind); virtual void on_publication_matched ( ::DDS::DataWriter_ptr the_writer, const DDS::PublicationMatchedStatus & status); @@ -87,58 +87,24 @@ class DISTRIBUTOR_EXEC_Export ConnectorStatusListener_exec_i void tick (void); - // Supported operations and attributes. - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void - add_stock ( - const char * stock); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + virtual void add_stock (const char * stock); - virtual void - del_stock ( - const char * stock); + virtual void del_stock (const char * stock); - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + virtual void start (void); - virtual void - start (void); + virtual void stop (void); - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::CORBA::ULong rate (void); - virtual void - stop (void); - - // Component attributes. - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::ULong - rate (void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void - rate ( - ::CORBA::ULong rate); + virtual void rate (::CORBA::ULong rate); // Port operations. virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr get_info_out_connector_status (void); - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); + set_session_context (::Components::SessionContext_ptr ctx); virtual void configuration_complete (void); @@ -153,7 +119,7 @@ class DISTRIBUTOR_EXEC_Export ConnectorStatusListener_exec_i typedef std::map<ACE_CString, Quoter::Stock_Info_var> Stock_Table; Stock_Table stocks_; CORBA::ULong rate_; - CCM_DDS::Quoter::Writer_var writer_; + ::Quoter::Writer_var writer_; }; extern "C" DISTRIBUTOR_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp index 942fd32a0ca..c3e2bc7d371 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Quoter_Quoter_Connector_Impl</string> + <string>create_Quoter_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Quoter_Quoter_Connector_Servant</string> + <string>create_Quoter_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl index b5d399bda33..459384fc6e9 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl @@ -10,6 +10,7 @@ #pragma ndds typesupport "Base/Shapes_BaseSupport.h" #pragma opendds typesupport "Base/Shapes_BaseTypeSupportC.h" +#pragma splice typesupport "Base/Shapes_BaseDscpC.h" #pragma DCPS_DATA_TYPE "ShapeType" #pragma DCPS_DATA_KEY "ShapeType color" @@ -20,6 +21,7 @@ struct ShapeType { long y; long shapesize; }; +#pragma keylist ShapeType color #pragma DCPS_DATA_TYPE "Attributes" #pragma DCPS_DATA_KEY "Attributes shape" @@ -30,7 +32,8 @@ struct Attributes { string color; //@key float speed; }; - typedef sequence<ShapeType> ShapeTypeSeq; +#pragma keylist Attributes shape color + #endif diff --git a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl index be2a1a348d7..f6ff6eab9dd 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl @@ -14,13 +14,7 @@ #pragma ciao lem "Connector/Shapes_ConnectorE.idl" -module Shapes -{ - module ::CCM_DDS::Typed < ::ShapeType, ::ShapeTypeSeq> ShapeTypeConn; - connector Shapes_Connector : ShapeTypeConn::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::ShapeType, ::ShapeTypeSeq> Shapes; #endif /* SHAPES_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl index 527ea2a356b..844ab38288f 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl @@ -14,8 +14,8 @@ module Shapes { component Receiver { - port ShapeTypeConn::DDS_Listen info_out; - port ShapeTypeConn::DDS_Get info_get; + port Shapes::DDS_Listen info_out; + port Shapes::DDS_Get info_get; attribute unsigned long rate; attribute boolean get_data; //if true, get_one and get_all are invoked attribute boolean read_data;//if true, read_one and read_all are invoked. diff --git a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp index bf24d8f2014..f330d30a9f8 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp @@ -269,7 +269,7 @@ namespace CIAO_Shapes_Receiver_Impl } // Port operations. - ::Shapes::ShapeTypeConn::CCM_Listener_ptr + ::Shapes::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new ShapeType RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h index f98506554bb..bf93649681f 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h @@ -13,7 +13,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "ace/Task.h" #include "ace/Reactor.h" namespace CIAO_Shapes_Receiver_Impl @@ -45,7 +44,7 @@ namespace CIAO_Shapes_Receiver_Impl // ShapeType_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export ShapeType_Listener_exec_i - : public virtual ::Shapes::ShapeTypeConn::CCM_Listener, + : public virtual ::Shapes::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -113,7 +112,7 @@ namespace CIAO_Shapes_Receiver_Impl virtual void raw_listen (::CORBA::Boolean raw_listen); // Port operations. - virtual ::Shapes::ShapeTypeConn::CCM_Listener_ptr + virtual ::Shapes::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -135,8 +134,8 @@ namespace CIAO_Shapes_Receiver_Impl private: ::Shapes::CCM_Receiver_Context_var context_; - ::Shapes::ShapeTypeConn::Reader_var reader_; - ::Shapes::ShapeTypeConn::Getter_var getter_; + ::Shapes::Reader_var reader_; + ::Shapes::Getter_var getter_; read_action_Generator * ticker_; CORBA::ULong rate_; diff --git a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl index f6b3622d888..b0fe6568fc9 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl @@ -16,7 +16,7 @@ module Shapes { component Sender { - port ShapeTypeConn::DDS_Write info_write; + port Shapes::DDS_Write info_write; attribute unsigned long rate; attribute unsigned short max_x; attribute unsigned short max_y; diff --git a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h index 9fa93f905a4..f705690c5f2 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h @@ -13,7 +13,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "ace/Task.h" #include "ace/Reactor.h" namespace CIAO_Shapes_Sender_Impl @@ -81,7 +80,7 @@ namespace CIAO_Shapes_Sender_Impl void start (void); void stop (void); - Shapes::ShapeTypeConn::Writer_var writer_; + Shapes::Writer_var writer_; pulse_Generator * ticker_; ::Shapes::CCM_Sender_Context_var context_; diff --git a/modules/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp index afe644d93d1..01f77d8f87f 100644 --- a/modules/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Shapes_Shapes_Connector_Impl</string> + <string>create_Shapes_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Shapes_Shapes_Connector_Servant</string> + <string>create_Shapes_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc b/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc index 04a490c2635..e8d4471d3d8 100644 --- a/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc +++ b/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc @@ -1,6 +1,6 @@ // $Id$ -project (DDS4CCM_lem_gen) : dds4ccm, ciaoidldefaults { +project (DDS4CCM_lem_gen) : install, dds4ccm, ciaoidldefaults { custom_only = 1 after += DDS4CCM_idl_gen idlflags += -I$(CIAO_ROOT)/connectors \ @@ -23,7 +23,7 @@ project (DDS4CCM_lem_gen) : dds4ccm, ciaoidldefaults { } } -project (DDS4CCM_lem_stub) : dds4ccm, ccm_lem_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client { +project (DDS4CCM_lem_stub) : install, dds4ccm, ccm_lem_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client { after += DDS4CCM_stub DDS4CCM_lem_gen libs += DDS4CCM_stub includes += $(CIAO_ROOT)/connectors diff --git a/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc index a3fe6f44635..82c33e5c4de 100644 --- a/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc +++ b/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc @@ -1,6 +1,6 @@ // $Id$ -project (DDS4CCM_skel) : dds4ccm, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant { +project (DDS4CCM_skel) : install, dds4ccm, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant { after += DDS4CCM_lem_stub libs += DDS4CCM_lem_stub DDS4CCM_stub includes += $(CIAO_ROOT)/connectors diff --git a/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc index 8788f8dd6cf..6fbc8f40d6e 100644 --- a/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc +++ b/modules/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc @@ -1,6 +1,6 @@ // $Id$ -project (DDS4CCM_idl_gen) : dds4ccm, componentidldefaults { +project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults { custom_only = 1 idlflags += -Wb,stub_export_macro=DDS4CCM_STUB_Export \ -Wb,stub_export_include=dds4ccm_stub_export.h \ @@ -25,7 +25,7 @@ project (DDS4CCM_idl_gen) : dds4ccm, componentidldefaults { } } -project (DDS4CCM_stub) : dds4ccm, ccm_stub, ciaolib_with_idl, ciao_output, taolib { +project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_output, taolib { after += DDS4CCM_idl_gen includes += $(CIAO_ROOT)/connectors diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp index 2a2a0597606..fc5a8f7516c 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp @@ -1,7 +1,11 @@ // $Id$ #include "dds4ccm/impl/dds/Coherent_Changes_Guard.h" -CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (DDSPublisher* p, bool coherent_write) : p_ (p), coherent_write_ (coherent_write) +CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard ( + DDSPublisher* p, + bool coherent_write) : + p_ (p), + coherent_write_ (coherent_write) { if (this->coherent_write_) { diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp index c97ea2c28e8..621c0aba461 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp @@ -35,8 +35,8 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_expression_parameters"); #if (CIAO_DDS4CCM_NDDS==1) DDS_StringSeq parameters; - ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( - parameters); + ::DDS::ReturnCode_t retval = + this->impl ()->get_expression_parameters (parameters); expression_parameters <<= parameters; #else ::DDS::ReturnCode_t retval = diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h b/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h index 4522640e079..1fa9c9ea584 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h @@ -42,8 +42,7 @@ public: void passivate (void); - void remove ( - ::DDS::Subscriber_ptr subscriber); + void remove (::DDS::Subscriber_ptr subscriber); protected: /** diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h b/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h index 19c91c8f034..b6f3f3af995 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h @@ -63,11 +63,10 @@ protected: ::DDS::Subscriber_var subscriber_; ::DDS::SubscriberListener_var subscriber_listener_; -typedef ::CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE> TopicListener; -typedef ::CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE> SubscriberListener; -typedef ::CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE> PublisherListener; -typedef DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE> BaseConnector; - + typedef ::CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE> TopicListener; + typedef ::CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE> SubscriberListener; + typedef ::CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE> PublisherListener; + typedef DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE> BaseConnector; }; #include "dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp" diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h b/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h index 11912ec8606..9eb39237ee3 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h @@ -31,8 +31,7 @@ public: void passivate (void); - void remove ( - ::DDS::Publisher_ptr publisher); + void remove (::DDS::Publisher_ptr publisher); private: /** diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h b/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h index a519df704c1..7240bb842ed 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h @@ -39,8 +39,7 @@ public: void passivate (void); - void remove ( - ::DDS::Publisher_ptr publisher); + void remove (::DDS::Publisher_ptr publisher); private: /** diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp index 663b0c6332f..e73e3bb7237 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp @@ -82,7 +82,8 @@ namespace CIAO CCM_DDS_DataReader_i::get_instance_handle (void) { #if (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS_InstanceHandle_t const rtihandle = + this->impl ()->get_instance_handle (); ::DDS::InstanceHandle_t handle; handle <<= rtihandle; return handle; @@ -99,7 +100,8 @@ namespace CIAO { ::DDS::ReadCondition_var retval = ::DDS::ReadCondition::_nil (); #if (CIAO_DDS4CCM_NDDS==1) - DDSReadCondition* rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states); + DDSReadCondition* rc = + this->impl ()->create_readcondition (sample_states, view_states, instance_states); if (rc) { ACE_NEW_THROW_EX (retval, @@ -107,7 +109,8 @@ namespace CIAO CORBA::NO_MEMORY ()); } #else - ::DDS::ReadCondition_var rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states); + ::DDS::ReadCondition_var rc = + this->impl ()->create_readcondition (sample_states, view_states, instance_states); if (! ::CORBA::is_nil (rc.in ())) { ACE_NEW_THROW_EX (retval, @@ -239,7 +242,8 @@ namespace CIAO #if (CIAO_DDS4CCM_NDDS==1) DDSDataReaderListener *drl = this->impl ()->get_listener (); - CCM_DDS_DataReaderListener_i *ccm_dds_drl = dynamic_cast <CCM_DDS_DataReaderListener_i *> (drl); + CCM_DDS_DataReaderListener_i *ccm_dds_drl = + dynamic_cast <CCM_DDS_DataReaderListener_i *> (drl); if (!ccm_dds_drl) { DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DataReader_i::get_listener - " @@ -351,7 +355,8 @@ namespace CIAO { #if (CIAO_DDS4CCM_NDDS==1) DDS_RequestedIncompatibleQosStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_incompatible_qos_status (ddsstatus); + ::DDS::ReturnCode_t const retval = + this->impl ()->get_requested_incompatible_qos_status (ddsstatus); status <<= ddsstatus; return retval; #else diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp index 47dbb3ad855..9ea2fac4c0c 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp @@ -27,11 +27,16 @@ namespace CIAO { } - ::DDS::DataReader_ptr + ::DDS::CCM_DataReader_ptr CCM_DDS_DataReaderListener_i::get_datareader_proxy ( ::DDSDataReader * the_reader) { DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::get_datareader_proxy"); + ::DDS::CCM_DataReader_var dds_reader = ::DDS::CCM_DataReader::_nil (); + ACE_NEW_NORETURN (dds_reader, + CCM_DDS_DataReader_i (the_reader)); + return dds_reader._retn (); +/* // Retrieve the pointer to the proxy from the QoS ::DDS_DataReaderQos qos; the_reader->get_qos (qos); @@ -42,14 +47,19 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DataReaderListener_i::get_datareader_proxy -" "Unable to retrieve proxy from PropertyQosProfile\n")); - return ::DDS::DataReader::_nil (); + return ::DDS::CCM_DataReader::_nil (); } ::DDS::CCM_DataReader_ptr reader = reinterpret_cast < ::DDS::CCM_DataReader_ptr > (ACE_OS::atol (prop->value)); + if (::CORBA::is_nil (reader)) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DataReaderListener_i::get_datareader_proxy -" + "Unable to retrieve reader from PropertyQosProfile\n")); + } - return reinterpret_cast < ::DDS::DataReader_ptr > - (reader); + return reader; +*/ } void diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h index 255aab5947f..900fa8eacfa 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h @@ -14,6 +14,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsC.h" #include "dds4ccm_dds_impl_export.h" #include "dds4ccm/impl/dds4ccm_conf.h" +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #if (CIAO_DDS4CCM_NDDS==1) # include "ndds/ndds_cpp.h" @@ -68,7 +69,7 @@ namespace CIAO private: ::DDS::DataReaderListener_var impl_; - ::DDS::DataReader_ptr + ::DDS::CCM_DataReader_ptr get_datareader_proxy (::DDSDataReader * the_reader); }; } diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp index cb6bf20c158..a8107c2e59a 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp @@ -72,9 +72,10 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (:: if (!reader) { - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::on_data_available_i - " - "Failed to retrieve pointer to proxy from " - "DDSDataReader.\n"))); + DDS4CCM_ERROR (1, (LM_ERROR, + ACE_TEXT ("DataReaderListener_T::on_data_available_i - ") + ACE_TEXT ("Failed to retrieve pointer to proxy from ") + ACE_TEXT ("DDSDataReader.\n"))); return; } @@ -170,7 +171,7 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( CIAO_debug_level >= 10) { mask |= PortStatusListener::get_mask (listener); - DDS4CCM_DEBUG (9, (LM_DEBUG, "DataReaderListener_T::get_mask - " + DDS4CCM_DEBUG (10, (LM_DEBUG, "DataReaderListener_T::get_mask - " "Mask becomes %d\n", mask)); } diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp index 9af264a8e29..5fe3d1ed342 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp @@ -15,15 +15,15 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE>::DataReader_T (void) impl_ (0), rd_condition_ (0), ws_ (0), - #if (DDS4CCM_USES_QUERY_CONDITION==1) - qc_reader_ (0), - qc_getter_ (0), - qc_listener_ (0) - #else - cft_ (0), - library_name_ (""), - profile_name_ ("") - #endif +#if (DDS4CCM_USES_QUERY_CONDITION==1) + qc_reader_ (0), + qc_getter_ (0), + qc_listener_ (0) +#else + cft_ (0), + library_name_ (""), + profile_name_ ("") +#endif { DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReader_T::DataReader_T"); } @@ -662,7 +662,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE>::set_proxy ( value, DDS_BOOLEAN_FALSE); dr->set_qos (qos); - delete value; + delete[] value; } template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp index bd2f7a2965d..735141dbe19 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp @@ -61,7 +61,7 @@ namespace CIAO ::DDS::ReturnCode_t CCM_DDS_DataWriter_i::set_listener (::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) + ::DDS::StatusMask mask) { CCM_DDS_DataWriterListener_i* ccm_dds_impl_list = 0; if (! ::CORBA::is_nil (a_listener)) @@ -154,12 +154,14 @@ namespace CIAO } ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status) + CCM_DDS_DataWriter_i::get_offered_deadline_missed_status ( + ::DDS::OfferedDeadlineMissedStatus & status) { #if (CIAO_DDS4CCM_NDDS==1) ::DDS_OfferedDeadlineMissedStatus ddsstatus; ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_deadline_missed_status (ddsstatus); + ::DDS::ReturnCode_t const retval = + this->impl ()->get_offered_deadline_missed_status (ddsstatus); status <<= ddsstatus; return retval; #else @@ -168,12 +170,14 @@ namespace CIAO } ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status) + CCM_DDS_DataWriter_i::get_offered_incompatible_qos_status ( + ::DDS::OfferedIncompatibleQosStatus & status) { #if (CIAO_DDS4CCM_NDDS==1) ::DDS_OfferedIncompatibleQosStatus ddsstatus; ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_incompatible_qos_status (ddsstatus); + ::DDS::ReturnCode_t const retval = + this->impl ()->get_offered_incompatible_qos_status (ddsstatus); status <<= ddsstatus; return retval; #else @@ -182,12 +186,14 @@ namespace CIAO } ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::get_publication_matched_status (::DDS::PublicationMatchedStatus & status) + CCM_DDS_DataWriter_i::get_publication_matched_status ( + ::DDS::PublicationMatchedStatus & status) { #if (CIAO_DDS4CCM_NDDS==1) ::DDS_PublicationMatchedStatus ddsstatus; ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = this->impl ()->get_publication_matched_status (ddsstatus); + ::DDS::ReturnCode_t const retval = + this->impl ()->get_publication_matched_status (ddsstatus); status <<= ddsstatus; return retval; #else @@ -202,7 +208,8 @@ namespace CIAO } ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles) + CCM_DDS_DataWriter_i::get_matched_subscriptions ( + ::DDS::InstanceHandleSeq & subscription_handles) { #if (CIAO_DDS4CCM_NDDS==1) ::DDS_InstanceHandleSeq rtiseq; @@ -216,16 +223,17 @@ namespace CIAO } ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, - DDS_INSTANCE_HANDLE_T_IN subscription_handle) + CCM_DDS_DataWriter_i::get_matched_subscription_data ( + ::DDS::SubscriptionBuiltinTopicData & subscription_data, + DDS_INSTANCE_HANDLE_T_IN subscription_handle) { DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::get_matched_subscription_data"); #if (CIAO_DDS4CCM_NDDS==1) ::DDS_SubscriptionBuiltinTopicData ccm_dds_sub_data; ::DDS_InstanceHandle_t ccm_dds_sub_handle; ccm_dds_sub_handle <<= subscription_handle; - ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscription_data (ccm_dds_sub_data, - ccm_dds_sub_handle); + ::DDS::ReturnCode_t const retval = + this->impl ()->get_matched_subscription_data (ccm_dds_sub_data, ccm_dds_sub_handle); subscription_data <<= ccm_dds_sub_data; return retval; #else @@ -267,7 +275,8 @@ namespace CIAO CCM_DDS_DataWriter_i::get_instance_handle (void) { #if (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS_InstanceHandle_t const rtihandle = + this->impl ()->get_instance_handle (); ::DDS::InstanceHandle_t handle; handle <<= rtihandle; return handle; @@ -303,7 +312,7 @@ namespace CIAO value, DDS_BOOLEAN_FALSE); dw->set_qos (qos); - delete value; + delete[] value; } this->impl_ = dw; } diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp index e2f2fade0f3..bb14468f7b8 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp @@ -23,11 +23,11 @@ namespace CIAO { } - ::DDS::DataWriter_ptr + ::DDS::CCM_DataWriter_ptr CCM_DDS_DataWriterListener_i::get_datawriter_proxy (::DDSDataWriter * the_writer) { DDS4CCM_TRACE ("CCM_DDS_DataWriterListener_i::get_datawriter_proxy"); - //Retrieve the pointer to the proxy from the QoS + // Retrieve the pointer to the proxy from the QoS ::DDS_DataWriterQos qos; the_writer->get_qos (qos); DDS_Property_t * prop = @@ -35,16 +35,22 @@ namespace CIAO "CCM_DataWriterProxy"); if (!prop) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DataReaderListener_i::get_datareader_proxy -" + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DataWriterListener_i::get_datareader_proxy -" "Unable to retrieve proxy from PropertyQosProfile\n")); - return ::DDS::DataWriter::_nil (); + return ::DDS::CCM_DataWriter::_nil (); } - ::DDS::CCM_DataWriter_ptr writer = - reinterpret_cast < ::DDS::CCM_DataWriter_ptr > + + CCM_DDS_DataWriter_i* writer = + reinterpret_cast < CCM_DDS_DataWriter_i* > (ACE_OS::atol (prop->value)); - return reinterpret_cast < ::DDS::DataWriter_ptr > - (writer); + if (!writer) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DataWriterListener_i::get_datareader_proxy -" + "Unable to get writer from PropertyQosProfile\n")); + } + + return writer; } void @@ -52,6 +58,7 @@ namespace CIAO ::DDSDataWriter *the_writer, const ::DDS_OfferedDeadlineMissedStatus & status) { + DDS4CCM_TRACE ("CCM_DDS_DataWriterListener_i::on_offered_deadline_missed"); #if (CIAO_DDS4CCM_NDDS==1) ::DDS::OfferedDeadlineMissedStatus ddsstatus; ddsstatus <<= status; @@ -70,6 +77,7 @@ namespace CIAO ::DDSDataWriter *the_writer, const ::DDS_OfferedIncompatibleQosStatus & status) { + DDS4CCM_TRACE ("CCM_DDS_DataWriterListener_i::on_offered_incompatible_qos"); #if (CIAO_DDS4CCM_NDDS==1) ::DDS::OfferedIncompatibleQosStatus ddsstatus; ddsstatus <<= status; @@ -88,6 +96,7 @@ namespace CIAO ::DDSDataWriter *the_writer, const ::DDS_LivelinessLostStatus & status) { + DDS4CCM_TRACE ("CCM_DDS_DataWriterListener_i::on_liveliness_lost"); #if (CIAO_DDS4CCM_NDDS==1) ::DDS::LivelinessLostStatus ddsstatus; ddsstatus <<= status; @@ -106,6 +115,7 @@ namespace CIAO ::DDSDataWriter *the_writer, const ::DDS_PublicationMatchedStatus & status) { + DDS4CCM_TRACE ("CCM_DDS_DataWriterListener_i::on_publication_matched"); #if (CIAO_DDS4CCM_NDDS==1) ::DDS::PublicationMatchedStatus ddsstatus; ddsstatus <<= status; diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h b/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h index de3bb992fe5..7330b89fceb 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h @@ -65,7 +65,7 @@ namespace CIAO private: ::DDS::DataWriterListener_var impl_; - ::DDS::DataWriter_ptr + ::DDS::CCM_DataWriter_ptr get_datawriter_proxy (::DDSDataWriter * the_writer); }; } diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp index 4e97bc12ba1..c0da416b81a 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp @@ -571,9 +571,9 @@ namespace CIAO if (this->remove_topic (top)) { ACE_CString name ("DDS4CCM_CFT_"); - name.append (ACE_TEXT (top->get_name ()), ACE_OS::strlen (top->get_name ())); + name.append (top->get_name (), ACE_OS::strlen (top->get_name ())); ::DDS::TopicDescription_var td = - lookup_topicdescription (ACE_TEXT (name.c_str ())); + lookup_topicdescription (name.c_str ()); if (! ::CORBA::is_nil (td.in ())) { ::DDS::ContentFilteredTopic_var cft = ::DDS::ContentFilteredTopic::_narrow (td.in ()); diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp index 3b1908901d2..ee06d22debe 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp @@ -54,7 +54,7 @@ namespace CIAO CORBA::NO_MEMORY ()); } - ACE_CString qos_profile = ACE_TEXT ("default"); + ACE_CString qos_profile = "default"; ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, this->dps_mutex_, CORBA::INTERNAL ()); @@ -131,7 +131,7 @@ namespace CIAO } ACE_CString qos_profile = library_name; - qos_profile += ACE_TEXT ("#"); + qos_profile += "#"; qos_profile += profile_name; ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h b/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h index 4a1439ecba1..ebaf7c5666f 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h @@ -47,26 +47,26 @@ namespace CIAO virtual ::DDS::DomainParticipantFactory_ptr get_instance (void); #endif - virtual - ::DDS::DomainParticipant_ptr create_participant (::DDS::DomainId_t domain_id, - const ::DDS::DomainParticipantQos & qos, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::DomainParticipant_ptr create_participant ( + ::DDS::DomainId_t domain_id, + const ::DDS::DomainParticipantQos & qos, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask); #if (CIAO_DDS4CCM_NDDS==1) - virtual - ::DDS::DomainParticipant_ptr create_participant_with_profile (::DDS::DomainId_t domain_id, - const char * library_name, - const char * profile_name, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::DomainParticipant_ptr create_participant_with_profile ( + ::DDS::DomainId_t domain_id, + const char * library_name, + const char * profile_name, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask); #endif - virtual - ::DDS::ReturnCode_t delete_participant (::DDS::DomainParticipant_ptr a_participant); + virtual ::DDS::ReturnCode_t delete_participant ( + ::DDS::DomainParticipant_ptr a_participant); - virtual - ::DDS::DomainParticipant_ptr lookup_participant (::DDS::DomainId_t domain_id); + virtual ::DDS::DomainParticipant_ptr lookup_participant ( + ::DDS::DomainId_t domain_id); virtual ::DDS::ReturnCode_t set_default_participant_qos (const ::DDS::DomainParticipantQos & qos); diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp index d045bdd6285..257ece83715 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp @@ -213,7 +213,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one ( DDS_ReturnCode_t retcode = this->impl ()->read_w_condition (data, sample_info); - if (retcode == DDS_RETCODE_NO_DATA) + if (retcode == ::DDS::RETCODE_NO_DATA) { DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " @@ -299,7 +299,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, false>::get_one ( DDS_ReturnCode_t retcode = this->impl ()->read_w_condition (data, sample_info); - if (retcode == DDS_RETCODE_NO_DATA) + if (retcode == ::DDS::RETCODE_NO_DATA) { DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, false>::get_one - " diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp index a49af976e29..d8816a20a62 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp @@ -174,7 +174,7 @@ CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( if (! ::CORBA::is_nil (psl) || CIAO_debug_level >= 10) { - DDS4CCM_DEBUG (9, (LM_DEBUG, "PortStatusListener_T::get_mask - " + DDS4CCM_DEBUG (10, (LM_DEBUG, "PortStatusListener_T::get_mask - " "Mask becomes %d\n", DDS_REQUESTED_DEADLINE_MISSED_STATUS | DDS_SAMPLE_LOST_STATUS)); diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp index fdd3bed1a68..4489f2b8be7 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp @@ -30,7 +30,7 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::~CCM_DDS_PublisherListener_i"); } - ::DDS::DataWriter_ptr + ::DDS::CCM_DataWriter_ptr CCM_DDS_PublisherListener_i::get_datawriter_proxy (::DDSDataWriter * the_writer) { DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::get_datawriter_proxy"); @@ -42,16 +42,24 @@ namespace CIAO "CCM_DataWriterProxy"); if (!prop) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DataReaderListener_i::get_datareader_proxy -" - "Unable to retrieve proxy from PropertyQosProfile\n")); - return ::DDS::DataWriter::_nil (); + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO + "CCM_DDS_PublisherListener_i::get_datareader_proxy -" + "Unable to retrieve proxy from PropertyQosProfile\n")); + return ::DDS::CCM_DataWriter::_nil (); } - ::DDS::CCM_DataWriter_ptr writer = - reinterpret_cast < ::DDS::CCM_DataWriter_ptr > + + CCM_DDS_DataWriter_i* writer = + reinterpret_cast < CCM_DDS_DataWriter_i* > (ACE_OS::atol (prop->value)); - return reinterpret_cast < ::DDS::DataWriter_ptr > - (writer); + if (!writer) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO + "CCM_DDS_PublisherListener_i::get_datareader_proxy -" + "Unable to retrieve writer from PropertyQosProfile\n")); + } + + return writer; } void diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h b/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h index 800c9efd495..a00923ba155 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h @@ -84,7 +84,7 @@ namespace CIAO private: ::DDS::PublisherListener_var impl_; - ::DDS::DataWriter_ptr + ::DDS::CCM_DataWriter_ptr get_datawriter_proxy (::DDSDataWriter * the_writer); }; } diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp index ffb834ffe12..dbc9a176fe1 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp @@ -79,7 +79,7 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_offered_deadline_miss DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ") ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("last instance handle <length <%d> - isValid <%d>\n"), + ACE_TEXT ("last instance handle length <%d> - isValid <%d>\n"), status.total_count, status.total_count_change, status.last_instance_handle.length, status.last_instance_handle.isValid)); @@ -204,7 +204,7 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_publication_matched ( ACE_TEXT ("PublisherListener_T::on_publication_matched: ") ACE_TEXT ("total count <%d> - count change <%d> - ") ACE_TEXT ("current count <%d> - current count change <%d> ") - ACE_TEXT ("last publication handle <length <%d> - isValid <%d>\n"), + ACE_TEXT ("last publication handle length <%d> - isValid <%d>\n"), status.total_count, status.total_count_change, status.current_count, status.current_count_change, status.last_subscription_handle.length, @@ -260,7 +260,7 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_reliable_reader_activ ACE_TEXT ("PublisherListener_T::on_reliable_reader_activity_changed: ") ACE_TEXT ("active count <%d> - active change <%d> - ") ACE_TEXT ("not active count <%d> - inactive count change <%d>") - ACE_TEXT ("last instance handle <length <%d> - isValid <%d>\n"), + ACE_TEXT ("last instance handle length <%d> - isValid <%d>\n"), status.active_count, status.active_count_change, status.inactive_count, status.inactive_count_change, status.last_instance_handle.length, diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp index 3209ccc6149..e958b4b728f 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp @@ -87,7 +87,8 @@ namespace CIAO { #if (CIAO_DDS4CCM_NDDS==1) DDS_StringSeq parameters; - ::DDS::ReturnCode_t const retval = this->impl ()->get_query_parameters (parameters); + ::DDS::ReturnCode_t const retval = + this->impl ()->get_query_parameters (parameters); query_parameters <<= parameters; return retval; #else diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp index 906957d6719..ab62293b41e 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp @@ -21,8 +21,9 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED>::~Reader_T (void) DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::~Reader_T"); } -// For the requirement : 'samples ordered by instances' the following settings are necessary: -// ordered_access -> true and DDS_INSTANCE_PRESENTATION_QOS (default) . +/// For the requirement : 'samples ordered by instances' the following settings +/// are necessary: ordered_access -> true and +/// DDS_INSTANCE_PRESENTATION_QOS (default) template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED> CORBA::ULong CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED>::get_nr_valid_samples ( @@ -68,13 +69,15 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED>::read_last ( ::CCM_DDS::ReadInfoSeq, CORBA::NO_MEMORY ()); - CORBA::ULong const nr_of_last_samples = this->get_nr_valid_samples (sample_info, true); + CORBA::ULong const nr_of_last_samples = + this->get_nr_valid_samples (sample_info, true); - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_last - ") - ACE_TEXT ("total number of samples <%u> - ") - ACE_TEXT ("last number of samples <%u>\n"), - data.length(), - nr_of_last_samples)); + DDS4CCM_DEBUG (6, (LM_DEBUG, + ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_last - ") + ACE_TEXT ("total number of samples <%u> - ") + ACE_TEXT ("last number of samples <%u>\n"), + data.length(), + nr_of_last_samples)); CORBA::ULong ix = 0; infoseq->length (nr_of_last_samples); @@ -191,7 +194,8 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED>::read_one_last ( ::CCM_DDS::ReadInfo_out info, const ::DDS::InstanceHandle_t & instance_handle) { - DDS_InstanceHandle_t const lookup_hnd = this->check_handle (an_instance, instance_handle); + ::DDS_InstanceHandle_t const lookup_hnd = + this->check_handle (an_instance, instance_handle); DDS_SampleInfoSeq sample_info; typename DDS_TYPE::dds_seq_type data; @@ -235,7 +239,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED>::read_one_all ( ::CCM_DDS::ReadInfoSeq_out infos, const ::DDS::InstanceHandle_t & instance_handle) { - DDS_InstanceHandle_t const lookup_hnd = + ::DDS_InstanceHandle_t const lookup_hnd = this->check_handle (an_instance, instance_handle); DDS_SampleInfoSeq sample_info; @@ -244,12 +248,14 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED>::read_one_all ( this->impl ()->read_w_instance (data, lookup_hnd, sample_info); // Count the number of valid samples - CORBA::ULong const nr_of_valid_samples = this->get_nr_valid_samples (sample_info); - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_all - ") - ACE_TEXT ("total number of samples <%u> - ") - ACE_TEXT ("valid number of samples <%u>\n"), - data.length (), - nr_of_valid_samples)); + CORBA::ULong const nr_of_valid_samples = + this->get_nr_valid_samples (sample_info); + DDS4CCM_DEBUG (6, (LM_DEBUG, + ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_all - ") + ACE_TEXT ("total number of samples <%u> - ") + ACE_TEXT ("valid number of samples <%u>\n"), + data.length (), + nr_of_valid_samples)); typename CCM_TYPE::seq_type * inst_seq = 0; ACE_NEW_THROW_EX (inst_seq, @@ -276,7 +282,8 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED>::read_one_all ( } // Return the loan - DDS_ReturnCode_t const retval = this->impl ()->return_loan (data, sample_info); + DDS_ReturnCode_t const retval = + this->impl ()->return_loan (data, sample_info); if (retval != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp index 0dbc96c4a58..d0b80c8acc4 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp @@ -41,12 +41,17 @@ namespace CIAO the_subscriber->notify_datareaders (); } - ::DDS::DataReader_ptr + ::DDS::CCM_DataReader_ptr CCM_DDS_SubscriberListener_i::get_datareader_proxy ( ::DDSDataReader * the_reader) { - DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::get_datareader_proxy"); - //Retrieve the pointer to the proxy from the QoS + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::get_datareader_proxy"); + ::DDS::CCM_DataReader_var dds_reader = ::DDS::CCM_DataReader::_nil (); + ACE_NEW_NORETURN (dds_reader, + CCM_DDS_DataReader_i (the_reader)); + return dds_reader._retn (); +/* + // Retrieve the pointer to the proxy from the QoS ::DDS_DataReaderQos qos; the_reader->get_qos (qos); DDS_Property_t * prop = @@ -54,16 +59,23 @@ namespace CIAO "CCM_DataReaderProxy"); if (!prop) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DataReaderListener_i::get_datareader_proxy -" + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_SubscriberListener_i::get_datareader_proxy -" "Unable to retrieve proxy from PropertyQosProfile\n")); - return ::DDS::DataReader::_nil (); + return ::DDS::CCM_DataReader::_nil (); } + ::DDS::CCM_DataReader_ptr reader = reinterpret_cast < ::DDS::CCM_DataReader_ptr > (ACE_OS::atol (prop->value)); + + if (::CORBA::is_nil (reader)) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_SubscriberListener_i::get_datareader_proxy -" + "Unable to retrieve reader from PropertyQosProfile\n")); + } - return reinterpret_cast < ::DDS::DataReader_ptr > - (reader); + return reader; +*/ } void diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h b/modules/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h index fbf23f854c4..14abd3e6f88 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h @@ -88,7 +88,7 @@ namespace CIAO private: ::DDS::SubscriberListener_var impl_; - ::DDS::DataReader_ptr + ::DDS::CCM_DataReader_ptr get_datareader_proxy (::DDSDataReader * the_reader); }; } diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp index d0ce219972a..d916f11793c 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp @@ -78,7 +78,8 @@ namespace CIAO #if (CIAO_DDS4CCM_NDDS==1) DDSTopicListener *ccm_dds_topic_list = this->impl ()->get_listener (); - CCM_DDS_TopicListener_i *list_proxy = dynamic_cast <CCM_DDS_TopicListener_i *> (ccm_dds_topic_list); + CCM_DDS_TopicListener_i *list_proxy = + dynamic_cast <CCM_DDS_TopicListener_i *> (ccm_dds_topic_list); if (!list_proxy) { DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Topic_i::get_listener - " @@ -97,7 +98,8 @@ namespace CIAO { #if (CIAO_DDS4CCM_NDDS==1) DDS_InconsistentTopicStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_inconsistent_topic_status (ddsstatus); + ::DDS::ReturnCode_t const retval = + this->impl ()->get_inconsistent_topic_status (ddsstatus); a_status <<= ddsstatus;; return retval; #else @@ -139,7 +141,8 @@ namespace CIAO CCM_DDS_Topic_i::get_instance_handle (void) { #if (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS_InstanceHandle_t const rtihandle = + this->impl ()->get_instance_handle (); ::DDS::InstanceHandle_t handle; handle <<= rtihandle; return handle; diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp b/modules/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp index ee905982084..3ddf006da98 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp @@ -157,8 +157,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_i ( translate_retcode (result))); throw CCM_DDS::InternalError (result, index); } - result = - this->impl ()->unregister_instance (an_instance, hnd); + result = this->impl ()->unregister_instance (an_instance, hnd); if (result != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, @@ -228,7 +227,8 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::check_existent ( ::CCM_DDS::NonExistent exception; for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) { - DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (data[index]); + DDS_InstanceHandle_t const hnd = + this->impl ()->lookup_instance (data[index]); if (::DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) { CORBA::ULong const length = exception.indexes.length (); @@ -251,7 +251,8 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::check_already_created ( ::CCM_DDS::AlreadyCreated exception; for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) { - DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (data[index]); + DDS_InstanceHandle_t const hnd = + this->impl ()->lookup_instance (data[index]); if (!::DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) { CORBA::ULong const length = exception.indexes.length (); @@ -276,7 +277,8 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_many ( // Check for existance of instances this->check_existent (data); - Coherent_Changes_Guard guard (this->impl ()->get_publisher(), this->is_coherent_write_); + Coherent_Changes_Guard guard (this->impl ()->get_publisher(), + this->is_coherent_write_); for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) { @@ -294,7 +296,8 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_many ( // Check for existance of instances this->check_existent (data); - Coherent_Changes_Guard guard (this->impl ()->get_publisher(), this->is_coherent_write_); + Coherent_Changes_Guard guard (this->impl ()->get_publisher(), + this->is_coherent_write_); for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) { diff --git a/modules/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc b/modules/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc index 58326b8db12..02e38c26181 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc +++ b/modules/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc @@ -1,6 +1,6 @@ // $Id$ -project(CIAO_DDS4CCM_DDS_Impl) : dds4ccm_skel, taolib, ciao_output, ccm_stub, ciao_logger { +project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, taolib, ciao_output, ccm_stub, ciao_logger { after += DDS4CCM_lem_stub libs += DDS4CCM_lem_stub diff --git a/modules/CIAO/connectors/dds4ccm/impl/logger/Logger.mpc b/modules/CIAO/connectors/dds4ccm/impl/logger/Logger.mpc index b5c6dba21e6..5d5af0ecaf9 100644 --- a/modules/CIAO/connectors/dds4ccm/impl/logger/Logger.mpc +++ b/modules/CIAO/connectors/dds4ccm/impl/logger/Logger.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(DDS4CCM_Logger): ciao_lib, taolib, acelib { +project(DDS4CCM_Logger): install_lib, ciao_lib, taolib, acelib { sharedname = DDS4CCM_Logger dynamicflags = DDS4CCM_LOGGER_BUILD_DLL diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Base/LatencyTT_Test_Base.idl b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl index 8b815644342..8b815644342 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Base/LatencyTT_Test_Base.idl +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Base/LatencyTT_Test_Base.mpc b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc index b0e7e7e26b6..b0e7e7e26b6 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Base/LatencyTT_Test_Base.mpc +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl index 9d86cb5385a..9d86cb5385a 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc index f6a85b8b7ab..f6a85b8b7ab 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl index 751094ae18f..751094ae18f 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc index 5f51e369ed5..5f51e369ed5 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp index 8b1aae943cc..8b1aae943cc 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h index d6f4b6c35c9..d6f4b6c35c9 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl index 8e86adfc33a..8e86adfc33a 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.mpc b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc index 7f6be3a7c79..7f6be3a7c79 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.mpc +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp index bf05b9f4ad5..bf05b9f4ad5 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h index af111e1b63c..af111e1b63c 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_SharedMem.cdp b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp index 492a27a6453..492a27a6453 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_SharedMem.cdp +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_UDPv4.cdp b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp index fc13542a087..fc13542a087 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_UDPv4.cdp +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/README b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README index e7cbe8c211a..e7cbe8c211a 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/README +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/USER_QOS_PROFILES.xml b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml index 2f2e923b7d0..2f2e923b7d0 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/USER_QOS_PROFILES.xml +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl index 615c0ae0375..615c0ae0375 100644 --- a/modules/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl +++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl index 92070bfb8d4..6bfec3f1a62 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl @@ -14,12 +14,6 @@ #pragma ciao lem "Connector/CSL_DeadlineTest_ConnectorE.idl" -module CSL_DeadlineTest -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConn; - connector CSL_DeadlineTest_Connector : TestTopicConn::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLDeadlineConnector; #endif /* CSL_DeadlineTest_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl index 9779bddbc23..d9a78d5aeca 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl @@ -14,7 +14,7 @@ module CSL_DeadlineTest { component Receiver { - port TestTopicConn::DDS_Listen info_out; + port CSLDeadlineConnector::DDS_Listen info_out; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp index 3ed0c09801e..436e78204e1 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp @@ -106,7 +106,7 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl // Supported operations and attributes. // Component attributes. // Port operations. - ::CSL_DeadlineTest::TestTopicConn::CCM_Listener_ptr + ::CSLDeadlineConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h index 1f673465fb1..57c85e67a66 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h @@ -28,7 +28,7 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl // TestTopic_RawListener_exec_i //============================================================ class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i - : public virtual ::CSL_DeadlineTest::TestTopicConn::CCM_Listener, + : public virtual ::CSLDeadlineConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -96,7 +96,7 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CSL_DeadlineTest::TestTopicConn::CCM_Listener_ptr + virtual ::CSLDeadlineConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl index 78837331b98..027d9397067 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl @@ -16,7 +16,7 @@ module CSL_DeadlineTest { component Sender { - port TestTopicConn::DDS_Write test_topic_write; + port CSLDeadlineConnector::DDS_Write test_topic_write; provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h index 8638d2f3332..c104eaa6a8e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h @@ -81,7 +81,7 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl private: ::CSL_DeadlineTest::CCM_Sender_Context_var context_; - ::CSL_DeadlineTest::TestTopicConn::Writer_var writer_; + ::CSLDeadlineConnector::Writer_var writer_; Atomic_Boolean deadline_missed_; Atomic_ThreadId thread_id_listener_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp index f5943bb1d47..299dba47062 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CSL_DeadlineTest_CSL_DeadlineTest_Connector_Impl</string> + <string>create_CSLDeadlineConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CSL_DeadlineTest_CSL_DeadlineTest_Connector_Servant</string> + <string>create_CSLDeadlineConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl index b2a5229d554..b611e355ec0 100755 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl @@ -23,7 +23,6 @@ $nr_daemon = 2; @nodenames = ( "SenderNode", "ReceiverNode" ); # ior files other than daemon -# ior files other than daemon $ior_nsbase = "ns.ior"; $ior_nsfile = 0; $ior_embase = "EM.ior"; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl index 90ad8006fb5..27d50bee6d4 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl @@ -14,12 +14,6 @@ #pragma ciao lem "Connector/CSL_QoSTest_ConnectorE.idl" -module CSL_QoSTest -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConn; - connector CSL_QoSTest_Connector : TestTopicConn::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLQoSConnector; #endif /* CSL_QoSTest_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl index caf1bcab8ea..e0b9fa9b8ff 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl @@ -14,7 +14,7 @@ module CSL_QoSTest { component Receiver { - port TestTopicConn::DDS_Listen info_out; + port CSLQoSConnector::DDS_Listen info_out; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp index 5f778789fb7..6035891620f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp @@ -81,11 +81,11 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl { } - ::CSL_QoSTest::TestTopicConn::CCM_Listener_ptr + ::CSLQoSConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n"))); - return ::CSL_QoSTest::TestTopicConn::CCM_Listener::_nil (); + return ::CSLQoSConnector::CCM_Listener::_nil (); } ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h index f9d59483c21..71a0a817ade 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h @@ -69,7 +69,7 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CSL_QoSTest::TestTopicConn::CCM_Listener_ptr + virtual ::CSLQoSConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl index fd8f7b1c770..bb8fe7aa035 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl @@ -16,7 +16,7 @@ module CSL_QoSTest { component Sender { - port TestTopicConn::DDS_Write info_write; + port CSLQoSConnector::DDS_Write info_write; provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp index 3a38cc88104..093cda231ed 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CSL_QoSTest_CSL_QoSTest_Connector_Impl</string> + <string>create_CSLQoSConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CSL_QoSTest_CSL_QoSTest_Connector_Servant</string> + <string>create_CSLQoSConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl index aebb35751bb..6e2e5a98aaf 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl @@ -14,13 +14,6 @@ #pragma ciao lem "Connector/CSL_SRTest_ConnectorE.idl" -module CSL_SRTest -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConn; - connector CSL_SRTest_Connector : TestTopicConn::DDS_Event - { - }; - -}; +module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_SR_Connector; #endif /* CSL_SRTEST_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl index c8eb57ca52f..7b49448649c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl @@ -14,7 +14,7 @@ module CSL_SRTest { component Receiver { - port TestTopicConn::DDS_Listen info_out; + port CSL_SR_Connector::DDS_Listen info_out; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; attribute unsigned long rate; attribute boolean read_data;//if true, read_all is invoked. diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp index 00552835afb..7e4ae832793 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp @@ -141,7 +141,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl read_data_ (true), raw_listen_ (false), received_ (0), - rejected_(0), + rejected_(false), thread_id_listener_ (0) { this->ticker_ = new read_action_Generator (*this); @@ -221,7 +221,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl } // Port operations. - ::CSL_SRTest::TestTopicConn::CCM_Listener_ptr + ::CSL_SR_Connector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h index f36ecafe6a8..322773fe70a 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h @@ -82,7 +82,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl // TestTopic_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export TestTopic_Listener_exec_i - : public virtual ::CSL_SRTest::TestTopicConn::CCM_Listener, + : public virtual ::CSL_SR_Connector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -129,7 +129,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl virtual void raw_listen (::CORBA::Boolean raw_listen); // Port operations. - virtual ::CSL_SRTest::TestTopicConn::CCM_Listener_ptr + virtual ::CSL_SR_Connector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -152,7 +152,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl private: ::CSL_SRTest::CCM_Receiver_Context_var context_; - ::CSL_SRTest::TestTopicConn::Reader_var reader_; + ::CSL_SR_Connector::Reader_var reader_; read_action_Generator * ticker_; CORBA::ULong rate_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl index 53134ceaec5..037e612556e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl @@ -16,7 +16,7 @@ module CSL_SRTest { component Sender { - port TestTopicConn::DDS_Write test_topic_write; + port CSL_SR_Connector::DDS_Write test_topic_write; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h index d74e8feac3f..4ed90921dff 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h @@ -59,7 +59,7 @@ namespace CIAO_CSL_SRTest_Sender_Impl void start (void); void stop (void); - ::CSL_SRTest::TestTopicConn::Writer_var writer_; + ::CSL_SR_Connector::Writer_var writer_; ::CSL_SRTest::CCM_Sender_Context_var context_; pulse_Generator * ticker_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp index 0d7d955a648..95683d473a6 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CSL_SRTest_CSL_SRTest_Connector_Impl</string> + <string>create_CSL_SR_Connector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CSL_SRTest_CSL_SRTest_Connector_Servant</string> + <string>create_CSL_SR_Connector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl index 51fd2524919..f349017d740 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl @@ -14,12 +14,6 @@ #pragma ciao lem "Connector/CSL_USTest_ConnectorE.idl" -module CSL_USTest -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConn; - connector CSL_USTest_Connector : TestTopicConn::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_US_Connector; #endif /* CSL_USTest_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl index 84a4fe8639a..14a8831720c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl @@ -14,8 +14,8 @@ module CSL_USTest { component Receiver { - port TestTopicConn::DDS_Listen info_out; - port TestTopicConn::DDS_Read info_read; + port CSL_US_Connector::DDS_Listen info_out; + port CSL_US_Connector::DDS_Read info_read; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp index bbf07fcd65f..7233876006c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp @@ -167,7 +167,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl return ::CCM_DDS::CCM_PortStatusListener::_nil (); } - ::CSL_USTest::TestTopicConn::CCM_Listener_ptr + ::CSL_US_Connector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h index 8c3f05c5941..a143c9f4dec 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h @@ -43,7 +43,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl // TestTopic_RawListener_exec_i //============================================================ class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i - : public virtual ::CSL_USTest::TestTopicConn::CCM_Listener, + : public virtual ::CSL_US_Connector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -127,7 +127,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_out_status (void); - virtual ::CSL_USTest::TestTopicConn::CCM_Listener_ptr + virtual ::CSL_US_Connector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr @@ -149,7 +149,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl private: ::CSL_USTest::CCM_Receiver_Context_var context_; ::CCM_DDS::DataListenerControl_var lc_; - ::CSL_USTest::TestTopicConn::Reader_var reader_; + ::CSL_US_Connector::Reader_var reader_; Pulser *pulser_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl index 9b12ba19106..b543cbdfbde 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl @@ -16,7 +16,7 @@ module CSL_USTest { component Sender { - port TestTopicConn::DDS_Write test_topic_write; + port CSL_US_Connector::DDS_Write test_topic_write; provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h index 6cb1d5b2cc6..76e011c4f5c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h @@ -110,7 +110,7 @@ namespace CIAO_CSL_USTest_Sender_Impl private: ::CSL_USTest::CCM_Sender_Context_var context_; - ::CSL_USTest::TestTopicConn::Writer_var writer_; + ::CSL_US_Connector::Writer_var writer_; Atomic_Boolean publication_matched_received_; Atomic_Boolean liveliness_lost_received_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp index 83306d7eb0c..9952b6072cc 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CSL_USTest_CSL_USTest_Connector_Impl</string> + <string>create_CSL_US_Connector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CSL_USTest_CSL_USTest_Connector_Servant</string> + <string>create_CSL_US_Connector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl index 3d446b66a3d..d20aefdd878 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl @@ -14,12 +14,6 @@ #pragma ciao lem "Connector/CoherentUpdate_Test_ConnectorE.idl" -module CoherentUpdate_Test -{ - module ::CCM_DDS::Typed < ::CoherentUpdateTest, ::CoherentUpdateTestSeq> CoherentUpdateTestConn; - connector CoherentUpdate_Test_Connector : CoherentUpdateTestConn::DDS_State - { - }; -}; +module ::CCM_DDS::Typed < ::CoherentUpdateTest, ::CoherentUpdateTestSeq> CoherentUpdate_Test; #endif /* CoherentUpdate_TestCONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl index cd877185448..7bc5ab200ee 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl @@ -15,7 +15,7 @@ module CoherentUpdate_Test { component Receiver { - port CoherentUpdateTestConn::DDS_Read info_out; + port CoherentUpdate_Test::DDS_Read info_out; provides CoherentUpdateStarter reader_start; uses CoherentUpdateRestarter updater_restart; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp index 15a21ed84ff..2621f3f11e6 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp @@ -220,10 +220,10 @@ namespace CIAO_CoherentUpdate_Test_Receiver_Impl } // Port operations. - ::CoherentUpdate_Test::CoherentUpdateTestConn::CCM_Listener_ptr + ::CoherentUpdate_Test::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { - return ::CoherentUpdate_Test::CoherentUpdateTestConn::CCM_Listener::_nil (); + return ::CoherentUpdate_Test::CCM_Listener::_nil (); } ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h index c41fe38f9ce..962635a5cc1 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h @@ -72,7 +72,7 @@ namespace CIAO_CoherentUpdate_Test_Receiver_Impl // Component attributes. // Port operations. - virtual ::CoherentUpdate_Test::CoherentUpdateTestConn::CCM_Listener_ptr + virtual ::CoherentUpdate_Test::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -104,7 +104,7 @@ namespace CIAO_CoherentUpdate_Test_Receiver_Impl private: ::CoherentUpdate_Test::CCM_Receiver_Context_var context_; - ::CoherentUpdate_Test::CoherentUpdateTestConn::Reader_var reader_; + ::CoherentUpdate_Test::Reader_var reader_; CoherentUpdateRestarter_var restarter_; CORBA::UShort iterations_; CORBA::UShort run_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl index 8874e90249b..5b889fd7bd1 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl @@ -17,7 +17,7 @@ module CoherentUpdate_Test { component Sender { - port CoherentUpdateTestConn::DDS_Update info_update; + port CoherentUpdate_Test::DDS_Update info_update; uses CoherentUpdateStarter start_reader; provides CoherentUpdateRestarter restart_updater; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h index e942c781a79..48269ae223a 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h @@ -80,7 +80,7 @@ namespace CIAO_CoherentUpdate_Test_Sender_Impl private: ::CoherentUpdate_Test::CCM_Sender_Context_var context_; - ::CoherentUpdate_Test::CoherentUpdateTestConn::Updater_var updater_; + ::CoherentUpdate_Test::Updater_var updater_; CoherentUpdateStarter_var starter_; CORBA::UShort iterations_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp index 234ebd2492a..3e1261cf785 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CoherentUpdate_Test_CoherentUpdate_Test_Connector_Impl</string> + <string>create_CoherentUpdate_Test_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CoherentUpdate_Test_CoherentUpdate_Test_Connector_Servant</string> + <string>create_CoherentUpdate_Test_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl index d77da8dfe86..73d5529567e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl @@ -14,16 +14,6 @@ #pragma ciao lem "Connector/CoherentWrite_Test_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::CoherentWriteTest, ::CoherentWriteTestSeq> CoherentWriteTest; -}; - -module CoherentWrite_Test -{ - connector CoherentWrite_Test_Connector : ::CCM_DDS::CoherentWriteTest::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::CoherentWriteTest, ::CoherentWriteTestSeq> CoherentWriteTestConnector; #endif /* CoherentWrite_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl index 9d464e71125..08a5cf09eb0 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl @@ -15,7 +15,7 @@ module CoherentWrite_Test { component Receiver { - port CCM_DDS::CoherentWriteTest::DDS_Read info_out; + port CoherentWriteTestConnector::DDS_Read info_out; provides CoherentWriteStarter reader_start; uses CoherentWriteRestarter writer_restart; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp index 4e7ad5f5f79..312c385c585 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp @@ -220,10 +220,10 @@ namespace CIAO_CoherentWrite_Test_Receiver_Impl } // Port operations. - ::CCM_DDS::CoherentWriteTest::CCM_Listener_ptr + ::CoherentWriteTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { - return ::CCM_DDS::CoherentWriteTest::CCM_Listener::_nil (); + return ::CoherentWriteTestConnector::CCM_Listener::_nil (); } ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h index efceb8b3c7b..8c4f843b40d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h @@ -72,7 +72,7 @@ namespace CIAO_CoherentWrite_Test_Receiver_Impl // Component attributes. // Port operations. - virtual ::CCM_DDS::CoherentWriteTest::CCM_Listener_ptr + virtual ::CoherentWriteTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -104,7 +104,7 @@ namespace CIAO_CoherentWrite_Test_Receiver_Impl private: ::CoherentWrite_Test::CCM_Receiver_Context_var context_; - ::CCM_DDS::CoherentWriteTest::Reader_var reader_; + ::CoherentWriteTestConnector::Reader_var reader_; CoherentWriteRestarter_var restarter_; CORBA::UShort iterations_; CORBA::UShort run_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl index c496b47d1cb..5e33a1ef3b3 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl @@ -17,7 +17,7 @@ module CoherentWrite_Test { component Sender { - port CCM_DDS::CoherentWriteTest::DDS_Write info_write; + port CoherentWriteTestConnector::DDS_Write info_write; uses CoherentWriteStarter start_reader; provides CoherentWriteRestarter restart_writer; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h index d86c551b456..666a74215e4 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h @@ -80,7 +80,7 @@ namespace CIAO_CoherentWrite_Test_Sender_Impl private: ::CoherentWrite_Test::CCM_Sender_Context_var context_; - CCM_DDS::CoherentWriteTest::Writer_var writer_; + CoherentWriteTestConnector::Writer_var writer_; CoherentWriteStarter_var starter_; CORBA::UShort iterations_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp index 521972a9fab..7b0ec4dbb0c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CoherentWrite_Test_CoherentWrite_Test_Connector_Impl</string> + <string>create_CoherentWriteTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CoherentWrite_Test_CoherentWrite_Test_Connector_Servant</string> + <string>create_CoherentWriteTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl b/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl new file mode 100644 index 00000000000..a6a9dd8b9a1 --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl @@ -0,0 +1,14 @@ +// $Id$ + +#ifndef DIFFDIR_IDL +#define DIFFDIR_IDL + +#pragma ndds typesupport "DiffDirSupport.h" + +struct DiffDirType { + string value; //@key +}; + +typedef sequence<DiffDirType> DiffDirTypeSeq; + +#endif diff --git a/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc b/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc new file mode 100644 index 00000000000..39cf83c7c6e --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc @@ -0,0 +1,24 @@ +// $Id$ + +project (DiffDir_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = DiffDir_stub + dynamicflags += DIFFDIR_COMMON_STUB_BUILD_DLL + + idlflags += -SS -Sci \ + -Wb,stub_export_macro=DIFFDIR_COMMON_STUB_Export \ + -Wb,stub_export_include=DiffDir_Common_stub_export.h + + IDL_Files { + idlflags += -Gxhst + DiffDir.idl + } + + opendds_ts_flags += --export=DIFFDIR_COMMON_STUB_Export + + DDSGenerator_Files { + DiffDir.idl + } + + Source_Files { + } +} diff --git a/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl new file mode 100644 index 00000000000..ab33efa3780 --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl @@ -0,0 +1,14 @@ +// $Id$ + +#ifndef DIFFDIR_CONNECTOR_IDL +#define DIFFDIR_CONNECTOR_IDL + +#include <Components.idl> +#include "DiffDir.idl" +#include "connectors/dds4ccm/idl/ccm_dds.idl" + +#pragma ciao lem "DiffDir_ConnectorE.idl" + +module ::CCM_DDS::Typed < ::DiffDirType, ::DiffDirTypeSeq> DiffDirConnector; + +#endif diff --git a/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc b/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc new file mode 100644 index 00000000000..a594bd7458e --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc @@ -0,0 +1,134 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -b dds4ccm_base DiffDir_Connector" + +project(DiffDir_Connector_idl_gen) : connectoridldefaults, dds4ccm { + custom_only = 1 + idlflags += -Wb,stub_export_macro=DIFFDIR_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=DiffDir_Connector_stub_export.h \ + -Wb,skel_export_macro=DIFFDIR_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=DiffDir_Connector_svnt_export.h \ + -Wb,conn_export_macro=DIFFDIR_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=DiffDir_Connector_conn_export.h \ + -Gxhex -Gxhsk -Gxhst \ + -o Connector + IDL_Files { + DiffDir_Connector.idl + } +} + +project(DiffDir_Connector_lem_gen) : ciaoidldefaults, dds4ccm { + after += DiffDir_Connector_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=DIFFDIR_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=DiffDir_Connector_lem_stub_export.h \ + -SS -Gxhst \ + -o Connector + + IDL_Files { + Connector/DiffDir_ConnectorE.idl + } +} + +project(DiffDir_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DiffDir_Connector_lem_gen DiffDir_Connector_stub + libs += DiffDir_Connector_stub + includes += . + + sharedname = DiffDir_Connector_lem_stub + dynamicflags = DIFFDIR_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Connector/DiffDir_ConnectorEC.cpp + } + + Header_Files { + Connector/DiffDir_ConnectorEC.h + Connector/DiffDir_Connector_lem_stub_export.h + } + + Inline_Files { + Connector/DiffDir_ConnectorEC.inl + } +} + +project(DiffDir_Connector_stub) : ccm_stub, dds4ccm_base { + after += DiffDir_Connector_idl_gen DiffDir_stub + libs += DiffDir_stub + includes += . + + sharedname = DiffDir_Connector_stub + dynamicflags = DIFFDIR_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Connector/DiffDir_ConnectorC.cpp + } + + Header_Files { + Connector/DiffDir_ConnectorC.h + Connector/DiffDir_Connector_stub_export.h + } + + Inline_Files { + Connector/DiffDir_ConnectorC.inl + } +} + +project(DiffDir_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { + after += DiffDir_Connector_lem_stub DiffDir_Connector_stub + sharedname = DiffDir_Connector_exec + libs += DiffDir_Connector_stub DiffDir_Connector_lem_stub DiffDir_stub + includes += . + + dynamicflags = DIFFDIR_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Connector/DiffDir_Connector_conn.cpp + } + + Header_Files { + Connector/DiffDir_Connector_conn.h + Connector/DiffDir_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project(DiffDir_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub { + after += DiffDir_Connector_lem_stub + sharedname = DiffDir_Connector_svnt + libs += DiffDir_Connector_stub DiffDir_Connector_lem_stub DiffDir_stub + includes += . + + dynamicflags = DIFFDIR_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Connector/DiffDir_ConnectorS.cpp + Connector/DiffDir_Connector_svnt.cpp + } + + Header_Files { + Connector/DiffDir_ConnectorS.h + Connector/DiffDir_Connector_svnt.h + Connector/DiffDir_Connector_svnt_export.h + } + + Inline_Files { + Connector/DiffDir_ConnectorS.inl + } +} + + diff --git a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component.idl b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component.idl index 95fb32880aa..4ea91d94e2b 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component.idl @@ -13,8 +13,8 @@ module CFT_Test { component CFTTestComponent { - port CFTTwoDimensional_Test::CFTTwoDimensionalTestConn::DDS_Get two_dim_get; - port CFTThreeDimensional_Test::CFTThreeDimensionalTestConn::DDS_Get three_dim_get; + port CFTTwoDimensionalTestConn::DDS_Get two_dim_get; + port CFTThreeDimensionalTestConn::DDS_Get three_dim_get; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component_exec.h b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component_exec.h index 410b07e3669..958b551bd80 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component_exec.h @@ -48,8 +48,8 @@ namespace CIAO_CFT_Test_CFTTestComponent_Impl private: ::CFT_Test::CCM_CFTTestComponent_Context_var context_; - ::CFTTwoDimensional_Test::CFTTwoDimensionalTestConn::Reader_var two_reader_; - ::CFTThreeDimensional_Test::CFTThreeDimensionalTestConn::Reader_var three_reader_; + ::CFTTwoDimensionalTestConn::Reader_var two_reader_; + ::CFTThreeDimensionalTestConn::Reader_var three_reader_; bool test_two_dimensional_filter (void); diff --git a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Connector/CFT_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Connector/CFT_Test_Connector.idl index 72be2c8d090..4e1301c0110 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Connector/CFT_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Connector/CFT_Test_Connector.idl @@ -14,20 +14,7 @@ #pragma ciao lem "Connector/CFT_Test_ConnectorE.idl" -module CFTTwoDimensional_Test -{ - module ::CCM_DDS::Typed < ::CFTTwoDimensionalTest, ::CFTTwoDimensionalTestSeq> CFTTwoDimensionalTestConn; - connector CFTTwoDimensionalTest_Connector : CFTTwoDimensionalTestConn::DDS_Event - { - }; -}; - -module CFTThreeDimensional_Test -{ - module ::CCM_DDS::Typed < ::CFTThreeDimensionalTest, ::CFTThreeDimensionalTestSeq> CFTThreeDimensionalTestConn; - connector CFTThreeDimensionalTest_Connector : CFTThreeDimensionalTestConn::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::CFTTwoDimensionalTest, ::CFTTwoDimensionalTestSeq> CFTTwoDimensionalTestConn; +module ::CCM_DDS::Typed < ::CFTThreeDimensionalTest, ::CFTThreeDimensionalTestSeq> CFTThreeDimensionalTestConn; #endif /* CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/Plan.cdp index 718322a36d7..9badb69486b 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CFTTwoDimensional_Test_CFTTwoDimensionalTest_Connector_Impl</string> + <string>create_CFTTwoDimensionalTestConn_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CFTTwoDimensional_Test_CFTTwoDimensionalTest_Connector_Servant</string> + <string>create_CFTTwoDimensionalTestConn_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -123,7 +123,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CFTThreeDimensional_Test_CFTThreeDimensionalTest_Connector_Impl</string> + <string>create_CFTThreeDimensionalTestConn_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -134,7 +134,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_CFTThreeDimensional_Test_CFTThreeDimensionalTest_Connector_Servant</string> + <string>create_CFTThreeDimensionalTestConn_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl index a5894738606..46a2a3adaba 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl @@ -14,16 +14,6 @@ #pragma ciao lem "Connector/Writer_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTest; -}; - -module Writer -{ - connector Writer_Connector : ::CCM_DDS::WriterTest::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector; #endif /* Writer_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.idl index 959d6ded63e..829c4ebb60e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.idl @@ -14,7 +14,7 @@ module Writer { component Receiver { - port CCM_DDS::WriterTest::DDS_Listen info_out; + port WriterTestConnector::DDS_Listen info_out; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp index cae3ee568e3..d294f0fc3e0 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp @@ -56,7 +56,7 @@ namespace CIAO_Writer_Receiver_Impl { } - ::CCM_DDS::WriterTest::CCM_Listener_ptr + ::WriterTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new WriterTest RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h index a6dd0077a1c..a0b47cd1288 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h @@ -20,7 +20,7 @@ namespace CIAO_Writer_Receiver_Impl // WriterTest_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export WriterTest_Listener_exec_i - : public virtual ::CCM_DDS::WriterTest::CCM_Listener, + : public virtual ::WriterTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -48,7 +48,7 @@ namespace CIAO_Writer_Receiver_Impl Receiver_exec_i (void); virtual ~Receiver_exec_i (void); - virtual ::CCM_DDS::WriterTest::CCM_Listener_ptr + virtual ::WriterTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl index e5289951f37..91871b19d95 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl @@ -16,7 +16,7 @@ module Writer { component Sender { - port CCM_DDS::WriterTest::DDS_Write info_write; + port WriterTestConnector::DDS_Write info_write; attribute unsigned short rate; attribute unsigned short iterations; attribute unsigned short keys; diff --git a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/Plan.cdp index 6799bd6785d..cae58d8a275 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Impl</string> + <string>create_WriterTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Servant</string> + <string>create_WriterTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl index 7de844b7231..e49f2b151dc 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl @@ -19,10 +19,7 @@ module DNM_Test_Connector { module Nested_Connector { - module ::CCM_DDS::Typed < X::Y::Z::DNM_Test_Struct, X::Y::Z::DNM_Test_StructSeq> DNM_TestConn; - connector Double_Nested_Module_Connector : DNM_TestConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < X::Y::Z::DNM_Test_Struct, X::Y::Z::DNM_Test_StructSeq> DNM_TestConnector; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl index eaeb8d71068..24d3079d59f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl @@ -18,7 +18,7 @@ module DNM_Test_Sender { component Sender { - port DNM_Test_Connector::Nested_Connector::DNM_TestConn::DDS_Write info_write; + port DNM_Test_Connector::Nested_Connector::DNM_TestConnector::DDS_Write info_write; }; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h index 9308e434562..1137811c743 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h @@ -38,7 +38,7 @@ namespace CIAO_DNM_Test_Sender_Nested_Sender_Sender_Impl private: ::DNM_Test_Sender::Nested_Sender::CCM_Sender_Context_var context_; - ::DNM_Test_Connector::Nested_Connector::DNM_TestConn::Writer_var writer_; + ::DNM_Test_Connector::Nested_Connector::DNM_TestConnector::Writer_var writer_; }; extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl index 0d6b36f298b..6d37b890925 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl @@ -14,16 +14,6 @@ #pragma ciao lem "Connector/Event_Connection_Test_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::Event_ConnectionTest, ::Event_ConnectionTestSeq> Event_ConnectionTest; -}; - -module Event_Connection_Test -{ - connector Event_Connection_Test_Connector : ::CCM_DDS::Event_ConnectionTest::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::Event_ConnectionTest, ::Event_ConnectionTestSeq> Event_ConnectionConnector; #endif /* Event_Connection_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl index 548e06e7b25..1d407755d68 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl @@ -14,8 +14,8 @@ module Event_Connection_Test { component Receiver { - port CCM_DDS::Event_ConnectionTest::DDS_Listen info_listen; - port CCM_DDS::Event_ConnectionTest::DDS_Get info_get; + port Event_ConnectionConnector::DDS_Listen info_listen; + port Event_ConnectionConnector::DDS_Get info_get; provides CCM_DDS::ConnectorStatusListener status_listener; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp index 0c6d1b8087f..78a3f9f2035 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp @@ -32,12 +32,12 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl } // Port operations. - ::CCM_DDS::Event_ConnectionTest::CCM_Listener_ptr + ::Event_ConnectionConnector::CCM_Listener_ptr Receiver_exec_i::get_info_listen_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new Event_ConnectionTest RAW listener\n"))); this->raw_listener_created_ = true; - return ::CCM_DDS::Event_ConnectionTest::CCM_Listener::_nil (); + return ::Event_ConnectionConnector::CCM_Listener::_nil (); } ::CCM_DDS::CCM_PortStatusListener_ptr @@ -230,4 +230,3 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl return retval; } } - diff --git a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h index 7536df834d0..281575151b0 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h @@ -28,7 +28,7 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::Event_ConnectionTest::CCM_Listener_ptr + virtual ::Event_ConnectionConnector::CCM_Listener_ptr get_info_listen_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -55,9 +55,9 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl private: ::Event_Connection_Test::CCM_Receiver_Context_var context_; //DDS_Get - ::CCM_DDS::Event_ConnectionTest::Getter_var getter_getter_; + ::Event_ConnectionConnector::Getter_var getter_getter_; ::DDS::DataReader_var getter_dds_data_reader_; - ::CCM_DDS::Event_ConnectionTest::Reader_var getter_reader_; + ::Event_ConnectionConnector::Reader_var getter_reader_; bool getter_ok_; bool getter_dds_data_reader_ok_; @@ -65,7 +65,7 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl //DDS_Listen ::CCM_DDS::DataListenerControl_var listen_data_control_; - ::CCM_DDS::Event_ConnectionTest::Reader_var listen_reader_; + ::Event_ConnectionConnector::Reader_var listen_reader_; ::DDS::DataReader_var listen_dds_data_reader_; bool listen_data_control_ok_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl index 8ab214b9256..9a44606a0f3 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl @@ -16,7 +16,7 @@ module Event_Connection_Test { component Sender { - port CCM_DDS::Event_ConnectionTest::DDS_Write info_write; + port Event_ConnectionConnector::DDS_Write info_write; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h index 6a6e8f31f46..ac03664f52d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h @@ -38,7 +38,7 @@ namespace CIAO_Event_Connection_Test_Sender_Impl private: ::Event_Connection_Test::CCM_Sender_Context_var context_; - CCM_DDS::Event_ConnectionTest::Writer_var writer_; + ::Event_ConnectionConnector::Writer_var writer_; DDS::DataWriter_var writer_dds_datawriter_; bool writer_ok_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp index 5d3530866a5..4fae896da10 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Event_Connection_Test_Event_Connection_Test_Connector_Impl</string> + <string>create_Event_ConnectionConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Event_Connection_Test_Event_Connection_Test_Connector_Servant</string> + <string>create_Event_ConnectionConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl index a6f5a4197fd..b1103fbb564 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl @@ -17,10 +17,7 @@ module FSS_Event { - module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConn; - connector FSS_Event_Connector : FixedStructSizeTestConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector; }; #endif /* FSS_Event_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl index c6d030b7ba4..a11d45bd189 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl @@ -17,10 +17,7 @@ module FSS_State { - module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConn; - connector FSS_State_Connector : FixedStructSizeTestConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector; }; #endif /* FSS_State_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl index 62b25c82de0..5b61bc87887 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl @@ -16,15 +16,8 @@ module Getter_Test { - module ::CCM_DDS::Typed < ::GetterTest, ::GetterTestSeq> GetterTestConn; - connector Getter_Test_Connector : GetterTestConn::DDS_Event - { - }; - - module ::CCM_DDS::Typed < ::GetterFixed, ::GetterFixedSeq> GetterFixedConn; - connector Getter_Fixed_Connector : GetterFixedConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::GetterTest, ::GetterTestSeq> GetterTestConnector; + module ::CCM_DDS::Typed < ::GetterFixed, ::GetterFixedSeq> GetterFixedConnector; }; #endif /* GETTER_TEST_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl index a034cfa12cf..34189e35a24 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl @@ -15,8 +15,8 @@ module Getter_Test { component Receiver { - port GetterTestConn::DDS_Get info_get; - port GetterFixedConn::DDS_Get info_fixed; + port GetterTestConnector::DDS_Get info_get; + port GetterFixedConnector::DDS_Get info_fixed; provides GetInvoker getter_invoke; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp index 90aa43a5aab..3b7781ccc4c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp @@ -476,10 +476,10 @@ namespace CIAO_Getter_Test_Receiver_Impl } } - ::Getter_Test::GetterTestConn::CCM_Listener_ptr + ::Getter_Test::GetterTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { - return ::Getter_Test::GetterTestConn::CCM_Listener::_nil (); + return ::Getter_Test::GetterTestConnector::CCM_Listener::_nil (); } ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h index f23118c7b86..1f020f9a85a 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h @@ -94,7 +94,7 @@ namespace CIAO_Getter_Test_Receiver_Impl Receiver_exec_i (void); virtual ~Receiver_exec_i (void); - virtual ::Getter_Test::GetterTestConn::CCM_Listener_ptr + virtual ::Getter_Test::GetterTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -134,8 +134,8 @@ namespace CIAO_Getter_Test_Receiver_Impl private: ::Getter_Test::CCM_Receiver_Context_var context_; - ::Getter_Test::GetterTestConn::Getter_var getter_; - ::Getter_Test::GetterFixedConn::Getter_var fixed_; + ::Getter_Test::GetterTestConnector::Getter_var getter_; + ::Getter_Test::GetterFixedConnector::Getter_var fixed_; void timeout_get_one_fixed (); void timeout_get_one_variable (); diff --git a/modules/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl index fa49687b75c..39605844455 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl @@ -17,8 +17,8 @@ module Getter_Test { component Sender { - port GetterTestConn::DDS_Write info_write; - port GetterFixedConn::DDS_Write info_fixed; + port GetterTestConnector::DDS_Write info_write; + port GetterFixedConnector::DDS_Write info_fixed; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h index 8d7cde811e6..88e16d42c88 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h @@ -102,8 +102,8 @@ namespace CIAO_Getter_Test_Sender_Impl private: ::Getter_Test::CCM_Sender_Context_var context_; - ::Getter_Test::GetterTestConn::Writer_var writer_; - ::Getter_Test::GetterFixedConn::Writer_var fixed_; + ::Getter_Test::GetterTestConnector::Writer_var writer_; + ::Getter_Test::GetterFixedConnector::Writer_var fixed_; GetInvoker_var invoker_; CORBA::UShort iterations_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp index 610f946887b..c99e7ea70f7 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Getter_Test_Getter_Fixed_Connector_Impl</string> + <string>create_Getter_Test_GetterFixedConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Getter_Test_Getter_Fixed_Connector_Servant</string> + <string>create_Getter_Test_GetterFixedConnector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -123,7 +123,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Getter_Test_Getter_Test_Connector_Impl</string> + <string>create_Getter_Test_GetterTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -134,7 +134,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Getter_Test_Getter_Test_Connector_Servant</string> + <string>create_Getter_Test_GetterTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl index a5894738606..46a2a3adaba 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl @@ -14,16 +14,6 @@ #pragma ciao lem "Connector/Writer_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTest; -}; - -module Writer -{ - connector Writer_Connector : ::CCM_DDS::WriterTest::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector; #endif /* Writer_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl index c39a2e21252..07f0d8eda00 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl @@ -16,7 +16,7 @@ module Writer { component Sender { - port CCM_DDS::WriterTest::DDS_Write info_write; + port WriterTestConnector::DDS_Write info_write; attribute unsigned short keys; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h index b56d98c153b..0ec292b84b5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h @@ -67,7 +67,7 @@ namespace CIAO_Writer_Sender_Impl void start (void); WriterTestDataWriter * dds_writer_; - CCM_DDS::WriterTest::Writer_var ccm_writer_; + ::WriterTestConnector::Writer_var ccm_writer_; ::Writer::CCM_Sender_Context_var context_; CORBA::UShort keys_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp index 10ad51c564a..9f7e47f589d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp @@ -19,7 +19,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Impl</string> + <string>create_WriterTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -30,7 +30,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Servant</string> + <string>create_WriterTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl index 844d3ac7e53..ead5a9cf982 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl @@ -14,16 +14,6 @@ #pragma ciao lem "Connector/Keyed_Test_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::KeyedTest, ::KeyedTestSeq> KeyedTest; -}; - -module Keyed_Test -{ - connector Keyed_Test_Connector : ::CCM_DDS::KeyedTest::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::KeyedTest, ::KeyedTestSeq> KeyedTestConnector; #endif /* Keyed_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl index faf8ee41bfb..8f653fe8ce2 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl @@ -14,7 +14,7 @@ module Keyed_Test { component Receiver { - port CCM_DDS::KeyedTest::DDS_Listen info_out; + port KeyedTestConnector::DDS_Listen info_out; attribute unsigned long rate; attribute unsigned short iterations; attribute unsigned short keys; diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp index 6a23fe57d69..d3b5c9da0d5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp @@ -145,7 +145,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl this->expected_ = this->iterations_ * this->keys_; } - ::CCM_DDS::KeyedTest::CCM_Listener_ptr + ::KeyedTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { return 0; diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h index 250f25cc256..c71d27af9c5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h @@ -64,7 +64,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl virtual void keys (::CORBA::UShort keys); - virtual ::CCM_DDS::KeyedTest::CCM_Listener_ptr + virtual ::KeyedTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -82,7 +82,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl private: ::Keyed_Test::CCM_Receiver_Context_var context_; - ::CCM_DDS::KeyedTest::Reader_var reader_; + ::KeyedTestConnector::Reader_var reader_; read_action_Generator * ticker_; CORBA::ULong rate_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl index 4fab21b4c1c..6863258f984 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl @@ -16,7 +16,7 @@ module Keyed_Test { component Sender { - port CCM_DDS::KeyedTest::DDS_Write info_write; + port KeyedTestConnector::DDS_Write info_write; attribute unsigned long rate; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h index 4c519576bd7..8133c563ec0 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h @@ -72,7 +72,7 @@ namespace CIAO_Keyed_Test_Sender_Impl void start (void); void stop (void); - CCM_DDS::KeyedTest::Writer_var writer_; + KeyedTestConnector::Writer_var writer_; pulse_Generator * ticker_; ::Keyed_Test::CCM_Sender_Context_var context_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp index 1b0f0ce9d95..6c49f3b8a4d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Keyed_Test_Keyed_Test_Connector_Impl</string> + <string>create_KeyedTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Keyed_Test_Keyed_Test_Connector_Servant</string> + <string>create_KeyedTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl index a5894738606..46a2a3adaba 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl @@ -14,16 +14,6 @@ #pragma ciao lem "Connector/Writer_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTest; -}; - -module Writer -{ - connector Writer_Connector : ::CCM_DDS::WriterTest::DDS_Event - { - }; -}; +module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector; #endif /* Writer_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl index 959d6ded63e..829c4ebb60e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl @@ -14,7 +14,7 @@ module Writer { component Receiver { - port CCM_DDS::WriterTest::DDS_Listen info_out; + port WriterTestConnector::DDS_Listen info_out; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp index cae3ee568e3..d294f0fc3e0 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp @@ -56,7 +56,7 @@ namespace CIAO_Writer_Receiver_Impl { } - ::CCM_DDS::WriterTest::CCM_Listener_ptr + ::WriterTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new WriterTest RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h index a6dd0077a1c..a0b47cd1288 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h @@ -20,7 +20,7 @@ namespace CIAO_Writer_Receiver_Impl // WriterTest_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export WriterTest_Listener_exec_i - : public virtual ::CCM_DDS::WriterTest::CCM_Listener, + : public virtual ::WriterTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -48,7 +48,7 @@ namespace CIAO_Writer_Receiver_Impl Receiver_exec_i (void); virtual ~Receiver_exec_i (void); - virtual ::CCM_DDS::WriterTest::CCM_Listener_ptr + virtual ::WriterTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl index eebc31419e2..e34fa5d405c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl @@ -16,7 +16,7 @@ module Writer { component Sender { - port CCM_DDS::WriterTest::DDS_Write info_write; + port WriterTestConnector::DDS_Write info_write; attribute unsigned short rate; attribute unsigned short iterations; attribute unsigned short keys; diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h index d3dc204e318..191b557261e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h @@ -80,7 +80,7 @@ namespace CIAO_Writer_Sender_Impl void start (void); void stop (void); - CCM_DDS::WriterTest::Writer_var writer_; + WriterTestConnector::Writer_var writer_; pulse_Generator * ticker_; ::Writer::CCM_Sender_Context_var context_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp index f89eafe9e25..41a4dff76dd 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Impl</string> + <string>create_WriterTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Servant</string> + <string>create_WriterTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl index e92d52e46c0..5cdc86f380f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl @@ -18,10 +18,7 @@ module LMBM_Test { module ::CCM_DDS::Typed < ::ListenManyByManyTest, ::ListenManyByManyTestSeq> - ListenManyByManyTestConn; - connector LMBM_Test_Connector : ListenManyByManyTestConn::DDS_Event - { - }; + ListenManyByManyTestConnector; }; #endif /* LMBM_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl index 71f1f8ed89d..e63c4a7f967 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl @@ -14,7 +14,7 @@ module LMBM_Test { component Receiver { - port ListenManyByManyTestConn::DDS_Listen info_listen; + port ListenManyByManyTestConnector::DDS_Listen info_listen; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp index 5c87ba07158..4d446de15b8 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp @@ -93,7 +93,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl dlc->mode (::CCM_DDS::MANY_BY_MANY); } - ::LMBM_Test::ListenManyByManyTestConn::CCM_Listener_ptr + ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_listen_data_listener (void) { return new ListenManyByManyTest_Listener_exec_i ( diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h index 07b9175734a..74a7d84572f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h @@ -25,7 +25,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl // ListenManyByManyTest_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export ListenManyByManyTest_Listener_exec_i - : public virtual ::LMBM_Test::ListenManyByManyTestConn::CCM_Listener, + : public virtual ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -68,7 +68,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl virtual void keys (::CORBA::UShort keys); - virtual ::LMBM_Test::ListenManyByManyTestConn::CCM_Listener_ptr + virtual ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener_ptr get_info_listen_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl index 38fc751dc0b..d0fceb242ec 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl @@ -16,7 +16,7 @@ module LMBM_Test { component Sender { - port ListenManyByManyTestConn::DDS_Write info_write; + port ListenManyByManyTestConnector::DDS_Write info_write; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h index 82b86350114..eb8666009e1 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h @@ -76,7 +76,7 @@ namespace CIAO_LMBM_Test_Sender_Impl private: ::LMBM_Test::CCM_Sender_Context_var context_; - ::LMBM_Test::ListenManyByManyTestConn::Writer_var writer_; + ::LMBM_Test::ListenManyByManyTestConnector::Writer_var writer_; WriteTicker *ticker_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp index b8323b7fe93..7b1ae790a65 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_LMBM_Test_LMBM_Test_Connector_Impl</string> + <string>create_LMBM_Test_ListenManyByManyTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_LMBM_Test_LMBM_Test_Connector_Servant</string> + <string>create_LMBM_Test_ListenManyByManyTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl index ca42ae7c2c4..af638d9599d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/LNE_Test_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::ListenNotEnabledTest, ::ListenNotEnabledTestSeq> ListenNotEnabledTest; -}; - module LNE_Test { - connector LNE_Test_Connector : ::CCM_DDS::ListenNotEnabledTest::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::ListenNotEnabledTest, ::ListenNotEnabledTestSeq> ListenNotEnabledTestConnector; }; #endif /* LNE_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl index dcc35279c4b..d66ea66bb36 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl @@ -14,7 +14,7 @@ module LNE_Test { component Receiver { - port CCM_DDS::ListenNotEnabledTest::DDS_Listen info_listen; + port ListenNotEnabledTestConnector::DDS_Listen info_listen; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp index b947842ccca..6e22aeb8747 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp @@ -53,7 +53,7 @@ namespace CIAO_LNE_Test_Receiver_Impl { } - ::CCM_DDS::ListenNotEnabledTest::CCM_Listener_ptr + ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_listen_data_listener (void) { return new ListenNotEnabledTest_Listener_exec_i ( diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h index a3fc938ccaf..a80a1c06251 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h @@ -24,7 +24,7 @@ namespace CIAO_LNE_Test_Receiver_Impl // ListenNotEnabledTest_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export ListenNotEnabledTest_Listener_exec_i - : public virtual ::CCM_DDS::ListenNotEnabledTest::CCM_Listener, + : public virtual ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -57,7 +57,7 @@ namespace CIAO_LNE_Test_Receiver_Impl Receiver_exec_i (void); virtual ~Receiver_exec_i (void); - virtual ::CCM_DDS::ListenNotEnabledTest::CCM_Listener_ptr + virtual ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_ptr get_info_listen_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl index a090fab06a4..ef25e616cd2 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl @@ -16,7 +16,7 @@ module LNE_Test { component Sender { - port CCM_DDS::ListenNotEnabledTest::DDS_Write info_write; + port ListenNotEnabledTestConnector::DDS_Write info_write; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h index 360525014a8..b0f9fc64974 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h @@ -61,7 +61,7 @@ namespace CIAO_LNE_Test_Sender_Impl private: ::LNE_Test::CCM_Sender_Context_var context_; - CCM_DDS::ListenNotEnabledTest::Writer_var writer_; + ::LNE_Test::ListenNotEnabledTestConnector::Writer_var writer_; CORBA::UShort iterations_; CORBA::UShort keys_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp index 6676e2fa543..c4d998747a5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_LNE_Test_LNE_Test_Connector_Impl</string> + <string>create_LNE_Test_ListenNotEnabledTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_LNE_Test_LNE_Test_Connector_Servant</string> + <string>create_LNE_Test_ListenNotEnabledTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl index e9d5300262c..7ae5f874606 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl @@ -18,10 +18,7 @@ module LOBO_Test { module ::CCM_DDS::Typed < ::ListenOneByOneTest, ::ListenOneByOneTestSeq> - ListenOneByOneTestConn; - connector LOBO_Test_Connector : ListenOneByOneTestConn::DDS_Event - { - }; + ListenOneByOneTestConnector; }; #endif /* LOBO_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl index d5b736d443f..e0e66570e78 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl @@ -14,7 +14,7 @@ module LOBO_Test { component Receiver { - port ListenOneByOneTestConn::DDS_Listen info_listen; + port ListenOneByOneTestConnector::DDS_Listen info_listen; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp index cbbf0cf4a5a..959cd27d8f3 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp @@ -89,7 +89,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl dlc->mode (::CCM_DDS::ONE_BY_ONE); } - ::LOBO_Test::ListenOneByOneTestConn::CCM_Listener_ptr + ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_listen_data_listener (void) { return new ListenOneByOneTest_Listener_exec_i ( diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h index c14608c024a..662903fb447 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h @@ -31,7 +31,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl // ListenOneByOneTest_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export ListenOneByOneTest_Listener_exec_i - : public virtual ::LOBO_Test::ListenOneByOneTestConn::CCM_Listener, + : public virtual ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -76,7 +76,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl virtual void keys (::CORBA::UShort keys); - virtual ::LOBO_Test::ListenOneByOneTestConn::CCM_Listener_ptr + virtual ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener_ptr get_info_listen_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl index 1dc822487ec..5bfb0e62118 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl @@ -16,7 +16,7 @@ module LOBO_Test { component Sender { - port ListenOneByOneTestConn::DDS_Write info_write; + port ListenOneByOneTestConnector::DDS_Write info_write; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h index 12a19aa5ab9..fdba13dc199 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h @@ -64,7 +64,7 @@ namespace CIAO_LOBO_Test_Sender_Impl private: ::LOBO_Test::CCM_Sender_Context_var context_; - ::LOBO_Test::ListenOneByOneTestConn::Writer_var writer_; + ::LOBO_Test::ListenOneByOneTestConnector::Writer_var writer_; WriteTicker *ticker_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp index be97bb9b3e5..5da508b3d61 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_LOBO_Test_LOBO_Test_Connector_Impl</string> + <string>create_LOBO_Test_ListenOneByOneTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_LOBO_Test_LOBO_Test_Connector_Servant</string> + <string>create_LOBO_Test_ListenOneByOneTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl index 6bb6aebdd10..b9a782189fe 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl @@ -9,9 +9,6 @@ #pragma ciao lem "NoModule_ConnectorE.idl" -module ::CCM_DDS::Typed < ::NoModuleType, ::NoModuleTypeSeq> NoModuleTypeConn; -connector NoModule_Connector : NoModuleTypeConn::DDS_Event -{ -}; +module ::CCM_DDS::Typed < ::NoModuleType, ::NoModuleTypeSeq> NoModuleTypeConnector; #endif diff --git a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl index 73871201722..2bb8c7fe5dd 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl @@ -16,10 +16,9 @@ module NonChangeable { - module ::CCM_DDS::Typed < ::NonChangeableTest, ::NonChangeableTestSeq> NonChangeableTestConn; - connector NonChangeable_Connector : NonChangeableTestConn::DDS_Event - { - }; + module ::CCM_DDS::Typed + < ::NonChangeableTest, ::NonChangeableTestSeq> + NonChangeableTestConnector; }; #endif /* NonChangeable_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp index d9b648013c4..a7e9402833d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp @@ -120,7 +120,8 @@ namespace CIAO_NonChangeable_NonChangeable_Connector_Impl void NonChangeable_Connector_exec_impl::ccm_activate (void) { - NonChangeable_Connector_exec_i::ccm_activate (); + ::CIAO_NonChangeable_NonChangeableTestConnector_DDS_Event_Impl:: + DDS_Event_exec_i::ccm_activate (); if (this->test_topic_name ()) { ACE_DEBUG ((LM_DEBUG, "Set topic_name test passed.\n")); diff --git a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h index 1bb3aa0d56d..a4d1187a3f9 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h @@ -8,7 +8,8 @@ namespace CIAO_NonChangeable_NonChangeable_Connector_Impl { class NONCHANGEABLE_CONNECTOR_CONN_Export NonChangeable_Connector_exec_impl - : public virtual NonChangeable_Connector_exec_i + : public virtual + ::CIAO_NonChangeable_NonChangeableTestConnector_DDS_Event_Impl::DDS_Event_exec_i { public: NonChangeable_Connector_exec_impl (void); diff --git a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp index d21fa1ac9d3..f5bed68e148 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp @@ -31,7 +31,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_NonChangeable_NonChangeable_Connector_Servant</string> + <string>create_NonChangeable_NonChangeableTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl index 55fb3090c3e..4f150572c72 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl @@ -14,7 +14,7 @@ module OIT_Test { component Receiver { - port OIT_Receiver_TopicConn::DDS_Listen info_out; + port OIT_Receiver_TopicConnector::DDS_Listen info_out; provides CCM_DDS::ConnectorStatusListener connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp index 7be8ea7758a..a899d79fe22 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp @@ -88,10 +88,10 @@ namespace CIAO_OIT_Test_Receiver_Impl this->thread_id_listener_); } - ::OIT_Test::OIT_Receiver_TopicConn::CCM_Listener_ptr + ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { - return ::OIT_Test::OIT_Receiver_TopicConn::CCM_Listener::_nil (); + return ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener::_nil (); } // Operations from Components::SessionComponent. diff --git a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h index 0e735864a08..b511168a069 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h @@ -78,7 +78,7 @@ namespace CIAO_OIT_Test_Receiver_Impl virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr get_connector_status (void); - virtual ::OIT_Test::OIT_Receiver_TopicConn::CCM_Listener_ptr + virtual ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener_ptr get_info_out_data_listener (void); // Operations from Components::SessionComponent. diff --git a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl index 24fc8e7905e..6ccd2f5c7c7 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl @@ -16,10 +16,8 @@ module OIT_Test { - module ::CCM_DDS::Typed < ::OIT_Receiver_Topic, ::OIT_Receiver_TopicSeq> OIT_Receiver_TopicConn; - connector OIT_Receiver_Connector : OIT_Receiver_TopicConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::OIT_Receiver_Topic, ::OIT_Receiver_TopicSeq> + OIT_Receiver_TopicConnector; }; #endif /* ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl index c8b3ff6b86d..b9108eee085 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl @@ -16,7 +16,7 @@ module OIT_Test { component Sender { - port OIT_Sender_TopicConn::DDS_Write topic_write; + port OIT_Sender_TopicConnector::DDS_Write topic_write; provides CCM_DDS::ConnectorStatusListener connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl index 76ea4612f67..8d94fa4fd2a 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl @@ -16,10 +16,8 @@ module OIT_Test { - module ::CCM_DDS::Typed < ::OIT_Sender_Topic, ::OIT_Sender_TopicSeq> OIT_Sender_TopicConn; - connector OIT_Sender_Connector : OIT_Sender_TopicConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::OIT_Sender_Topic, ::OIT_Sender_TopicSeq> + OIT_Sender_TopicConnector; }; #endif /* ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp index 6b57d240187..710aabb4ce9 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_OIT_Test_OIT_Sender_Connector_Impl</string> + <string>create_OIT_Test_OIT_Sender_TopicConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_OIT_Test_OIT_Sender_Connector_Servant</string> + <string>create_OIT_Test_OIT_Sender_TopicConnector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -123,7 +123,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_OIT_Test_OIT_Receiver_Connector_Impl</string> + <string>create_OIT_Test_OIT_Receiver_TopicConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -134,7 +134,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_OIT_Test_OIT_Receiver_Connector_Servant</string> + <string>create_OIT_Test_OIT_Receiver_TopicConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl new file mode 100644 index 00000000000..709b9e2c465 --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl @@ -0,0 +1,36 @@ +// $Id$ + +#ifndef OFM_CONNECTOR_IDL +#define OFM_CONNECTOR_IDL + +#if defined __TAO_IDL +#include "connectors/dds4ccm/idl/ccm_dds.idl" +#endif + +#pragma ndds typesupport "OFM_ConnectorSupport.h" +#pragma ciao lem "OFM_ConnectorE.idl" + +struct Topic1 { + string key_value_topic1; //@key + long long_value; +}; +typedef sequence<Topic1> Topic1Seq; + + +struct Topic2 { + string key_value_topic2; //@key + float float_value; +}; +typedef sequence<Topic2> Topic2Seq; + +struct Topic3 { + string key_value_topic3; //@key + short short_value; +}; +typedef sequence<Topic3> Topic3Seq; + +module ::CCM_DDS::Typed < ::Topic1, ::Topic1Seq> Topic1Connector; +module ::CCM_DDS::Typed < ::Topic2, ::Topic2Seq> Topic2Connector; +module ::CCM_DDS::Typed < ::Topic3, ::Topic3Seq> Topic3Connector; + +#endif diff --git a/modules/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/modules/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc new file mode 100644 index 00000000000..fb27ac95800 --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc @@ -0,0 +1,133 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -b dds4ccm_base OFM_Connector" + +project(OFM_Connector_idl_gen) : connectoridldefaults, taoidldefaults, \ + dds4ccm, anytypecode, dds4ccm_ts_default { + custom_only = 1 + idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=OFM_Connector_stub_export.h \ + -Wb,skel_export_macro=OFM_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=OFM_Connector_svnt_export.h \ + -Wb,conn_export_macro=OFM_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=OFM_Connector_conn_export.h \ + -Gxhex -Gxhsk -Gxhst + dynamicflags -= NDDS_USER_DLL_EXPORT + + IDL_Files { + OFM_Connector.idl + } + + DDSGenerator_Files { + OFM_Connector.idl + } +} + +project(OFM_Connector_lem_gen) : ciaoidldefaults, dds4ccm { + after += OFM_Connector_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=OFM_Connector_lem_stub_export.h \ + -SS -Gxhst + + IDL_Files { + OFM_ConnectorE.idl + } +} + +project(OFM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += OFM_Connector_lem_gen OFM_Connector_stub + libs += OFM_Connector_stub + + sharedname = OFM_Connector_lem_stub + dynamicflags = OFM_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OFM_ConnectorEC.cpp + } + + Header_Files { + OFM_ConnectorEC.h + OFM_Connector_lem_stub_export.h + } + + Inline_Files { + OFM_ConnectorEC.inl + } +} + +project(OFM_Connector_stub) : ccm_stub, dds4ccm_base { + after += OFM_Connector_idl_gen + sharedname = OFM_Connector_stub + dynamicflags = OFM_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OFM_ConnectorC.cpp + } + + Header_Files { + OFM_ConnectorC.h + OFM_Connector_stub_export.h + } + + Inline_Files { + OFM_ConnectorC.inl + } +} + +project(OFM_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { + after += OFM_Connector_lem_stub OFM_Connector_stub + sharedname = OFM_Connector_exec + libs += OFM_Connector_stub OFM_Connector_lem_stub + + dynamicflags = OFM_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OFM_Connector_conn.cpp + } + + Header_Files { + OFM_Connector_conn.h + OFM_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project(OFM_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub { + after += OFM_Connector_lem_stub + sharedname = OFM_Connector_svnt + libs += OFM_Connector_stub OFM_Connector_lem_stub + + dynamicflags = OFM_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OFM_ConnectorS.cpp + OFM_Connector_svnt.cpp + } + + Header_Files { + OFM_ConnectorS.h + OFM_Connector_svnt.h + OFM_Connector_svnt_export.h + } + + Inline_Files { + OFM_ConnectorS.inl + } +} + + diff --git a/modules/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl new file mode 100644 index 00000000000..357e9746d89 --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl @@ -0,0 +1,31 @@ +// $Id$ + +/** + * @file OneFile_Connector.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef ONEFILE_CONNECTOR_IDL_ +#define ONEFILE_CONNECTOR_IDL_ + +#if defined __TAO_IDL +#include "connectors/dds4ccm/idl/ccm_dds.idl" +#endif + +#pragma ndds typesupport "OneFile_ConnectorSupport.h" +#pragma ciao lem "OneFile_ConnectorE.idl" + +struct OneFileTopic { + string hello; //@key + long iteration; +}; +typedef sequence<OneFileTopic> OneFileTopicSeq; + +module OneFile_Connector +{ + module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector; +}; + +module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector; + +#endif /* ONEFILE_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/modules/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc new file mode 100755 index 00000000000..1078b9d1641 --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc @@ -0,0 +1,131 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -b dds4ccm_base OneFile_Connector" + +project(OneFile_Connector_idl_gen) : connectoridldefaults, taoidldefaults, \ + dds4ccm, anytypecode, dds4ccm_ts_default { + custom_only = 1 + idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=OneFile_Connector_stub_export.h \ + -Wb,skel_export_macro=ONEFILE_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=OneFile_Connector_svnt_export.h \ + -Wb,conn_export_macro=ONEFILE_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=OneFile_Connector_conn_export.h \ + -Gxhex -Gxhsk -Gxhst + IDL_Files { + OneFile_Connector.idl + } + + DDSGenerator_Files { + OneFile_Connector.idl + } +} + +project(OneFile_Connector_lem_gen) : ciaoidldefaults, dds4ccm { + after += OneFile_Connector_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=OneFile_Connector_lem_stub_export.h \ + -SS -Gxhst + + IDL_Files { + OneFile_ConnectorE.idl + } +} + +project(OneFile_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += OneFile_Connector_lem_gen OneFile_Connector_stub + libs += OneFile_Connector_stub + + sharedname = OneFile_Connector_lem_stub + dynamicflags = ONEFILE_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OneFile_ConnectorEC.cpp + } + + Header_Files { + OneFile_ConnectorEC.h + OneFile_Connector_lem_stub_export.h + } + + Inline_Files { + OneFile_ConnectorEC.inl + } +} + +project(OneFile_Connector_stub) : ccm_stub, dds4ccm_base { + after += OneFile_Connector_idl_gen + sharedname = OneFile_Connector_stub + dynamicflags = ONEFILE_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OneFile_ConnectorC.cpp + } + + Header_Files { + OneFile_ConnectorC.h + OneFile_Connector_stub_export.h + } + + Inline_Files { + OneFile_ConnectorC.inl + } +} + +project(OneFile_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { + after += OneFile_Connector_lem_stub OneFile_Connector_stub + sharedname = OneFile_Connector_exec + libs += OneFile_Connector_stub OneFile_Connector_lem_stub + + dynamicflags = ONEFILE_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OneFile_Connector_conn.cpp + } + + Header_Files { + OneFile_Connector_conn.h + OneFile_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project(OneFile_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub { + after += OneFile_Connector_lem_stub + sharedname = OneFile_Connector_svnt + libs += OneFile_Connector_stub OneFile_Connector_lem_stub + + dynamicflags = ONEFILE_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + OneFile_ConnectorS.cpp + OneFile_Connector_svnt.cpp + } + + Header_Files { + OneFile_ConnectorS.h + OneFile_Connector_svnt.h + OneFile_Connector_svnt_export.h + } + + Inline_Files { + OneFile_ConnectorS.inl + } +} + + diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl b/modules/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl new file mode 100644 index 00000000000..bb9cd11fbab --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl @@ -0,0 +1,1408 @@ +// $Id$ + +//============================================================================== +// U N C L A S S I F I E D +//============================================================================== +/// @addtogroup PSAT_API +/// @{ +/// @file ccm_dds_psat.idl +/// @brief Defines the data and interfaces for the Pub/Sub Attachment Transfer +// (PSAT) DDS4CCM connector. +//============================================================================== + +#ifndef CCM_DDS_PSAT_IDL +#define CCM_DDS_PSAT_IDL + +/// @todo DETAILED DESIGN - Put more info on how fields are initialized before +/// use. Also put any "restricted" or "for internal use" ranges of values. + +/// @todo DETAILED DESIGN - May want to have constants defined for default +/// values (for example, AD_BUFFER_ID_DEFAULT) + +/// @todo DETAILED DESIGN - Document which groups of settings are considered to +/// be inconsistent or invalid and what sort of error(s) or exception(s) +/// may result. + +/// @todo DETAILED DESIGN - Figure out what should go into a "discovery info" +/// structure + +/// @todo Move these two group definitions below where the rest live for CSS +/// (Core/tools/Doxygen/common/SNA_API_modules/PSAT_API_modules) + +/// @todo Need to split this file up into two parts. The first part would +/// be in a new file named "ccm_dds_psat_header.idl" which contains the +/// PSAT_Header and all related sub-structures/types/enums, etc. +/// The second would remain in this file and would contain everything +/// else. +/// Naturally this file would #include the new file. + +/** + * @defgroup PSAT_Publisher PSAT Publisher Side + * Group of interfaces for the @ref PSAT connector that are only used by + * @ref PSAT publishers + */ + +/** + * @defgroup PSAT_Subscriber PSAT Subscriber Side + * Group of interfaces for the @ref PSAT connector that are only used by + * @ref PSAT subscribers + */ + +#include "ccm_dds.idl" + +/** + * @namespace CCM_DDS_PSAT + * + * Module containing all @ref PSAT related entities. Non-typed constructs are + * directly defined in this module, while typed constructs are in a templated + * sub-module. + */ +module CCM_DDS_PSAT +{ + // --------------------------- + // Enums, structs and Typedefs + // --------------------------- + + /** + * Size in characters of a fixed size string (char array). + * @todo DETAILED DESIGN - FIGURE OUT MAX SIZE + */ + const long FIXED_STRING_SIZE = 50; + + /** + * @typedef FixedString + * + * Typedef for the fixed-size string of size #FIXED_STRING_SIZE + */ + typedef char FixedString[FIXED_STRING_SIZE]; + + /** + * @typedef StrSeq + * + * Unbounded sequence of strings. + */ + typedef sequence<string> StrSeq; + + /** + * @enum EndianType + * + * Byte endianness of data in the @ref AD buffer. + */ + enum EndianType + { + /** + * Little endian byte order (for example, x86_64). + */ + PSAT_AD_LITTLE_ENDIAN, + + /** + * Big endian byte order (for example, PowerPC/Cell). + */ + PSAT_AD_BIG_ENDIAN + }; + + /** + * @struct DataShape + * + * Structure defining a bounding box describing the sample or subsample that + * is to be transferred. + * + * @par Important: + * When the underlying attachment transport is zero-copy shared memory, the + * following restrictions apply to what the + * Typed_PSAT::PSAT_Interceptor::on_metadata_intercept may alter in the + * @ref UDM "UDM": + * + * @li The DataShape::stride field cannot change as that would force a copy. + * + * @li Changes to any field within this structure will alter the shape of + * the bounding box. This new shape must not fall outside the bounding + * box defined by the original values in this structure. + * + * @par + * Bounds checking will be performed by the @ref PSAT connector using the + * following equation and inequalities: + * @f[end\_offset = source\_offset + [(num\_blocks - 1) * stride] + + * block\_length@f] + * After performing the above calculation on both the old and new values of + * these fields, the following must be true: + * @f[new\_end\_offset \le old\_end\_offset@f] + * @f[new\_source\_offset \ge old\_source\_offset@f] + * + * @todo VERIFY THAT THESE FORMULAS are sufficient to prevent going outside + * the bounding box created when publishing + * + * @par + * For the above, the PSAT_Header::source_offset is the upper-left corner of + * the bounding box. The @f$end\_offset@f$ (calculated above) is the + * lower-right corner of the same box. + * + * @par Example: + * <pre> + * # # # # # # # + * # # * * * # # + * # # * * * # # + * # # * * * # # + * # # * * * # # + * # # # # # # # + * </pre> + * + * @par + * In the above picture, the '#' elements are not to be sent while the '*' + * elements will be sent. In this case, the publisher wishes to send the + * 4x3 subset of data shown using asterisks. To do this, the user would fill + * out the DataShape structure (as well as the PSAT_Header::source_offset + * field as shown: + * + * @code + * MyModule::MyUDM udm; // a custom UDM created by the user + * + * // fill out the UDM by using one of the create_data* calls and write + * // into buffer + * + * // A variable to hold the size of each element in this matrix. + * // ELEMENT_TYPE could be, for example, long long, std::complex<float>, + * // double, etc. + * unsigned long long elementSizeInBytes = sizeof(ELEMENT_TYPE); + * + * // 4 rows/blocks of data + * udm.psatHeader.psat_view.num_blocks = 4; + * + * // 3 elements per row/block + * udm.psatHeader.psat_view.block_length = 3 * elementSizeInBytes; + * + * // 7 elements between beginnings of consecutive rows/blocks + * udm.psatHeader.psat_view.stride = 7 * elementSizeInBytes; + * + * // Beginning of first row/block to send is 9 elements from the beginning + * // of the PSAT sample + * udm.psatHeader.source_offset = 9 * elementSizeInBytes; + * @endcode + */ + struct DataShape + { + /** + * Num blocks of @ref AD data to send (each of contiguous + * DataShape::block_length bytes). The following groups of settings are + * possible: + * + * @li num_blocks = 0 + * @par + * - @b Publisher - This is an error condition that will result in an + * InvalidUDM exception being thrown. + * - @b Subscriber - This will result in canceling the attachment data + * transfer for the current subsample. + * - This subsample will not be transferred or delivered to the + * application component. + * - If the sample only contains one subsample, this has the + * effect of canceling the entire sample transfer. + * + * @li num_blocks = 1 + * @par + * Indicates one contiguous block of the @ref AD buffer to transfer. + * + * @li num_blocks > 1 + * @par + * Indicates a scatter/gather operation of a set of individual blocks + * each of which are contiguous DataShape::block_length bytes in size. + * @par + * If the underlying @ref PSAT transport is zero-copy shared memory, and + * a call is made wherein num_blocks > 1, on the + * - @b Publisher - an InvalidUDM exception will be thrown. + * - @b Subscriber - the @ref PSAT connector will invoke the + * Typed_PSAT::PSAT_ReaderStatusListener::on_copy_unsupported error + * callback. + * @par + * Data copying is implied when performing a scatter/gather operation, + * and is only possible on underlying transports that support at least + * one copy. + */ + long long num_blocks; + + /** + * Number of bytes per contiguous block of @ref AD data to transfer. + * + * @note + * This field is initialized with the @ref AD buffer maximum size + * specified in the @ref PSAT connector attributes. If the user wishes to + * send less than that max size, they should set it to the correct number + * of bytes before publishing. + */ + long long block_length; + + /** + * The offset (in bytes) from the beginning of a row in the + * "rectangular shaped data" to the beginning of the next row. This + * supports a single @ref AD buffer transfer of a non-contiguous, + * sub-sample of "rectangular shaped data" (e.g., a rectangular sub-block + * within a larger rectangular sample buffer). + * + * @par Note 1: + * The value of this field is a "don't care" if + * DataShape::num_blocks <= 1. + * + * @par Note 2: + * The value of this field cannot be negative or the following behavior + * will result: + * <dl> + * <dt><strong>Publisher Side:</strong></dt> + * <dd>An InvalidUDM exception will be thrown</dd> + * <dt><strong>Subscriber Side:</strong></dt> + * <dd>The Typed_PSAT::PSAT_ReaderStatusListener::on_invalid_UDM + * error callback will be invoked.</dd> + * </dl> + */ + long long stride; + }; + + /** + * @ingroup PSAT_Subscriber + * @struct SubscriberSideInfo + * + * Collection of fields used only on the subscriber side, which have no + * meaning to the publisher. + * + * @warning + * Publisher use of these fields will result in exceptions or possibly + * undefined behavior. + */ + struct SubscriberSideInfo + { + /** + * Total number of bytes of @ref AD data actually sent over the attachment + * transport. + * + * @par Note 1: + * If @e transferred_length and (DataShape::num_blocks * + * DataShape::block_length) do not match after the transfer + * is complete, the @ref PSAT connector will invoke the + * Typed_PSAT::PSAT_ReaderStatusListener::on_incomplete_transfer callback. + * + * @par Note 2: + * This field has no meaning in the + * Typed_PSAT::PSAT_Interceptor::on_metadata_intercept callback, since it + * is set after that callback returns. + */ + long long transferred_length; + + /** + * @ref AD deadline (in microseconds) for partial buffer transfers. This + * is a subscriber-side deadline time-out. If non-zero, a timer is set to + * this value each time a subsample is received. The next subsample must + * be received before this timer expires. + * + * If this timer expires, the @ref PSAT connector will deliver an + * "incomplete" sample to the + * Typed_PSAT::PSAT_ReaderStatusListener::on_incomplete_transfer callback. + * The "incomplete" sample is indicated by having the + * PSAT_Header::sample_complete field in the @ref UDM be @b false. + * + * @note + * The timer is only set if this field is non-zero and + * SubscriberSideInfo::sample_complete is @b false upon return from the + * Typed_PSAT::PSAT_Interceptor::on_metadata_intercept callback. + */ + long long sample_incomplete_deadline_usec; + + /** + * @ref PSAT sample flag to control sample delivery to the application + * component. It is targeted for use by the + * Typed_PSAT::PSAT_Interceptor::on_metadata_intercept callback to support + * the ability to send multiple partial samples. When this flag is set to + * true, the attachment transfer will commence and the @ref PSAT sample + * will be delivered to the application component's + * @b DDS_Typed::Listener::on_one_data callback. + * + * @note + * This field has the following effects when combined with the + * PSAT_Header::sample_complete field: + * <table> + * <tr> + * <th>deliver_sample</th> + * <th>sample_complete</th> + * <th>Effect</th> + * </tr> + * <tr> + * <td>false</td> + * <td>false</td> + * <td>@ref PSAT Sample is still incomplete. Don't deliver yet</td> + * </tr> + * <tr> + * <td>false</td> + * <td>true</td> + * <td>Cancel transfer and cleanup any previously received subsamples</td> + * </tr> + * <tr> + * <td>true</td> + * <td>false</td> + * <td>Deliver any @ref PSAT subsamples received so far</td> + * </tr> + * <tr> + * <td>true</td> + * <td>true</td> + * <td>Deliver complete @ref PSAT sample</td> + * </tr> + * </table> + */ + boolean deliver_sample; + + /** + * Offset (in bytes) from the start of the destination @ref AD sample + * buffer to the location where the received data will be placed. + * + * @note + * This field will be initialized to a default value when the @ref UDM is + * filled out by any of the Typed_PSAT::PSAT_Writer::create_data* calls. + * When the value equals this default, the field is treated as if it were + * equal to the PSAT_Header::source_offset field. + * + * @par + * This field should only be changed in the + * Typed_PSAT::PSAT_Interceptor::on_metadata_intercept callback. The + * publisher does not have the required insight into the management of + * the subscriber's memory in order to intelligently change this field. + * + * @par Important: + * If the underlying attachment transport is zero-copy shared memory, this + * field can only have one of the following values upon return from + * the Typed_PSAT::PSAT_Interceptor::on_metadata_intercept callback: + * - The value it had when the callback was entered + * - The same value as the PSAT_Header::source_offset field + * . + * Any other value will cause the + * Typed_PSAT::PSAT_ReaderStatusListener::on_copy_unsupported error + * callback to be invoked and the attachment transfer will be cancelled. + * The reason for this is that having different offsets forces a copy + * which a zero-copy transport by definition does not support. + */ + long long destination_offset; + }; + + /** + * @struct ConnectorPrivateInfo + * + * Information used only by @ref PSAT connectors to correctly setup + * attachment transfers. + */ + struct ConnectorPrivateInfo + { + /// @todo We may want this structure and its contents to only show up in + /// the internal Doxygen documentation. + + /** + * A string (unique to each @ref PSAT connector instance) which is used to + * correlate a @ref UDM sample with its publisher in order to properly + * setup the corresponding @ref AD attachment transfer. + * + * After receiving the @ref UDM, the subscriber side of the connector + * "pulls" the associated @ref AD from the publisher. Unlike the + * publishing of the @ref UDM, this is done as a one to one transfer. + * This field lets the connector know which publisher it needs to pull + * from. + */ + FixedString publisher_connector_id; + + /** + * An ID number which, along with the #publisher_connector_id, creates a + * topic-unique ID which is used internally by the connector for buffer + * lifecycle management. + */ + long long internal_buffer_id; + + /// @todo DETAILED DESIGN - figure out contents + }; + + /** + * @struct PSAT_Header + * + * Defines a set of @ref PSAT "PSAT" "core" attributes shared by the user's + * application component and the connector. This structure describes the + * @ref PSAT @ref AD attachment as well as containing information used to + * set up the attachment transfer. This struct must be in all @ref UDM + * messages with the field name @b psatHeader. + */ + struct PSAT_Header + { + /** + * Pointer to the beginning of the complete @ref AD sample buffer. The + * shared memory associated with this buffer is mapped (by the @ref PSAT + * connector) to the local address space of the publisher and subscriber + * processes (typically this is @b NOT the same address on both sides). + * + * @note + * Since the value of this field is set locally on each end of a + * connection, its value during transport is a don't care. + * + * @note + * The @ref PSAT connector will fill in this field: + * - @b Publisher @b Side: During a call to + * Typed_PSAT::PSAT_Writer::create_data. That call returns an + * allocated @ref UDM message containing the address of a separately + * allocated @ref AD buffer in this field. + * - @b Subscriber @b Side: Before the user application component's + * @b DDS_Typed::Listener::on_one_data callback is invoked + * + * @warning + * This field should @b NOT be used in the + * Typed_PSAT::PSAT_Interceptor::on_metadata_intercept callback as the + * attachment transfer has yet to start and the buffer this field will + * point to (into which the data will be put/shared from) is unknown at + * that time. + * + * @see Typed_PSAT::PSAT_Writer for an example of how this field would be + * used in code. + */ + long long sample_start_address; + + /** + * Topic-unique @ref AD buffer identifier assigned by the application when + * a new PSAT AD buffer is allocated on the publisher side with a + * Typed_PSAT::PSAT_Writer::create_data() call. Used to specify which + * sample buffer to update in the case where sub-samples are sent via + * multiple, sequential sub-sample Typed_PSAT::PSAT_Writer::write_one + * calls (either from a single publisher or as parallel writes from + * multiple publishers). + * + * The @ref PSAT connector will maintain one outstanding @ref AD sample + * buffer for each unique buffer ID value until a + * Typed_PSAT::PSAT_BufferControl::release_buffer call is made by the + * subscriber to free it. + * + * @par Important: + * For any individual sample that consists of multiple subsamples, each + * subsample must utilize the same buffer ID. + * + * @par + * In the multi-publisher case, it is incumbent upon the application + * developer to ensure that a consistent buffer ID value is utilized + * and set by each separate publisher intending to update only a + * sub-sample portion of a target subscriber sample buffer. + * + * @par + * The value of this field @b MUST be unique between samples over the + * lifetime of the topic. + */ + long long ad_buffer_id; + + /** + * Offset (in bytes) from the start of the source @ref AD sample buffer to + * the first block of data to transfer. + */ + long long source_offset; + + /** + * @copybrief DataShape + * + * @see DataShape for further information and an example of this field's + * use. + */ + DataShape psat_view; + + /** + * Endianness ("big endian" or "little endian") of the @ref AD data. A + * default value is set for this field by any of the + * Typed_PSAT::PSAT_Writer::create_data* calls based on the machine + * architecture on which the publisher is executing. + * + * @par Note 1: + * "Endianness" refers to how the machine architecture is setup to store + * the individual bytes of a multi-byte value (i.e., is the most + * significant byte first or last). + * + * @par Note 2: + * This does not preclude the user's publisher component from changing + * this field if the endianess of the @ref AD does not match the + * publisher's native machine architecture. + */ + EndianType source_endian; + + /** + * Flag indicating that the @ref AD buffer is complete and the last + * transfer is about to take place. A setting of @b false indicates that + * the subscriber should expect the reception of subsequent sub-samples. + * + * @par Publisher: + * This field is initialized to be @b true (no subsamples) by any of the + * Typed_PSAT::PSAT_Writer::create_data* calls. The publisher application + * component may then change the value to @b false if sending subsamples + * is desired. The value of this field must then again be set to @b true + * when sending the final subsample. + * + * @par Subscriber: + * - The subscriber application component should keep some type of + * "scoreboard" so that it knows when it has received all the + * aub-samples it expects. + * - See the definition of SubscriberSideInfo::deliver_sample for + * details because the values of these two fields are always used + * together on the subscriber side. + * - It is an error if the following conditions are all satisfied. In + * that case an InvalidUDM exception will be thrown from whichever + * method is used with the @ref UDM. + * - This flag is @b false + * - The PSAT_Header::ad_buffer_id field is still set to its default + * value + * . + * This is because subsamples require a buffer ID so they can be + * correlated and collected on the subscriber side. + * . + * + * @see SubscriberSideInfo::deliver_sample for how this field is used + * with that field on the subscriber side to control the delivery of + * samples or subsamples. + */ + boolean sample_complete; + + /** + * Data fields that are only used by @ref PSAT subscribers. + */ + SubscriberSideInfo subscriber_side_info; + + /** + * Data fields that should only be accessed by the @ref PSAT connector. + */ + ConnectorPrivateInfo connector_only_info; + }; + + /** + * @struct BasicUDM + * + * Basic @ref UDM to use if the user does not want to add any other + * information. + * + * @note + * If a user wishes to create a custom @ref UDM with additional information, + * the user should create a new fixed-length IDL structure (a struct without + * sequence or string types anywhere in it) with a field named @b psatHeader + * of type PSAT_Header. All UDM structures @b must be defined in a + * non-templated module and must have no dependencies on templated modules + * (e.g., have a member which is of a type defined in a templated module). + * + * @par + * For example, to create a custom @ref UDM that has a long and a double as + * additional information, the IDL would be: + * @code + * struct MyUDM // name it whatever you want + * { + * PSAT_Header psatHeader; // The only required field + * long myLongField; // names of additional fields do not matter + * double myDoubleField; + * }; + * @endcode + */ + struct BasicUDM + { + /** + * @ref UDM required header. All @ref UDM types must have a field of + * this name and type. + */ + PSAT_Header psatHeader; + }; + + /** + * @struct AsynchErrorInfo + * + * Information about the cause of an asynchronous error (i.e. outside of a + * method invocation). This structure is an input to the various + * @ref PSAT error callbacks. + * + * @todo DETAILED DESIGN - This may eventually be split into a structure type + * for each callback, similar to the DDS API. + */ + struct AsynchErrorInfo + { + string get_rid_of_this; // TEMPORARY FIELD SO THE STRUCT COMPILES + + /// @todo DETAILED DESIGN - figure out contents + }; + + /** + * @struct SharedMemoryConfig + * + * Information needed to create and/or attach to a piece of shared memory + * into which the @ref AD buffers will be put. + */ + struct SharedMemoryConfig + { + /** + * @todo DETAILED DESIGN - Once we figure out exactly how the shared mem + * name will be created/used, this comment needs + * to be updated with more detail on what + * constitutes a valid name, and any other details + * like does a file already need to be existing. + */ + + /** + * @todo DETAILED DESIGN - The PSAT connector will internally convert this + * to a valid shared memory name for the system it + * is executing on. + */ + + /** + * Name of the shared memory segment. + */ + string name; + + /** + * Size (in bytes) of the shared memory segment. + */ + long long size; + + /** + * Alignment in bytes (for cache lines, etc.) required. This value is + * processor dependent. + */ + long long alignment; + }; + + /** + * @struct BufferPoolConfig + * + * Information needed to create a pool of @ref AD buffers in a piece of + * shared memory. + */ + struct BufferPoolConfig + { + /** + * Offset (in bytes) from the start of the shared memory segment + * associated with this connector to the start of the @ref AD buffer. + */ + long long buffer_start_offset; + + /** + * Number of @ref AD buffers to place into this shared memory segment. + */ + long long num_buffers; + + /** + * The maximum size (in bytes) of each @ref AD buffer. + */ + long long buffer_size; + }; + + /** + * @struct TransportConfig + * + * Information used to setup the transport used for attachment transfers. + * + * If the user wishes to use only shared memory, then they should set + * the TransportConfig::transport_preference field to only have + * support for shared memory (i.e., only have + * @b "PSAT_TRANSPORT_SHARED_MEM" in the sequence). + * + * If the user wishes to only allow or disallow specific interfaces, they + * can specify these in TransportConfig::allowed_interfaces list, + * TransportConfig::denied_interfaces list, or both. In the case where both + * lists are used, the TransportConfig::denied_interfaces list takes + * precedence. + */ + struct TransportConfig + { + /** + * @todo DETAILED DESIGN - Think about what the behavior should be when + * an interface name and its associated IP address + * both show up in the same list. + */ + + /** + * Sequence of names of allowed interfaces to use for attachment + * transfers. Each "name" in this list can either be an interface name + * (e.g., "eth0") or an IP address (e.g., "10.14.255.7"). + * + * If this list is empty, then all network interfaces can potentially be + * used for attachment transfers as long as they are not also listed in + * the TransportConfig::denied_interfaces list. + * + * @par Note 1: + * This field should only be used to allow specific interfaces @b within a + * transport (i.e. to allow @b eth1 in the case where a machine has @b + * @b eth0, @b eth1 and @b eth2 interfaces). It is @b not intended to + * allow an entire transport. TransportConfig::transport_preference should + * be used for that purpose. + * + * @par Note 2: + * These interfaces are only allowed if they do not also show up in the + * TransportConfig::denied_interfaces list since the latter takes + * precedence. + */ + StrSeq allowed_interfaces; + + /** + * Sequence of names of denied interfaces that cannot be used for + * attachment transfers. Each "name" in this list can either be an + * interface name (e.g., "eth0") or an IP address (e.g., "10.14.255.7"). + * + * If this list is empty, then all network interfaces can be used for + * attachment transfers. + * + * @par Note 1: + * This field should only be used to deny specific interfaces @b within a + * transport (i.e. to deny @b eth1 in the case where a machine has @b + * @b eth0, @b eth1 and @b eth2 interfaces). It is @b not intended to + * disallow an entire transport. TransportConfig::transport_preference + * should be used for that purpose. + * + * @par Note 2: + * These interfaces are always denied even if they show up in the + * TransportConfig::allowed_interfaces list since this field takes + * precedence. + */ + StrSeq denied_interfaces; + + /// @todo DETAILED DESIGN - Figure out how to deal with conflicting + /// priorities in publisher and subscriber. + + /// @todo DETAILED DESIGN - Figure out what to do when seeing a string + /// for a currently-unsupported type. Throw an + /// exception?? + + /** + * Sequence of strings listing all the transports that can be used for + * attachment transfers. This list is ordered by priority (first + * entry is highest priority and last entry is lowest). The @ref PSAT + * connector will attempt to find the highest priority transport that is + * available to both the publisher and subscriber. + * + * If a value appears in this sequence more than once, an + * InvalidConnectorAttributes exception will be thrown at connector + * initialization. + * + * @par Note 1: + * This is a sequence of strings so that IDL definitions will not have to + * be rewritten if and when future transports are supported. + * + * @par Note 2: + * The currently supported string values for transports are: + * @li "PSAT_TRANSPORT_SHARED_MEM" + * @li "PSAT_TRANSPORT_RDMA" + * @li "PSAT_TRANSPORT_TCP_IP" + * + * @par + * In the future, other transports may be added which would extend the + * list of valid strings for elements of this sequence. + */ + StrSeq transport_preference; + }; + + // ---------- + // Exceptions + // ---------- + + /** + * @idlexcept SharedMemoryInitError + * + * Indicates a shared memory creation or attachment error. This exception + * will be thrown in the connector's ccm_activate. + */ + exception SharedMemoryInitError + { + /** + * @publicsection + */ + + /** + * Text message explaining cause of error. + */ + string explanation; + + /// @todo DETAILED DESIGN - figure out contents + }; + + /** + * @idlexcept InvalidConnectorAttributes + * + * Indicates that the @ref PSAT connector could not be initialized properly + * due to one or more invalid connector attributes. This exception will be + * thrown in the connector's ccm_activate. + */ + exception InvalidConnectorAttributes + { + /** + * @publicsection + */ + + /** + * Text message explaining cause of error. + */ + string explanation; + + /// @todo DETAILED DESIGN - figure out contents + }; + + /** + * @idlexcept NoAvailableAD_Buffer + * + * Indicates that no @ref AD buffers are available (all are in use). + */ + exception NoAvailableAD_Buffer + { + /** + * @publicsection + */ + + /** + * Text message explaining cause of error. + */ + string explanation; + + /// @todo DETAILED DESIGN - figure out contents + }; + + /** + * @idlexcept InvalidAD_BufferState + * + * Indicates that an @ref AD buffer would have been placed in an incorrect + * state if a method had been allowed to continue. For example, this + * exception would be thrown when + * Typed_PSAT::PSAT_BufferControl::release_buffer is called for an already + * released buffer. + */ + exception InvalidAD_BufferState + { + /** + * @publicsection + */ + + /** + * Text message explaining cause of error. + */ + string explanation; + + /// @todo DETAILED DESIGN - figure out contents + }; + + /** + * @idlexcept InvalidUDM + * + * Indicates that a @ref UDM has a @ref PSAT header with inconsistent values + * (such as negative offsets or inconsistent fields). + */ + exception InvalidUDM + { + /** + * @publicsection + */ + + /** + * Text message explaining cause of error. + */ + string explanation; + + /// @todo DETAILED DESIGN - figure out contents + }; + + /** + * @idlexcept UnsucessfulFlush + * + * Indicates that the @ref PSAT connector could not flush the @ref AD buffer + * memory in order to release all its resources so they become available for + * use by another connector instance or application component. + */ + exception UnsucessfulFlush + { + /** + * @publicsection + */ + + /** + * Text message explaining cause of error. + */ + string explanation; + + /// @todo DETAILED DESIGN - figure out contents + }; + + /// @todo DETAILED DESIGN - do we need any more exceptions? + + /** + * @namespace CCM_DDS_PSAT::Typed_PSAT + * + * Templated module which is the collection of all of the constructs that + * depend on the user's @ref UDM data type either directly or indirectly. + * + * @tparam T @ref UDM data type + * @tparam TSeq typedef of sequence of the @ref UDM data type + */ + module Typed_PSAT<typename T, sequence<T> TSeq> + { + /** + * Alias of the templated module corresponding to the typed DDS4CCM + * entities. + * + * @cond DOXYGEN_UNDERSTANDS_IDL3_PLUS + */ + alias CCM_DDS::Typed<T, TSeq> DDS_Typed; + /** + * @endcond + */ + + // ------------------------------------- + // Interfaces to be 'used' or 'provided' + // ------------------------------------- + + /** + * @interface PSAT_BufferControl + * + * Provides buffer lifecycle management. + */ + local interface PSAT_BufferControl + { + /** + * Tells the @ref PSAT connector that the application component is + * finished writing to or reading from an @ref AD buffer. Any use of + * that buffer after this call is considered to be data corruption. + * + * This method only needs to be called when using the @ref AD buffer + * functionality. If @a datum was previously created with + * Typed_PSAT::PSAT_Writer::create_data_no_attach, then this method + * acts as a no-op. + * + * @param[in] datum @ref UDM corresponding to the @ref AD buffer + * + * @throws InvalidAD_BufferState if the buffer has already been + * released. + * @throws InvalidUDM if the PSAT_Header portion of the @ref UDM cannot + * be validated + * + * @note + * For every @b DDS_Typed::Listener::on_one_data callback invocation, + * the application component should have a corresponding + * Typed_PSAT::PSAT_BufferControl::release_buffer call. + * + * @warning + * This method should @b NOT be called in the + * Typed_PSAT::PSAT_Interceptor::on_metadata_intercept callback. + */ + void release_buffer(in T datum) + raises(InvalidAD_BufferState, InvalidUDM); + + /** + * Requests that the @ref PSAT connector give up use of its buffers + * entirely as soon as possible. + * + * When this method is called on the publisher-side, all of its buffers + * currently in use will be invalidated. + * + * Certain transports (e.g., zero-copy shared memory) share buffers + * between the publisher and the subscriber. In those cases, the + * subscribers will be notified of the buffer invalidation by having + * their + * Typed_PSAT::PSAT_ReaderStatusListener::on_data_corruption callbacks + * called for each buffer they are using from the flushed publisher. + * Any further use of these @ref AD buffers after this point is + * considered to be data corruption. + * + * When this method is called on the subscriber-side, all of its + * buffers in use will be released and any further use after that point + * is considered to be data corruption. + * + * @throws UnsucessfulFlush if a fatal error happened during flush. + */ + void flush() raises(UnsucessfulFlush); + }; + + /** + * @addtogroup PSAT_Publisher + * @{ + */ + + /** + * @interface PSAT_Writer + * + * Publisher side @ref UDM/@ref AD message setup and management. + * + * @note + * The following code is an example of how one might use this interface: + * @code + * void MyClass::someMethod() + * { + * // call create data and get new UDM + * // + * MyUDM_Module::MyUDM_udm::PSAT_Writer_var writerObj; + * + * // ... get PSAT_Writer object reference from context ... + * + * // All UDMs are fixed-length so they must be allocated by the caller + * // + * MyUDM_Module::MyUDM udm; + * + * try + * { + * writerObj->create_data(udm); + * + * // get AD buffer pointer. Note: bufferPtr is defined as "void *" + * // for the purposes of this example. In reality, it could be + * // any type of pointer. Additionally this pointer could be placed + * // into a member variable, used in a method call, etc. instead of + * // being used directly in this try block. + * // + * void * bufferPtr = reinterpret_cast<void *>( + * udm.psatHeader.sample_start_address); + * + * // put data into buffer using pointer + * // change any UDM parameters you would like + * + * // write data to PSAT + * // + * writerObj->write_one(udm); + * + * // finished with buffer so release it + * // + * writerObj->release_buffer(udm); + * } + * catch(CCM_DDS::InternalError & excep) // DDS error + * { + * // do logging, recovery, etc. + * } + * catch(CCM_DDS_PSAT::NoAvailableAD_Buffer & excep) // no buffers + * { + * // do logging, recovery, etc. + * } + * catch(CCM_DDS_PSAT::InvalidAD_BufferState & excep) + * { // could not release + * // do logging, recovery, etc. + * } + * catch(CCM_DDS_PSAT::InvalidUDM & excep) // UDM is invalid + * { + * // do logging, recovery, etc. + * } + * } + * @endcode + * + * @par Important: + * The code example above assumes the developer wishes to perform + * different logging and recovery actions for each possible error. This + * is not always necessary. All CORBA user exceptions inherit from + * CORBA::UserException in the IDL to C++ mapping. Therefore, the user + * may only catch this one exception type and do common logging, etc. if + * desired. + */ + local interface PSAT_Writer : PSAT_BufferControl + { + /** + * Get a new @ref UDM with a new @ref AD buffer to use (if a buffer is + * available) for a new sample to write. + * + * @param[out] datum @ref UDM corresponding to the new sample + * + * @throws CCM_DDS::InternalError on DDS error + * @throws NoAvailableAD_Buffer if all @ref AD buffers are in use + * + * @par Note 1: + * The @ref UDM type given as an output parameter has the information + * needed to get to the actual @ref AD buffer in memory. The pointer is + * located in the PSAT_Header (the @b psatHeader field of the @ref UDM) + * in the field PSAT_Header.sample_start_address + * + * @par Note 2: + * This method and Typed_PSAT::PSAT_Writer::create_data_override differ + * only in how they handle "out of buffer" conditions. + */ + void create_data(out T datum) + raises(CCM_DDS::InternalError, NoAvailableAD_Buffer); + + /** + * Get a new @ref UDM with a new @ref AD buffer to use (without regard + * to buffer availability) for a new sample to write. + * + * If no free buffers are available (all are in use), then the oldest + * "in use" buffer will be reclaimed. The @ref PSAT connector will + * notify any existing readers of that buffer that it has been + * "corrupted." The reclaimed @ref AD buffer will be made available to + * the caller to use for a new sample. + * + * In addition to being used directly in the application component's + * main path, this method can also be used in an exception handler that + * was invoked as a result of a Typed_PSAT::PSAT_Writer::create_data + * call failing and throwing a NoAvailableAD_Buffer exception. + * + * @param[out] datum @ref UDM corresponding to the new sample + * + * @throws CCM_DDS::InternalError on DDS error + * + * @par Note 1: + * The @ref UDM type given as an output parameter has the information + * needed to get to the actual @ref AD buffer in memory. The pointer is + * located in the PSAT_Header (the @b psatHeader field of the @ref UDM) + * in the field PSAT_Header.sample_start_address + * + * @par Note 2: + * This method and Typed_PSAT::PSAT_Writer::create_data differ only in + * how they handle "out of buffer" conditions. + */ + void create_data_override(out T datum) + raises(CCM_DDS::InternalError); + + /** + * Get a new @ref UDM that corresponds to an existing @ref AD buffer to + * use for a new sample to write. + * + * @param[in] existing_datum @ref UDM from a previous create_data + * call to be used in providing the existing @ref AD buffer to use + * when creating the new @ref UDM in this method. + * + * @param[out] datum @ref UDM corresponding to the new sample created + * using the existing @ref AD buffer referenced in @ref existing_datum. + * + * @throws CCM_DDS::InternalError on DDS error + * @throws InvalidAD_BufferState if no such buffer exists + */ + void create_data_w_existing(in T existing_datum, out T datum) + raises(CCM_DDS::InternalError, InvalidAD_BufferState); + + /** + * This method is used to request notification (via the + * PSAT_WriterStatusListener::on_buffer_available callback) when an + * @ref AD buffer becomes available. + * + * If a timeout occurs while waiting for a free buffer, then the + * PSAT_WriterStatusListener::on_buffer_wait_timeout callback will be + * called. If the timeout argument is 0, then the timeout is infinite. + * + * This method is intended to be used after first attempting to get an + * entirely new @ref AD buffer using the + * Typed_PSAT::PSAT_Writer::create_data call and failing with a + * NoAvailableAD_Buffer exception. + * + * @param[in] timeoutUsec timeout (in microseconds) to wait for + * a new buffer. Infinite = 0 value. + * + * @todo Add code example here showing the create data call failing + * the check of that, and then calling this function + */ + void notify_on_buffer_available(in long long timeoutUsec); + + /** + * Publishes the @ref UDM portion of the @ref PSAT sample. + * + * @note + * If the @ref UDM corresponds with an @ref AD buffer, an attachment + * transfer may then be setup on the subscriber side. If the attachment + * transport supports @b zero-copy, then the "transfer" will only + * consist of validating portions of the PSAT_Header in the @ref UDM. + * + * @param[in] datum @ref UDM to publish + * + * @throws CCM_DDS::InternalError on DDS error + * @throws InvalidUDM if the PSAT_Header portion of the @ref UDM + * cannot be validated + */ + void write_one(in T datum) + raises(CCM_DDS::InternalError, InvalidUDM); + }; + + /** + * @interface PSAT_WriterStatusListener + * + * Set of callbacks on the user application's writer (publisher) component + * which the connector will call in the event of an asynchronous error or + * major status change (e.g., buffer now available). + */ + local interface PSAT_WriterStatusListener + { + /** + * Called when a buffer becomes available if the user previously + * requested notification via the + * PSAT_Writer::notify_on_buffer_available() call. + * + * @note + * This callback will only be called a maximum of one time after + * a PSAT_Writer::notify_on_buffer_available() call. Another notify + * call must be made to be notified again. + */ + void on_buffer_available(); + + /** + * Called when the available buffer wait timeout has expired and no + * buffer is available. This will only happen if the user previously + * requested notification of an available buffer via the + * PSAT_Writer::notify_on_buffer_available() call. + * + * @note + * This callback will only be called a maximum of one time after + * a PSAT_Writer::notify_on_buffer_available() call. Another notify + * call must be made to be notified again. + */ + void on_buffer_wait_timeout(); + + /// @todo DETAILED DESIGN - figure out if any other error/status + /// callbacks need to be here + }; + + /** + * @} + */ + + /** + * @addtogroup PSAT_Subscriber + * @{ + */ + + /** + * @interface PSAT_Interceptor + * + * User subscriber application callback to intercept and allow + * modification of the published @ref UDM prior to its associated @ref AD + * buffer being pulled from the publisher. + */ + local interface PSAT_Interceptor + { + /** + * Callback called by the @ref PSAT connector upon reception of a + * @ref UDM (prior to the attachment transfer of the @ref AD portion). + * This callback (which is part of the subscriber application + * component) can change the @ref UDM to affect how and whether the + * attachment transfer occurs. + * + * For example, the subscriber application component may change the + * offset into local memory where the data is placed or may even elect + * not to perform the attachment transfer at all. + * + * @note + * If the changes made here would force a copy and no copies are + * supported by the underlying attachment transport (i.e. the zero-copy + * shared memory transport), the + * PSAT_ReaderStatusListener::on_copy_unsupported callback will be + * invoked and the transfer will be cancelled. + * + * @note + * If the @ref UDM received does not correspond to an attachment + * transfer, this callback will @b NOT be invoked. + * + * @warning + * This callback executes in the context of the @ref DDS transport + * receive thread. This is different than any threads which are part + * of the @ref CCM container. Additional caveats are in order: + * - Proper multi-threading programming techniques should be used + * here (for example, using locks for shared state) + * - Lengthy computations should be avoided since they will hold off + * any other messages on that transport and may cause the other + * messages to backup or be dropped. + * + * @param[in,out] datum received @ref UDM + */ + void on_metadata_intercept(inout T datum); + }; + + /** + * @interface PSAT_ReaderStatusListener + * + * Set of callbacks on the user's reader component which the @ref PSAT + * connector will call in the event of an asynchronous error or major + * status change (e.g., data corruption). + */ + local interface PSAT_ReaderStatusListener : CCM_DDS::PortStatusListener + { + /** + * Callback invoked by the @ref PSAT connector when an operation + * requiring a copy is attempted, but the attachment transport (i.e. + * zero-copy shared memory) does not support copies. + * + * @param[in] datum @ref UDM which caused the error + * @param[in] info additional info which may be helpful for debug + */ + void on_copy_unsupported(in T datum, in AsynchErrorInfo info); + + /** + * Callback invoked by the @ref PSAT connector when an @ref AD buffer + * has possibly been corrupted. The user component should stop using + * this buffer as soon as possible. + * + * This callback could be invoked if a publisher calls + * PSAT_Writer::create_data_override in order to force a new buffer to + * be available. + * If so, that buffer, which is shared with local subscribers, can be + * overwritten at any time and so must be considered corrupted by any + * local subscribers. + * + * @param[in] datum @ref UDM which corresponds to the corrupted + * @ref AD buffer + * + * @param[in] info additional info which may be helpful for debug + */ + void on_data_corruption(in T datum, in AsynchErrorInfo info); + + /** + * Callback invoked by the @ref PSAT connector when an attachment + * transfer could not be completed. This could be caused by, for + * example, a publisher component crashing in the middle of the + * transfer. + * + * @param[in] datum @ref UDM which corresponds to the incompletely + * transferred buffer + * @param[in] info additional info which may be helpful for debug + */ + void on_incomplete_transfer(in T datum, in AsynchErrorInfo info); + + /** + * Callback invoked by the @ref PSAT connector when a @ref UDM cannot + * be validated (i.e., it contains negative offsets or inconsistent + * fields). + * + * @param[in] datum @ref UDM which caused the error + * @param[in] info additional info which may be helpful for debug + */ + void on_invalid_UDM(in T datum, in AsynchErrorInfo info); + + /// @todo DETAILED DESIGN - figure out if any other error/status + /// callbacks need to be here + }; + + /** + * @} + */ + + // -------------- + // DDS PSAT Ports + // -------------- + + /** + * @cond DOXYGEN_UNDERSTANDS_IDL3_PLUS + */ + porttype DDS_PSAT_Write + { + uses PSAT_Writer data; + uses DDS::DataWriter dds_entity; + provides PSAT_WriterStatusListener status; + }; + + porttype DDS_PSAT_Listen + { + uses DDS_Typed::Reader data; + provides DDS_Typed::Listener data_listener; + uses CCM_DDS::DataListenerControl data_control; + provides PSAT_ReaderStatusListener status; + uses DDS::DataReader dds_entity; + provides PSAT_Interceptor interceptor; + uses PSAT_BufferControl buffer_control; + }; + + // ------------------ + // DDS PSAT Connector + // ------------------ + + connector DDS_PSAT_Event : CCM_DDS::DDS_TopicBase + { + mirrorport DDS_PSAT_Write supplier; + mirrorport DDS_PSAT_Listen consumer; + + attribute SharedMemoryConfig shared_memory_config + setraises(NonChangeable); + + attribute BufferPoolConfig attach_buffer_config + setraises(NonChangeable); + + attribute TransportConfig transports_config + setraises(NonChangeable); + }; + /** + * @endcond + */ + }; +}; + +#endif // CCM_DDS_PSAT_IDL + +/// @} +//============================================================================== +// U N C L A S S I F I E D +//============================================================================== diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/modules/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc new file mode 100644 index 00000000000..055dcef26ee --- /dev/null +++ b/modules/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc @@ -0,0 +1,112 @@ +// $Id$ + +project (DDS_CCM_Example_PSAT_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default, dds4ccm_impl, ccm_stub { + requires += dummy_label + sharedname = DDS_CCM_Example_PSAT_stub + dynamicflags += CCM_DDS_PSAT_STUB_BUILD_DLL + libout = lib + + idlflags += -Wb,stub_export_macro=CCM_DDS_PSAT_STUB_Export \ + -Wb,stub_export_include=ccm_dds_psat_stub_export.h + + IDL_Files { + idlflags += -Gxhst + ccm_dds_psat.idl + } + + opendds_ts_flags += --export=CCM_DDS_PSAT_STUB_Export + ndds_ts_flags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl + DDSGenerator_Files { + ccm_dds_psat.idl + } + includes += -I $(CIAO_ROOT)/connectors/dds4ccm/idl + + Source_Files { + } +} + +project(DDS_PSAT_Connector_idl_gen) : connectoridldefaults, dds4ccm { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=ccm_dds_psat_stub_export.h \ + -Wb,skel_export_macro=CSL_DEADLINETEST_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=ccm_dds_psat_svnt_export.h \ + -Wb,svnt_export_macro=CSL_DEADLINETEST_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_include=ccm_dds_psat_svnt_export.h \ + -Wb,conn_export_macro=CSL_DEADLINETEST_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=ccm_dds_psat_conn_export.h \ + -I .. + + IDL_Files { + ccm_dds_psat.idl + } +} + +project(DDS_PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { + custom_only = 1 + after += DDS_PSAT_Connector_idl_gen + idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=ccm_dds_psat_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + ccm_dds_psatE.idl + } +} + +project(DDS_PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_base { + requires += dummy_label + after += DDS_PSAT_Connector_lem_gen DDS_CCM_PSAT_Test_stub DDS4CCM_lem_stub + libs += DDS_CCM_PSAT_Test_stub DDS4CCM_lem_stub + libpaths += lib + libout = lib + includes += .. + sharedname = DDS_PSAT_Connector_lem_stub + dynamicflags = CSL_DEADLINETEST_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + ccm_dds_psatEC.cpp + } + + Header_Files { + ccm_dds_psatEC.h + ccm_dds_psat_lem_stub_export.h + } + + Inline_Files { + ccm_dds_psatEC.inl + } +} + +project(DDS_CCM_PSAT_Test_stub) : ccm_stub, dds4ccm_base { + requires += dummy_label + after += DDS_PSAT_Connector_idl_gen + libs += + libpaths += lib + libout = lib + includes += -I $(CIAO_ROOT)/connectors/dds4ccm/idl + sharedname = DDS_CCM_PSAT_Test_stub + dynamicflags = CSL_DEADLINETEST_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + ccm_dds_psatC.cpp + } + + Header_Files { + ccm_dds_psatC.h + ccm_dds_psat_stub_export.h + } + + Inline_Files { + ccm_dds_psatC.inl + } +} + diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl index 6a9625ca2e3..dc265e11e46 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/PSL_DeadlineTest_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopic; -}; - module PSL_DeadlineTest { - connector PSL_DeadlineTest_Connector : ::CCM_DDS::TestTopic::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSLDeadlineConnector; }; #endif /* PSL_DeadlineTest_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl index c849128c8e5..627637b0fe3 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl @@ -14,8 +14,8 @@ module PSL_DeadlineTest { component Receiver { - port CCM_DDS::TestTopic::DDS_Get info_get; - port CCM_DDS::TestTopic::DDS_Listen info_out; + port PSLDeadlineConnector::DDS_Get info_get; + port PSLDeadlineConnector::DDS_Listen info_out; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp index 4bd6294d5c8..bb244637726 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp @@ -171,7 +171,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl } // Port operations. - ::CCM_DDS::TestTopic::CCM_Listener_ptr + ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { return new TestTopic_RawListener_exec_i (); diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h index bbb5bff1010..d0926844fb2 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h @@ -28,7 +28,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl // TestTopic_RawListener_exec_i //============================================================ class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i - : public virtual ::CCM_DDS::TestTopic::CCM_Listener, + : public virtual ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -110,7 +110,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::TestTopic::CCM_Listener_ptr + virtual ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -132,7 +132,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl private: ::PSL_DeadlineTest::CCM_Receiver_Context_var context_; - ::CCM_DDS::TestTopic::Reader_var reader_; + ::PSL_DeadlineTest::PSLDeadlineConnector::Reader_var reader_; read_action_Generator * ticker_; CORBA::ULong rate_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl index 5479b290315..c380fccd101 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl @@ -16,7 +16,7 @@ module PSL_DeadlineTest { component Sender { - port CCM_DDS::TestTopic::DDS_Write test_topic_write; + port PSLDeadlineConnector::DDS_Write test_topic_write; provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h index 2738bafb8a6..8d44cf1fbb3 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h @@ -97,7 +97,7 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl pulse_Generator * ticker_; ::PSL_DeadlineTest::CCM_Sender_Context_var context_; - CCM_DDS::TestTopic::Writer_var writer_; + ::PSL_DeadlineTest::PSLDeadlineConnector::Writer_var writer_; TAO_SYNCH_MUTEX mutex_; typedef std::map<ACE_CString, TestTopic_var> PSL_DLTest_Table; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp index 7fef0ad29f2..0f9b88a5d36 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PSL_DeadlineTest_PSL_DeadlineTest_Connector_Impl</string> + <string>create_PSL_DeadlineTest_PSLDeadlineConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PSL_DeadlineTest_PSL_DeadlineTest_Connector_Servant</string> + <string>create_PSL_DeadlineTest_PSLDeadlineConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl index fcf6d5db3d6..f26d672fc2f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/PSL_SampleLost_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopic; -}; - module PSL_SampleLost { - connector PSL_SampleLost_Connector : ::CCM_DDS::TestTopic::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSL_SampleLostConnector; }; #endif /* PSL_SampleLost_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl index 4479966031b..3881ffd351b 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl @@ -14,8 +14,8 @@ module PSL_SampleLost { component Receiver { - port CCM_DDS::TestTopic::DDS_Get info_get; - port CCM_DDS::TestTopic::DDS_Listen info_out; + port PSL_SampleLostConnector::DDS_Get info_get; + port PSL_SampleLostConnector::DDS_Listen info_out; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp index 1cfbe497381..a06cf93d201 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp @@ -182,7 +182,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl // Component attributes. // Port operations. - ::CCM_DDS::TestTopic::CCM_Listener_ptr + ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h index 3f10fc8d576..e7414bb88cd 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h @@ -28,7 +28,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl // TestTopic_RawListener_exec_i //============================================================ class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i - : public virtual ::CCM_DDS::TestTopic::CCM_Listener, + : public virtual ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -114,7 +114,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::TestTopic::CCM_Listener_ptr + virtual ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -139,7 +139,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl private: ::PSL_SampleLost::CCM_Receiver_Context_var context_; - ::CCM_DDS::TestTopic::Reader_var reader_; + ::PSL_SampleLost::PSL_SampleLostConnector::Reader_var reader_; read_action_Generator * ticker_; CORBA::ULong rate_; Atomic_Boolean sample_port_1_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl index 236e3ec4c26..c6342f09c1f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl @@ -16,7 +16,7 @@ module PSL_SampleLost { component Sender { - port CCM_DDS::TestTopic::DDS_Write test_topic_write; + port PSL_SampleLostConnector::DDS_Write test_topic_write; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h index 0dfa22906e2..e496be95513 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h @@ -67,7 +67,7 @@ namespace CIAO_PSL_SampleLost_Sender_Impl pulse_Generator * ticker_; ::PSL_SampleLost::CCM_Sender_Context_var context_; - CCM_DDS::TestTopic::Writer_var writer_; + ::PSL_SampleLost::PSL_SampleLostConnector::Writer_var writer_; TAO_SYNCH_MUTEX mutex_; typedef std::map<ACE_CString, TestTopic_var> PSL_DLTest_Table; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp index 93739e73192..bbed95c0fad 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PSL_SampleLost_PSL_SampleLost_Connector_Impl</string> + <string>create_PSL_SampleLost_PSL_SampleLostConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PSL_SampleLost_PSL_SampleLost_Connector_Servant</string> + <string>create_PSL_SampleLost_PSL_SampleLostConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl index f74ce0c0306..8e3aebc79bd 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl @@ -14,9 +14,9 @@ module PortUsageEvent_Test { component PortUsageEventComponent { - port PortUsageTestConn::DDS_Write write_port; - port PortUsageTestConn::DDS_Get get_port; - port PortUsageTestConn::DDS_Listen listen_port; + port PortUsageTestConnector::DDS_Write write_port; + port PortUsageTestConnector::DDS_Get get_port; + port PortUsageTestConnector::DDS_Listen listen_port; provides CCM_DDS::ConnectorStatusListener connector_status; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp index 4f2a1ff666e..bc15b6a7263 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp @@ -210,10 +210,10 @@ namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl return CCM_DDS::CCM_PortStatusListener::_nil (); } - PortUsageEvent_Test::PortUsageTestConn::CCM_Listener_ptr + PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener_ptr Component_exec_i::get_listen_port_data_listener() { - return PortUsageEvent_Test::PortUsageTestConn::CCM_Listener::_nil (); + return PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener::_nil (); } CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h index d3cf4ff9b4f..c49b4364a6a 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h @@ -75,7 +75,7 @@ namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl virtual CCM_DDS::CCM_PortStatusListener_ptr get_get_port_status (void); - virtual PortUsageEvent_Test::PortUsageTestConn::CCM_Listener_ptr + virtual PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener_ptr get_listen_port_data_listener (void); virtual CCM_DDS::CCM_PortStatusListener_ptr @@ -97,9 +97,9 @@ namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl private: ::PortUsageEvent_Test::CCM_PortUsageEventComponent_Context_var context_; - ::PortUsageEvent_Test::PortUsageTestConn::Reader_var reader_; //Listener - ::PortUsageEvent_Test::PortUsageTestConn::Writer_var writer_; //Writer - ::PortUsageEvent_Test::PortUsageTestConn::Getter_var getter_; //Getter + ::PortUsageEvent_Test::PortUsageTestConnector::Reader_var reader_; //Listener + ::PortUsageEvent_Test::PortUsageTestConnector::Writer_var writer_; //Writer + ::PortUsageEvent_Test::PortUsageTestConnector::Getter_var getter_; //Getter PortUsageAssignment assignment_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl index a1067b2be0f..34da13b1cce 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl @@ -16,10 +16,7 @@ module PortUsageEvent_Test { - module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConn; - connector PortUsageEvent_Connector : PortUsageTestConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector; }; #endif /* PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl index 9c04651fe63..71faa207d3f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl @@ -14,11 +14,11 @@ module PortUsageState_Test { component PortUsageStateComponent { - port PortUsageTestConn::DDS_Update update_port; - port PortUsageTestConn::DDS_Read read_port; - port PortUsageTestConn::DDS_Get get_port; - port PortUsageTestConn::DDS_Listen listen_port; - port PortUsageTestConn::DDS_StateListen state_listen_port; + port PortUsageTestConnector::DDS_Update update_port; + port PortUsageTestConnector::DDS_Read read_port; + port PortUsageTestConnector::DDS_Get get_port; + port PortUsageTestConnector::DDS_Listen listen_port; + port PortUsageTestConnector::DDS_StateListen state_listen_port; provides CCM_DDS::ConnectorStatusListener connector_status; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp index 1e546119b36..c1737632b09 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp @@ -254,10 +254,10 @@ namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl return CCM_DDS::CCM_PortStatusListener::_nil (); } - PortUsageState_Test::PortUsageTestConn::CCM_StateListener_ptr + PortUsageState_Test::PortUsageTestConnector::CCM_StateListener_ptr Component_exec_i::get_state_listen_port_data_listener() { - return PortUsageState_Test::PortUsageTestConn::CCM_StateListener::_nil (); + return PortUsageState_Test::PortUsageTestConnector::CCM_StateListener::_nil (); } CCM_DDS::CCM_PortStatusListener_ptr @@ -280,10 +280,10 @@ namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl return CCM_DDS::CCM_PortStatusListener::_nil (); } - PortUsageState_Test::PortUsageTestConn::CCM_Listener_ptr + PortUsageState_Test::PortUsageTestConnector::CCM_Listener_ptr Component_exec_i::get_listen_port_data_listener (void) { - return PortUsageState_Test::PortUsageTestConn::CCM_Listener::_nil (); + return PortUsageState_Test::PortUsageTestConnector::CCM_Listener::_nil (); } CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h index fbc345bab50..73bbc00b023 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h @@ -75,7 +75,7 @@ namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl virtual CCM_DDS::CCM_PortStatusListener_ptr get_read_port_status (void); - virtual PortUsageState_Test::PortUsageTestConn::CCM_StateListener_ptr + virtual PortUsageState_Test::PortUsageTestConnector::CCM_StateListener_ptr get_state_listen_port_data_listener (void); virtual CCM_DDS::CCM_PortStatusListener_ptr @@ -87,7 +87,7 @@ namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl virtual CCM_DDS::CCM_PortStatusListener_ptr get_get_port_status (void); - virtual PortUsageState_Test::PortUsageTestConn::CCM_Listener_ptr + virtual PortUsageState_Test::PortUsageTestConnector::CCM_Listener_ptr get_listen_port_data_listener (void); virtual CCM_DDS::CCM_PortStatusListener_ptr @@ -106,9 +106,9 @@ namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl private: ::PortUsageState_Test::CCM_PortUsageStateComponent_Context_var context_; - ::PortUsageState_Test::PortUsageTestConn::Reader_var reader_; //Listener - ::PortUsageState_Test::PortUsageTestConn::Writer_var writer_; //Writer - ::PortUsageState_Test::PortUsageTestConn::Getter_var getter_; //Getter + ::PortUsageState_Test::PortUsageTestConnector::Reader_var reader_; //Listener + ::PortUsageState_Test::PortUsageTestConnector::Writer_var writer_; //Writer + ::PortUsageState_Test::PortUsageTestConnector::Getter_var getter_; //Getter PortUsageAssignment assignment_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl index c136ac6978d..19da7b7b040 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl @@ -16,10 +16,7 @@ module PortUsageState_Test { - module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConn; - connector PortUsageState_Connector : PortUsageTestConn::DDS_State - { - }; + module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector; }; #endif /* PORTUSAGE_STATE_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp index d91244f0f19..0a65e0f964c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageEvent_Test_PortUsageEvent_Connector_Impl</string> + <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageEvent_Test_PortUsageEvent_Connector_Servant</string> + <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp index 50f58675996..d849061506b 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageEvent_Test_PortUsageEvent_Connector_Impl</string> + <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageEvent_Test_PortUsageEvent_Connector_Servant</string> + <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp index ac29fa7f6a7..47b860616a5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageEvent_Test_PortUsageEvent_Connector_Impl</string> + <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageEvent_Test_PortUsageEvent_Connector_Servant</string> + <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp index 0c254b0cde9..1f98a44b971 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Impl</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Servant</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp index 7bd888143f3..d881cde013e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Impl</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Servant</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp index 518631c10c9..73b9d2e08a5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Impl</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Servant</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp index b8030168f8d..3363100c306 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Impl</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Servant</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp index 6479d943a3b..c2bce57a040 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Impl</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_PortUsageState_Test_PortUsageState_Connector_Servant</string> + <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl index c8ae99e1670..31f8b52df60 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl @@ -13,7 +13,7 @@ module QosProfile_Test { component QosProfileComponent { - port QosProfileTestConn::DDS_Write info_write; + port QosProfileTestConnector::DDS_Write info_write; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h index 5db3b8868b3..08c4792cfdc 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h @@ -42,7 +42,7 @@ namespace CIAO_QosProfile_Test_QosProfileComponent_Impl private: ::QosProfile_Test::CCM_QosProfileComponent_Context_var context_; - ::QosProfile_Test::QosProfileTestConn::Writer_var writer_; + ::QosProfile_Test::QosProfileTestConnector::Writer_var writer_; }; extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl index 3d5412a78b8..7514b8cd719 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl @@ -16,10 +16,7 @@ module QosProfile_Test { - module ::CCM_DDS::Typed < ::QosProfileTest, ::QosProfileTestSeq> QosProfileTestConn; - connector QosProfile_Test_Connector : QosProfileTestConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::QosProfileTest, ::QosProfileTestSeq> QosProfileTestConnector; }; #endif /* QOS_PROFILE_TEST_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp index a03aa8911bd..df28f0077f5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_QosProfile_Test_QosProfile_Test_Connector_Impl</string> + <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_QosProfile_Test_QosProfile_Test_Connector_Servant</string> + <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl index 593fc21e8aa..022aec13f98 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl @@ -16,10 +16,7 @@ module QueryFilter_Test { - module ::CCM_DDS::Typed < ::QueryFilterTest, ::QueryFilterTestSeq> QueryFilterTestConn; - connector QueryFilter_Test_Connector : QueryFilterTestConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::QueryFilterTest, ::QueryFilterTestSeq> QueryFilterTestConnector; }; #endif /* QUERY_FILTER_TEST_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl index 4f5b973bc6d..f831608e3b1 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl @@ -15,7 +15,7 @@ module QueryFilter_Test { component Receiver { - port QueryFilterTestConn::DDS_Get get_port; + port QueryFilterTestConnector::DDS_Get get_port; provides QueryFilterStarter reader_start; uses QueryFilterRestarter writer_restart; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h index 6509d0b38f7..0f3cd57292f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h @@ -105,8 +105,8 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl private: ::QueryFilter_Test::CCM_Receiver_Context_var context_; - ::QueryFilter_Test::QueryFilterTestConn::Reader_var reader_; - ::QueryFilter_Test::QueryFilterTestConn::Getter_var getter_; + ::QueryFilter_Test::QueryFilterTestConnector::Reader_var reader_; + ::QueryFilter_Test::QueryFilterTestConnector::Getter_var getter_; QueryFilterRestarter_var restarter_; CORBA::UShort iterations_; CORBA::UShort keys_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl index d30deb7c6b2..6ecc71a9034 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl @@ -17,7 +17,7 @@ module QueryFilter_Test { component Sender { - port QueryFilter_Test::QueryFilterTestConn::DDS_Write info_write; + port QueryFilter_Test::QueryFilterTestConnector::DDS_Write info_write; uses QueryFilterStarter start_reader; provides QueryFilterRestarter restart_writer; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h index aaaf8b500f7..769bed5bea5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h @@ -80,7 +80,7 @@ namespace CIAO_QueryFilter_Test_Sender_Impl private: ::QueryFilter_Test::CCM_Sender_Context_var context_; - ::QueryFilter_Test::QueryFilterTestConn::Writer_var writer_; + ::QueryFilter_Test::QueryFilterTestConnector::Writer_var writer_; QueryFilterStarter_var starter_; CORBA::UShort iterations_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp index 05b925e0fcf..0edc8b02b5f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_QueryFilter_Test_QueryFilter_Test_Connector_Impl</string> + <string>create_QueryFilter_Test_QueryFilterTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_QueryFilter_Test_QueryFilter_Test_Connector_Servant</string> + <string>create_QueryFilter_Test_QueryFilterTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Connector/QFLE_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Connector/QFLE_Test_Connector.idl index 59c46ddf3f7..e93d449cbae 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Connector/QFLE_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Connector/QFLE_Test_Connector.idl @@ -16,10 +16,7 @@ module QFLE_Test { - module ::CCM_DDS::Typed < ::QueryFilterListenEventTest, ::QueryFilterListenEventTestSeq> QueryFilterListenEventTestConn; - connector QFLE_Test_Connector : QueryFilterListenEventTestConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::QueryFilterListenEventTest, ::QueryFilterListenEventTestSeq> QueryFilterListenEventTestConnector; }; #endif /* QFLE_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver.idl index 08f63d47833..6ada318c7f0 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver.idl @@ -14,7 +14,7 @@ module QFLE_Test { component Receiver { - port QueryFilterListenEventTestConn::DDS_Listen info_listen; + port QueryFilterListenEventTestConnector::DDS_Listen info_listen; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.cpp index b5a8deebc94..cbd15afd495 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.cpp @@ -91,7 +91,7 @@ namespace CIAO_QFLE_Test_Receiver_Impl dlc->mode (::CCM_DDS::ONE_BY_ONE); } - ::QFLE_Test::QueryFilterListenEventTestConn::CCM_Listener_ptr + ::QFLE_Test::QueryFilterListenEventTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_listen_data_listener (void) { return new QueryFilterListenEventTest_Listener ( diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.h index c4a5a859a16..b524e7af93b 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.h @@ -29,7 +29,7 @@ namespace CIAO_QFLE_Test_Receiver_Impl // QueryFilterListenEventTest_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export QueryFilterListenEventTest_Listener - : public virtual ::QFLE_Test::QueryFilterListenEventTestConn::CCM_Listener, + : public virtual ::QFLE_Test::QueryFilterListenEventTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -70,7 +70,7 @@ namespace CIAO_QFLE_Test_Receiver_Impl virtual void keys (::CORBA::UShort keys); - virtual ::QFLE_Test::QueryFilterListenEventTestConn::CCM_Listener_ptr + virtual ::QFLE_Test::QueryFilterListenEventTestConnector::CCM_Listener_ptr get_info_listen_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -88,7 +88,7 @@ namespace CIAO_QFLE_Test_Receiver_Impl private: ::QFLE_Test::CCM_Receiver_Context_var context_; - ::QFLE_Test::QueryFilterListenEventTestConn::Reader_var reader_; + ::QFLE_Test::QueryFilterListenEventTestConnector::Reader_var reader_; Atomic_ThreadId thread_id_listener_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender.idl index de94251344b..a7004b3ba85 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender.idl @@ -16,7 +16,7 @@ module QFLE_Test { component Sender { - port QueryFilterListenEventTestConn::DDS_Write info_write; + port QueryFilterListenEventTestConnector::DDS_Write info_write; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender_exec.h index ff4e52ee95a..e5d0a4b7686 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender_exec.h @@ -64,7 +64,7 @@ namespace CIAO_QFLE_Test_Sender_Impl private: ::QFLE_Test::CCM_Sender_Context_var context_; - ::QFLE_Test::QueryFilterListenEventTestConn::Writer_var writer_; + ::QFLE_Test::QueryFilterListenEventTestConnector::Writer_var writer_; WriteTicker *ticker_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/Plan.cdp index f05284bed01..8ced5b217d5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_QFLE_Test_QFLE_Test_Connector_Impl</string> + <string>create_QFLE_Test_QueryFilterListenEventTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_QFLE_Test_QFLE_Test_Connector_Servant</string> + <string>create_QFLE_Test_QueryFilterListenEventTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Connector/QFLS_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Connector/QFLS_Test_Connector.idl index 37d5f4d05ba..458f4791050 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Connector/QFLS_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Connector/QFLS_Test_Connector.idl @@ -16,10 +16,7 @@ module QFLS_Test { - module ::CCM_DDS::Typed < ::QueryFilterListenStateTest, ::QueryFilterListenStateTestSeq> QueryFilterListenStateTestConn; - connector QFLS_Test_Connector : QueryFilterListenStateTestConn::DDS_State - { - }; + module ::CCM_DDS::Typed < ::QueryFilterListenStateTest, ::QueryFilterListenStateTestSeq> QueryFilterListenStateTestConnector; }; #endif /* QFLS_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver.idl index a9b415db954..a237debe63d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver.idl @@ -14,7 +14,7 @@ module QFLS_Test { component Receiver { - port QueryFilterListenStateTestConn::DDS_StateListen info_state; + port QueryFilterListenStateTestConnector::DDS_StateListen info_state; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.cpp index 0233d59137e..e437adb3e3b 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.cpp @@ -98,7 +98,7 @@ namespace CIAO_QFLS_Test_Receiver_Impl dlc->mode (::CCM_DDS::ONE_BY_ONE); } - ::QFLS_Test::QueryFilterListenStateTestConn::CCM_StateListener_ptr + ::QFLS_Test::QueryFilterListenStateTestConnector::CCM_StateListener_ptr Receiver_exec_i::get_info_state_data_listener (void) { return new QueryFilterListenStateTest_Listener ( diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.h index 36d348e0b6b..fa8237a7c19 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.h @@ -29,7 +29,7 @@ namespace CIAO_QFLS_Test_Receiver_Impl // QueryFilterListenStateTest_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export QueryFilterListenStateTest_Listener - : public virtual ::QFLS_Test::QueryFilterListenStateTestConn::CCM_StateListener, + : public virtual ::QFLS_Test::QueryFilterListenStateTestConnector::CCM_StateListener, public virtual ::CORBA::LocalObject { public: @@ -78,7 +78,7 @@ namespace CIAO_QFLS_Test_Receiver_Impl virtual void keys (::CORBA::UShort keys); - virtual ::QFLS_Test::QueryFilterListenStateTestConn::CCM_StateListener_ptr + virtual ::QFLS_Test::QueryFilterListenStateTestConnector::CCM_StateListener_ptr get_info_state_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -96,7 +96,7 @@ namespace CIAO_QFLS_Test_Receiver_Impl private: ::QFLS_Test::CCM_Receiver_Context_var context_; - ::QFLS_Test::QueryFilterListenStateTestConn::Reader_var reader_; + ::QFLS_Test::QueryFilterListenStateTestConnector::Reader_var reader_; Atomic_ThreadId thread_id_listener_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender.idl index 67d4cd36c64..f824c285d49 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender.idl @@ -16,7 +16,7 @@ module QFLS_Test { component Sender { - port QueryFilterListenStateTestConn::DDS_Update info_update; + port QueryFilterListenStateTestConnector::DDS_Update info_update; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender_exec.h index dbc2d8c0fbf..10aeb17adf6 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender_exec.h @@ -79,7 +79,7 @@ namespace CIAO_QFLS_Test_Sender_Impl private: ::QFLS_Test::CCM_Sender_Context_var context_; - ::QFLS_Test::QueryFilterListenStateTestConn::Updater_var updater_; + ::QFLS_Test::QueryFilterListenStateTestConnector::Updater_var updater_; UpdateTicker *ticker_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/descriptors/Plan.cdp index fac9b056e54..7af30f18620 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_QFLS_Test_QFLS_Test_Connector_Impl</string> + <string>create_QFLS_Test_QueryFilterListenStateTestConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_QFLS_Test_QFLS_Test_Connector_Servant</string> + <string>create_QFLS_Test_QueryFilterListenStateTestConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl index 53cf908ef44..4f1e8228bc3 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/Reader_Test_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::ReaderTest, ::ReaderTestSeq> ReaderTest; -}; - module Reader_Test { - connector Reader_Test_Connector : ::CCM_DDS::ReaderTest::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::ReaderTest, ::ReaderTestSeq> ReaderTestConnector; }; #endif /* Reader_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl index a1c6ccaa8d9..275b850ea8f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl @@ -15,7 +15,7 @@ module Reader_Test { component Receiver { - port CCM_DDS::ReaderTest::DDS_Listen info_out; + port ReaderTestConnector::DDS_Listen info_out; provides ReaderStarter reader_start; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp index 6bf75130002..2b6e1401bdc 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp @@ -556,10 +556,10 @@ namespace CIAO_Reader_Test_Receiver_Impl } // Port operations. - ::CCM_DDS::ReaderTest::CCM_Listener_ptr + ::Reader_Test::ReaderTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { - return ::CCM_DDS::ReaderTest::CCM_Listener::_nil (); + return ::Reader_Test::ReaderTestConnector::CCM_Listener::_nil (); } ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h index 2d7a6251d7d..d5c65f8aa08 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h @@ -71,7 +71,7 @@ namespace CIAO_Reader_Test_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::ReaderTest::CCM_Listener_ptr + virtual ::Reader_Test::ReaderTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -106,7 +106,7 @@ namespace CIAO_Reader_Test_Receiver_Impl private: ::Reader_Test::CCM_Receiver_Context_var context_; - ::CCM_DDS::ReaderTest::Reader_var reader_; + ::Reader_Test::ReaderTestConnector::Reader_var reader_; CORBA::UShort iterations_; CORBA::UShort keys_; CORBA::Boolean has_run_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl index f8f0afcb3ae..5e1c9f1b6c7 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl @@ -17,7 +17,7 @@ module Reader_Test { component Sender { - port CCM_DDS::ReaderTest::DDS_Write info_write; + port ReaderTestConnector::DDS_Write info_write; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; uses ReaderStarter start_reader; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h index 8b1fc86efbe..f9186ed45db 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h @@ -81,7 +81,7 @@ namespace CIAO_Reader_Test_Sender_Impl private: ::Reader_Test::CCM_Sender_Context_var context_; - CCM_DDS::ReaderTest::Writer_var writer_; + ::Reader_Test::ReaderTestConnector::Writer_var writer_; ReaderStarter_var starter_; CORBA::UShort iterations_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp index 718e64b1b42..ad4df7e5f5b 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Reader_Test_Reader_Test_Connector_Impl</string> + <string>create_Reader_Test_ReaderTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Reader_Test_Reader_Test_Connector_Servant</string> + <string>create_Reader_Test_ReaderTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl index 4fb52425ceb..281bda78bd2 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/SL_Disabled_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopic; -}; - module SL_Disabled { - connector SL_Disabled_Connector : ::CCM_DDS::TestTopic::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_DisabledConnector; }; #endif /* SL_Disabled_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl index 69961d9a952..a3a939ec499 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl @@ -14,7 +14,7 @@ module SL_Disabled { component Receiver { - port CCM_DDS::TestTopic::DDS_StateListen info_out; + port SL_DisabledConnector::DDS_StateListen info_out; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp index 671c45eb08e..c3bfc84c5c7 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp @@ -140,8 +140,8 @@ namespace CIAO_SL_Disabled_Receiver_Impl return ::CCM_DDS::CCM_PortStatusListener::_nil (); } - ::CCM_DDS::TestTopic::CCM_StateListener_ptr - Receiver_exec_i::get_info_out_data_listener (void) + ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr + Receiver_exec_i::get_info_out_data_listener (void) { return new StateListener_exec_i(this->no_operation_); } diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h index 8b5460e8057..12551c4d27a 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h @@ -45,7 +45,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl // StateListener_exec_i //============================================================ class RECEIVER_EXEC_Export StateListener_exec_i - : public virtual ::CCM_DDS::TestTopic::CCM_StateListener, + : public virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener, public virtual ::CORBA::LocalObject { public: @@ -84,7 +84,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::TestTopic::CCM_StateListener_ptr + virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -103,7 +103,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl private: ::SL_Disabled::CCM_Receiver_Context_var context_; - ::CCM_DDS::TestTopic::Reader_var reader_; + ::SL_Disabled::SL_DisabledConnector::Reader_var reader_; read_action_Generator * ticker_; CORBA::ULong rate_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl index c03faed763a..2316133c7ee 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl @@ -16,7 +16,7 @@ module SL_Disabled { component Sender { - port CCM_DDS::TestTopic::DDS_Update test_topic_update; + port SL_DisabledConnector::DDS_Update test_topic_update; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h index b5d37e7a059..37a81d94c70 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h @@ -73,7 +73,7 @@ namespace CIAO_SL_Disabled_Sender_Impl pulse_Generator * ticker_; ::SL_Disabled::CCM_Sender_Context_var context_; - CCM_DDS::TestTopic::Updater_var updater_; + ::SL_Disabled::SL_DisabledConnector::Updater_var updater_; UPDATER_TEST test_nr_; Atomic_Boolean test_ok_; TestTopicSeq topic_seq_one_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp index 9a086079ff7..d63595862dd 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SL_Disabled_SL_Disabled_Connector_Impl</string> + <string>create_SL_Disabled_SL_DisabledConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SL_Disabled_SL_Disabled_Connector_Servant</string> + <string>create_SL_Disabled_SL_DisabledConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl index ea597b5c5c1..3598c79e354 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/SL_ManyByMany_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopic; -}; - module SL_ManyByMany { - connector SL_ManyByMany_Connector : ::CCM_DDS::TestTopic::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SLManyByManyConnector; }; #endif /* SL_ManyByMany_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl index 509db69e052..205b6aca588 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl @@ -14,7 +14,7 @@ module SL_ManyByMany { component Receiver { - port CCM_DDS::TestTopic::DDS_StateListen info_out; + port SLManyByManyConnector::DDS_StateListen info_out; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp index de63a9a54e2..048f104d6ff 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp @@ -235,8 +235,8 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl return new PortStatusListener_exec_i (); } - ::CCM_DDS::TestTopic::CCM_StateListener_ptr - Receiver_exec_i::get_info_out_data_listener (void) + ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_ptr + Receiver_exec_i::get_info_out_data_listener (void) { return new StateListener_exec_i(this->no_operation_, this->on_creation_, diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h index b74cb60eb0f..a462126b10f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl const ::DDS::SampleLostStatus & status); }; class RECEIVER_EXEC_Export StateListener_exec_i - : public virtual ::CCM_DDS::TestTopic::CCM_StateListener, + : public virtual ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener, public virtual ::CORBA::LocalObject { public: @@ -100,7 +100,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::TestTopic::CCM_StateListener_ptr + virtual ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -119,7 +119,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl private: ::SL_ManyByMany::CCM_Receiver_Context_var context_; - ::CCM_DDS::TestTopic::Reader_var reader_; + ::SL_ManyByMany::SLManyByManyConnector::Reader_var reader_; read_action_Generator * ticker_; CORBA::ULong rate_; Atomic_Boolean no_operation_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl index 59d0fec7676..b8bc773804c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl @@ -16,7 +16,7 @@ module SL_ManyByMany { component Sender { - port CCM_DDS::TestTopic::DDS_Update test_topic_update; + port ::SL_ManyByMany::SLManyByManyConnector::DDS_Update test_topic_update; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h index b53cbe1b3bc..c7f0633f460 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h @@ -73,7 +73,7 @@ namespace CIAO_SL_ManyByMany_Sender_Impl pulse_Generator * ticker_; ::SL_ManyByMany::CCM_Sender_Context_var context_; - CCM_DDS::TestTopic::Updater_var updater_; + ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater_; UPDATER_TEST test_nr_; Atomic_Boolean test_ok_; TestTopicSeq topic_seq_one_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp index 76d9ea2f269..c908d61d5c8 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SL_ManyByMany_SL_ManyByMany_Connector_Impl</string> + <string>create_SL_ManyByMany_SLManyByManyConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SL_ManyByMany_SL_ManyByMany_Connector_Servant</string> + <string>create_SL_ManyByMany_SLManyByManyConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl index d522a746ef6..309ee8478f2 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/SL_OneByOne_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopic; -}; - module SL_OneByOne { - connector SL_OneByOne_Connector : ::CCM_DDS::TestTopic::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_OneByOneConnector; }; #endif /* SL_OneByOne_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl index 88f9e6bec6a..dba19273d18 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl @@ -14,7 +14,7 @@ module SL_OneByOne { component Receiver { - port CCM_DDS::TestTopic::DDS_StateListen info_out; + port SL_OneByOneConnector::DDS_StateListen info_out; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp index 25fc7a95945..761cc4c6f60 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp @@ -129,7 +129,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl return ::CCM_DDS::CCM_PortStatusListener::_nil (); } - ::CCM_DDS::TestTopic::CCM_StateListener_ptr + ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_ptr Receiver_exec_i::get_info_out_data_listener (void) { return new StateListener_exec_i (this->on_many_updates_, diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h index 4eb7a3d13d2..36b71ee3f11 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h @@ -28,7 +28,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl // StateListener_exec_i //============================================================ class RECEIVER_EXEC_Export StateListener_exec_i - : public virtual ::CCM_DDS::TestTopic::CCM_StateListener, + : public virtual ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener, public virtual ::CORBA::LocalObject { public: @@ -75,7 +75,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::TestTopic::CCM_StateListener_ptr + virtual ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl index 3408f28190a..7a0be74da94 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl @@ -16,7 +16,7 @@ module SL_OneByOne { component Sender { - port CCM_DDS::TestTopic::DDS_Update test_topic_update; + port SL_OneByOneConnector::DDS_Update test_topic_update; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h index 629317869b6..fedd16f159a 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h @@ -73,7 +73,7 @@ namespace CIAO_SL_OneByOne_Sender_Impl pulse_Generator * ticker_; ::SL_OneByOne::CCM_Sender_Context_var context_; - CCM_DDS::TestTopic::Updater_var updater_; + ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater_; UPDATER_TEST test_nr_; Atomic_Boolean test_ok_; TestTopicSeq topic_seq_one_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp index a794a8b59a1..8422f4c5c97 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SL_OneByOne_SL_OneByOne_Connector_Impl</string> + <string>create_SL_OneByOne_SL_OneByOneConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SL_OneByOne_SL_OneByOne_Connector_Servant</string> + <string>create_SL_OneByOne_SL_OneByOneConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl b/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl index 493b3365380..a74dfa79159 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl @@ -14,7 +14,7 @@ module SetConnectorAttribute { component SetConnectorAttributeComponent { - port SetConnectorAttributeTestConn::DDS_Write info_write; + port SetConnectorAttributeTestConnector::DDS_Write info_write; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl index 53f741205e2..bbfe23ccdc7 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl @@ -18,10 +18,7 @@ module SetConnectorAttribute { module ::CCM_DDS::Typed < ::SetConnectorAttributeTest, ::SetConnectorAttributeTestSeq> - SetConnectorAttributeTestConn; - connector SetConnectorAttribute_Connector : SetConnectorAttributeTestConn::DDS_Event - { - }; + SetConnectorAttributeTestConnector; }; #endif /* SetConnectorAttribute_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp index a01302014d9..0b2fd7b689e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl</string> + <string>create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SetConnectorAttribute_SetConnectorAttribute_Connector_Servant</string> + <string>create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl index 888ebbf77d8..719580a2827 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl @@ -17,9 +17,9 @@ module SharedDP { component SharedDPComponent { - port CCM_DDS::SharedDPTest1::DDS_Write write1; - port CCM_DDS::SharedDPTest2::DDS_Write write2; - port CCM_DDS::SharedDPTest3::DDS_Write write3; + port SharedDP_Connector1::SharedDPTest1Connector::DDS_Write write1; + port SharedDP_Connector2::SharedDPTest2Connector::DDS_Write write2; + port SharedDP_Connector3::SharedDPTest3Connector::DDS_Write write3; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl index a81668b8a25..f1f2c60548e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector1/Connector1E.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1; -}; - module SharedDP_Connector1 { - connector Connector1 : ::CCM_DDS::SharedDPTest1::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl index fbb5820b808..a7e45ebdf75 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector2/Connector2E.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2; -}; - module SharedDP_Connector2 { - connector Connector2 : ::CCM_DDS::SharedDPTest2::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector; }; #endif /* SHARED_DP_CONNECTOR2_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl index 29e798d9350..75494f4ddc2 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector3/Connector3E.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3; -}; - module SharedDP_Connector3 { - connector Connector3 : ::CCM_DDS::SharedDPTest3::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector; }; #endif /* SHARED_DP_CONNECTOR3_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp index a8991de43aa..751ca832e2e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp @@ -18,7 +18,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector1_Connector1_Impl</string> + <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -29,7 +29,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector1_Connector1_Servant</string> + <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -69,7 +69,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector2_Connector2_Impl</string> + <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -80,7 +80,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector2_Connector2_Servant</string> + <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -120,7 +120,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector3_Connector3_Impl</string> + <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -131,7 +131,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector3_Connector3_Servant</string> + <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl index d86e77e5a5d..4f88ee53bb2 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl @@ -15,10 +15,10 @@ module SharedDP { component SharedDPComponent { - port CCM_DDS::SharedDPTest::DDS_Write write1; - port CCM_DDS::SharedDPTest::DDS_Write write2; - port CCM_DDS::SharedDPTest::DDS_Write write3; - port CCM_DDS::SharedDPTest::DDS_Write write4; + port SharedDPTestConnector::DDS_Write write1; + port SharedDPTestConnector::DDS_Write write2; + port SharedDPTestConnector::DDS_Write write3; + port SharedDPTestConnector::DDS_Write write4; attribute boolean perform_test; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl index 11d4d0cc409..f16a853aa20 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/ConnectorE.idl" -module CCM_DDS +module SharedDP { - module ::CCM_DDS::Typed < ::SharedDPTest, ::SharedDPTestSeq> SharedDPTest; -}; - -module SharedDP_Connector -{ - connector SDP_Connector : ::CCM_DDS::SharedDPTest::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::SharedDPTest, ::SharedDPTestSeq> SharedDPTestConnector; }; #endif /* SHARED_DP_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp index 7c10cb028b9..2608b00fc61 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp @@ -18,7 +18,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector_SDP_Connector_Impl</string> + <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -29,7 +29,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector_SDP_Connector_Servant</string> + <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp index 56628402110..1087e6683d2 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp @@ -18,7 +18,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector_SDP_Connector_Impl</string> + <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -29,7 +29,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector_SDP_Connector_Servant</string> + <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl index 268dd4acae6..b95def0041c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/State_Connection_Test_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::State_ConnectionTest, ::State_ConnectionTestSeq> State_ConnectionTest; -}; - module State_Connection_Test { - connector State_Connection_Test_Connector : ::CCM_DDS::State_ConnectionTest::DDS_State - { - }; + module ::CCM_DDS::Typed < ::State_ConnectionTest, ::State_ConnectionTestSeq> State_ConnectionTestConnector; }; #endif /* State_Connection_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl index e38088656f4..937bb95b523 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl @@ -14,10 +14,10 @@ module State_Connection_Test { component Receiver { - port CCM_DDS::State_ConnectionTest::DDS_Read info_read; - port CCM_DDS::State_ConnectionTest::DDS_Get info_get; - port CCM_DDS::State_ConnectionTest::DDS_Listen info_listen; - port CCM_DDS::State_ConnectionTest::DDS_StateListen info_statelisten; + port State_ConnectionTestConnector::DDS_Read info_read; + port State_ConnectionTestConnector::DDS_Get info_get; + port State_ConnectionTestConnector::DDS_Listen info_listen; + port State_ConnectionTestConnector::DDS_StateListen info_statelisten; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp index 0575753bcb9..26bd2797229 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp @@ -61,11 +61,15 @@ namespace CIAO_State_Connection_Test_Receiver_Impl } //Provides for DDS_Listen - ::CCM_DDS::State_ConnectionTest::CCM_Listener_ptr + ::State_Connection_Test + ::State_ConnectionTestConnector + ::CCM_Listener_ptr Receiver_exec_i::get_info_listen_data_listener () { this->listen_data_listener_created_ = true; - return ::CCM_DDS::State_ConnectionTest::CCM_Listener::_nil (); + return ::State_Connection_Test + ::State_ConnectionTestConnector + ::CCM_Listener::_nil (); } ::CCM_DDS::CCM_PortStatusListener_ptr @@ -76,11 +80,15 @@ namespace CIAO_State_Connection_Test_Receiver_Impl } //Provides for DDS_StateListen - ::CCM_DDS::State_ConnectionTest::CCM_StateListener_ptr + ::State_Connection_Test + ::State_ConnectionTestConnector + ::CCM_StateListener_ptr Receiver_exec_i::get_info_statelisten_data_listener (void) { this->statelisten_data_listener_created_ = true; - return ::CCM_DDS::State_ConnectionTest::CCM_StateListener::_nil (); + return ::State_Connection_Test + ::State_ConnectionTestConnector + ::CCM_StateListener::_nil (); } ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h index 55c7cc0ec50..33e4528623e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h @@ -30,17 +30,26 @@ namespace CIAO_State_Connection_Test_Receiver_Impl //Provides for DDS_Read virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_read_status (void); + //Provides for DDS_Get virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_get_status (void); + //Provides for DDS_Listen - virtual ::CCM_DDS::State_ConnectionTest::CCM_Listener_ptr + virtual ::State_Connection_Test + ::State_ConnectionTestConnector + ::CCM_Listener_ptr get_info_listen_data_listener (); + virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_listen_status (void); + //Provides for DDS_StateListen - virtual ::CCM_DDS::State_ConnectionTest::CCM_StateListener_ptr + virtual ::State_Connection_Test + ::State_ConnectionTestConnector + ::CCM_StateListener_ptr get_info_statelisten_data_listener (void); + virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_statelisten_status (void); @@ -59,23 +68,28 @@ namespace CIAO_State_Connection_Test_Receiver_Impl private: ::State_Connection_Test::CCM_Receiver_Context_var context_; //DDS_Read - ::CCM_DDS::State_ConnectionTest::Reader_var reader_data_; - ::DDS::DataReader_var reader_dds_entity_; + ::State_Connection_Test::State_ConnectionTestConnector + ::Reader_var reader_data_; + ::DDS::DataReader_var reader_dds_entity_; //DDS_Get - ::CCM_DDS::State_ConnectionTest::Reader_var getter_data_; - ::CCM_DDS::State_ConnectionTest::Getter_var getter_fresh_data_; - ::DDS::DataReader_var getter_dds_entity_; + ::State_Connection_Test::State_ConnectionTestConnector + ::Reader_var getter_data_; + ::State_Connection_Test::State_ConnectionTestConnector + ::Getter_var getter_fresh_data_; + ::DDS::DataReader_var getter_dds_entity_; //DDS_Listen - ::CCM_DDS::State_ConnectionTest::Reader_var listen_data_; - ::CCM_DDS::DataListenerControl_var listen_data_control_; - ::DDS::DataReader_var listen_dds_entity_; + ::State_Connection_Test::State_ConnectionTestConnector + ::Reader_var listen_data_; + ::CCM_DDS::DataListenerControl_var listen_data_control_; + ::DDS::DataReader_var listen_dds_entity_; //DDS_StateListen - ::CCM_DDS::State_ConnectionTest::Reader_var statelisten_data_; - ::CCM_DDS::StateListenerControl_var statelisten_data_control_; - ::DDS::DataReader_var statelisten_dds_entity_; + ::State_Connection_Test::State_ConnectionTestConnector + ::Reader_var statelisten_data_; + ::CCM_DDS::StateListenerControl_var statelisten_data_control_; + ::DDS::DataReader_var statelisten_dds_entity_; //DDS_Read bool reader_data_ok_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl index 6fdd94e698c..495b24cb54e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl @@ -16,7 +16,7 @@ module State_Connection_Test { component Sender { - port CCM_DDS::State_ConnectionTest::DDS_Update info_update; + port State_ConnectionTestConnector::DDS_Update info_update; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h index 3835b874c21..8460e37dc0d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h @@ -37,8 +37,10 @@ namespace CIAO_State_Connection_Test_Sender_Impl private: ::State_Connection_Test::CCM_Sender_Context_var context_; - CCM_DDS::State_ConnectionTest::Updater_var updater_; - DDS::DataWriter_var updater_dds_datawriter_; + ::State_Connection_Test + ::State_ConnectionTestConnector + ::Updater_var updater_; + ::DDS::DataWriter_var updater_dds_datawriter_; bool updater_ok_; bool updater_dds_datawriter_ok_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp index a601edd7010..8c6eeeb618e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_State_Connection_Test_State_Connection_Test_Connector_Impl</string> + <string>create_State_Connection_Test_State_ConnectionTestConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_State_Connection_Test_State_Connection_Test_Connector_Servant</string> + <string>create_State_Connection_Test_State_ConnectionTestConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl index 766783208bf..d382e20e91e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl @@ -17,15 +17,8 @@ module TT_Connector { - module ::CCM_DDS::Typed < HelloTopic, HelloTopicSeq> HelloConn; - connector TwoTopicsHello_Connector : HelloConn::DDS_Event - { - }; - - module ::CCM_DDS::Typed < GoodbyeTopic, GoodbyeTopicSeq> GoodbyeConn; - connector TwoTopicsGoodbye_Connector : GoodbyeConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < HelloTopic, HelloTopicSeq> HelloConnector; + module ::CCM_DDS::Typed < GoodbyeTopic, GoodbyeTopicSeq> GoodbyeConnector; }; #endif /* TWOTOPICS_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl index e873178dd86..c18f3535053 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl @@ -21,46 +21,28 @@ module Hello { // Hello connector - module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> HelloConn; - connector Hello_Connector : HelloConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> HelloConnector; }; module Goodbye { // Goodbye connector - module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> GoodbyeConn; - connector Goodbye_Connector : GoodbyeConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> GoodbyeConnector; }; module HelloGoodbye { // Hello connector - module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConn; - connector Hello_Connector : HelloConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector; // Goodbye connector - module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConn; - connector Goodbye_Connector : GoodbyeConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector; }; // Hello connector -module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConn; -connector Hello_Connector : HelloConn::DDS_Event -{ -}; +module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector; // Goodbye connector -module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConn; -connector Goodbye_Connector : GoodbyeConn::DDS_Event -{ -}; +module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector; #endif /* CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl index d59543e6501..411ee4f9976 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/Unkeyed_Test_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::UnkeyedTest, ::UnkeyedTestSeq> UnkeyedTest; -}; - module Unkeyed_Test { - connector Unkeyed_Test_Connector : ::CCM_DDS::UnkeyedTest::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::UnkeyedTest, ::UnkeyedTestSeq> UnkeyedTestConnector; }; #endif /* Unkeyed_Test_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl index 1729bbe238f..151a1f5f012 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl @@ -14,7 +14,7 @@ module Unkeyed_Test { component Receiver { - port CCM_DDS::UnkeyedTest::DDS_Listen info_out; + port UnkeyedTestConnector::DDS_Listen info_out; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; attribute unsigned short iterations; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp index 6fc273d1eae..fdcf036dc63 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp @@ -144,7 +144,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl } // Port operations. - ::CCM_DDS::UnkeyedTest::CCM_Listener_ptr + ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new UnkeyedTest RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h index 426ca0a9428..5966bd15742 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h @@ -48,7 +48,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl }; class RECEIVER_EXEC_Export UnkeyedTest_Listener_exec_i - : public virtual ::CCM_DDS::UnkeyedTest::CCM_Listener, + : public virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -81,7 +81,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl virtual void iterations (::CORBA::UShort iterations); // Port operations. - virtual ::CCM_DDS::UnkeyedTest::CCM_Listener_ptr + virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -103,8 +103,8 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl private: ::Unkeyed_Test::CCM_Receiver_Context_var context_; - ::CCM_DDS::UnkeyedTest::Reader_var reader_; - ::CCM_DDS::UnkeyedTest::Getter_var getter_; + ::Unkeyed_Test::UnkeyedTestConnector::Reader_var reader_; + ::Unkeyed_Test::UnkeyedTestConnector::Getter_var getter_; CORBA::UShort iterations_; Atomic_ULong received_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl index a75a12c8e54..12b010be1cb 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl @@ -16,7 +16,7 @@ module Unkeyed_Test { component Sender { - port CCM_DDS::UnkeyedTest::DDS_Write info_write; + port UnkeyedTestConnector::DDS_Write info_write; attribute unsigned short rate; attribute unsigned short iterations; attribute unsigned short keys; diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h index fb9d5a9bab8..7c2e4ce06cf 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h @@ -68,7 +68,7 @@ namespace CIAO_Unkeyed_Test_Sender_Impl void start (void); void stop (void); - CCM_DDS::UnkeyedTest::Writer_var writer_; + ::Unkeyed_Test::UnkeyedTestConnector::Writer_var writer_; pulse_Generator * ticker_; ::Unkeyed_Test::CCM_Sender_Context_var context_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp index a8886179aec..0a8bffb617c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Unkeyed_Test_Unkeyed_Test_Connector_Impl</string> + <string>create_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Unkeyed_Test_Unkeyed_Test_Connector_Servant</string> + <string>create_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl index a5894738606..19f4ef12391 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/Writer_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTest; -}; - module Writer { - connector Writer_Connector : ::CCM_DDS::WriterTest::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector; }; #endif /* Writer_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl index e42f3efc798..c0a984b68fd 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl @@ -14,7 +14,7 @@ module Writer { component Receiver { - port CCM_DDS::WriterTest::DDS_Listen info_out; + port WriterTestConnector::DDS_Listen info_out; attribute unsigned short iterations; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp index fd1e853f12a..7d29f92716d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp @@ -74,7 +74,7 @@ namespace CIAO_Writer_Receiver_Impl } // Port operations. - ::CCM_DDS::WriterTest::CCM_Listener_ptr + ::Writer::WriterTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new WriterTest RAW listener\n"))); diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h index d1f941be18c..6df60e67c59 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h @@ -19,7 +19,7 @@ namespace CIAO_Writer_Receiver_Impl { class RECEIVER_EXEC_Export WriterTest_Listener_exec_i - : public virtual ::CCM_DDS::WriterTest::CCM_Listener, + : public virtual ::Writer::WriterTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -52,7 +52,7 @@ namespace CIAO_Writer_Receiver_Impl virtual void iterations (::CORBA::UShort iterations); // Port operations. - virtual ::CCM_DDS::WriterTest::CCM_Listener_ptr + virtual ::Writer::WriterTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl index eebc31419e2..e34fa5d405c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl @@ -16,7 +16,7 @@ module Writer { component Sender { - port CCM_DDS::WriterTest::DDS_Write info_write; + port WriterTestConnector::DDS_Write info_write; attribute unsigned short rate; attribute unsigned short iterations; attribute unsigned short keys; diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h index ead020fedfe..bf11d1c138b 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h @@ -75,7 +75,7 @@ namespace CIAO_Writer_Sender_Impl void start (void); void stop (void); - CCM_DDS::WriterTest::Writer_var writer_; + ::Writer::WriterTestConnector::Writer_var writer_; pulse_Generator * ticker_; ::Writer::CCM_Sender_Context_var context_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp index 88c24d90338..a44fb1f0683 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Impl</string> + <string>create_Writer_WriterTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Servant</string> + <string>create_Writer_WriterTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl index 1e93838fe70..25e73c0d784 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/Updater_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopic; -}; - module Updater { - connector Updater_Connector : ::CCM_DDS::TestTopic::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> UpdaterConnector; }; #endif /* UPDATER_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl index 1a819121236..3cc8ff84e8e 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl @@ -14,7 +14,7 @@ module Updater { component Receiver { - port CCM_DDS::TestTopic::DDS_Listen info_out; + port UpdaterConnector::DDS_Listen info_out; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp index 5402c553baf..ffeaad6efb3 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp @@ -82,8 +82,8 @@ namespace CIAO_Updater_Receiver_Impl return ::CCM_DDS::CCM_PortStatusListener::_nil (); } - ::CCM_DDS::TestTopic::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) + ::Updater::UpdaterConnector::CCM_Listener_ptr + Receiver_exec_i::get_info_out_data_listener (void) { return new ListenOneByOneTest_Listener_exec_i ( this->thread_id_listener_); diff --git a/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h index 3d7dfb09a7d..e86084c4eff 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h @@ -28,7 +28,7 @@ namespace CIAO_Updater_Receiver_Impl // ListenOneByOneTest_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export ListenOneByOneTest_Listener_exec_i - : public virtual ::CCM_DDS::TestTopic::CCM_Listener, + : public virtual ::Updater::UpdaterConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -59,7 +59,7 @@ namespace CIAO_Updater_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::TestTopic::CCM_Listener_ptr + virtual ::Updater::UpdaterConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl index 8ca5811a426..183905fc832 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl @@ -16,7 +16,7 @@ module Updater { component Sender { - port CCM_DDS::TestTopic::DDS_Update test_topic_update; + port UpdaterConnector::DDS_Update test_topic_update; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h b/modules/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h index 3a900367ac4..a07d1874404 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h @@ -80,7 +80,7 @@ namespace CIAO_Updater_Sender_Impl pulse_Generator * ticker_; ::Updater::CCM_Sender_Context_var context_; - CCM_DDS::TestTopic::Updater_var updater_; + ::Updater::UpdaterConnector::Updater_var updater_; UPDATER_TEST test_nr_; Atomic_Boolean test_ok_; TestTopicSeq topic_seq_one_; diff --git a/modules/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp index 2cb74af488c..9135607f897 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Updater_Updater_Connector_Impl</string> + <string>create_Updater_UpdaterConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Updater_Updater_Connector_Servant</string> + <string>create_Updater_UpdaterConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl index 37ca6e60444..36118b660c7 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl @@ -16,10 +16,7 @@ module VTopic { - module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConn; - connector VT_Array_Connector : TopicArrayConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector; }; #endif /* VT_ARRAY_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl index 6ce6854d245..33b890e8911 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl @@ -16,10 +16,7 @@ module VTopic { - module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConn; - connector VT_Seq_Connector : TopicSeqConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector; }; #endif /* VTopic_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl index eaf5964090d..dd2a013a93d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl @@ -16,10 +16,7 @@ module VTopic { - module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConn; - connector VT_String_Connector : TopicStringConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector; }; #endif /* VTopic_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl index 263bc47e583..abcc5d331dd 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl @@ -16,10 +16,7 @@ module VTopic { - module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConn; - connector VT_Union_Connector : TopicUnionConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector; }; #endif /* VT_UNION_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl index c17f1e0ffd2..29658b57728 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl @@ -16,10 +16,7 @@ module VTopic { - module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConn; - connector VT_Valuetype_Connector : TopicValuetypeConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConnector; }; #endif /* VT_VALUETYPE_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl index bc2b73833b6..41b013feb53 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl @@ -16,10 +16,7 @@ module VTopic { - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConn; - connector VTopic_Connector : TestTopicConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector; }; #endif /* VTopic_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl index 8f24ce55e4f..75fa7401c11 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl @@ -14,7 +14,7 @@ module VTopic { component Receiver { - port TestTopicConn::DDS_Listen info_out; + port TestTopicConnector::DDS_Listen info_out; provides CCM_DDS::ConnectorStatusListener connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp index 1fb3279de8a..d50ca32ae67 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp @@ -85,16 +85,16 @@ namespace CIAO_VTopic_Receiver_Impl return new ConnectorStatusListener_exec_i (this->subscription_matched_); } - CCM_DDS::CCM_PortStatusListener_ptr + ::CCM_DDS::CCM_PortStatusListener_ptr Receiver_exec_i::get_info_out_status (void) { return CCM_DDS::CCM_PortStatusListener::_nil (); } - VTopic::TestTopicConn::CCM_Listener_ptr + ::VTopic::TestTopicConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { - return VTopic::TestTopicConn::CCM_Listener::_nil (); + return ::VTopic::TestTopicConnector::CCM_Listener::_nil (); } diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h index d9f91b7bc87..88f3a21147d 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h @@ -66,10 +66,10 @@ namespace CIAO_VTopic_Receiver_Impl virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr get_connector_status (void); - virtual CCM_DDS::CCM_PortStatusListener_ptr + virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_out_status (void); - virtual VTopic::TestTopicConn::CCM_Listener_ptr + virtual ::VTopic::TestTopicConnector::CCM_Listener_ptr get_info_out_data_listener (void); // Operations from Components::SessionComponent. diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl index 175a69a14d6..9a58bfefead 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl @@ -16,7 +16,7 @@ module VTopic { component Sender { - port TestTopicConn::DDS_Write info_write; + port TestTopicConnector::DDS_Write info_write; provides CCM_DDS::ConnectorStatusListener connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp index d430983f344..c64aa5ef4f9 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VTopic_Connector_Impl</string> + <string>create_VTopic_TestTopicConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VTopic_Connector_Servant</string> + <string>create_VTopic_TestTopicConnector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -123,7 +123,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_String_Connector_Impl</string> + <string>create_VTopic_TopicStringConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -134,7 +134,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_String_Connector_Servant</string> + <string>create_VTopic_TopicStringConnector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -175,7 +175,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_Array_Connector_Impl</string> + <string>create_VTopic_TopicArrayConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -186,7 +186,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_Array_Connector_Servant</string> + <string>create_VTopic_TopicArrayConnector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -227,7 +227,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_Valuetype_Connector_Impl</string> + <string>create_VTopic_TopicValuetypeConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -238,7 +238,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_Valuetype_Connector_Servant</string> + <string>create_VTopic_TopicValuetypeConnector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -279,7 +279,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_Union_Connector_Impl</string> + <string>create_VTopic_TopicUnionConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -290,7 +290,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_Union_Connector_Servant</string> + <string>create_VTopic_TopicUnionConnector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -331,7 +331,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_Seq_Connector_Impl</string> + <string>create_VTopic_TopicSeqConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -342,7 +342,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopic_VT_Seq_Connector_Servant</string> + <string>create_VTopic_TopicSeqConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl index 47160c4f29d..5132fb6e7aa 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl @@ -16,10 +16,7 @@ module VTopics { - module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConn; - connector VTS_Array_Connector : TopicArrayConn::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector; }; #endif /* VTS_Array_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl index 4d2ef4d08cb..c2904917eae 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl @@ -16,10 +16,7 @@ module VTopics { - module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConn; - connector VTS_Seq_Connector : TopicSeqConn::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector; }; #endif /* VTS_SEQ_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl index c3c0736f42d..293e6fef3d2 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl @@ -16,10 +16,7 @@ module VTopics { - module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConn; - connector VTS_String_Connector : TopicStringConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector; }; #endif /* VTS_STRING_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl index 435b3b84eb9..0e6afd7bbec 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl @@ -16,10 +16,7 @@ module VTopic { - module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConn; - connector VT_Union_Connector : TopicUnionConn::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector; }; #endif /* VT_UNION_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl index 6d61eb185d0..76088897b05 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl @@ -16,10 +16,7 @@ module VTopics { - module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConn; - connector VTS_Valuetype_Connector : TopicValuetypeConn::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConnector; }; #endif /* VTS_VALUE_TYPE_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl index cd1748ae3b1..c0b7cd37f7c 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl @@ -16,10 +16,7 @@ module VTopics { - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConn; - connector VTopics_Connector : TestTopicConn::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector; }; #endif /* VTopics_CONNECTOR_IDL_ */ diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl index de6eabc74dd..ea89d91eaf7 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl @@ -14,7 +14,7 @@ module VTopics { component Receiver { - port TestTopicConn::DDS_Listen info_out; + port TestTopicConnector::DDS_Listen info_out; provides CCM_DDS::ConnectorStatusListener connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp index b822e6548ab..81f4d6f1fd5 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp @@ -84,10 +84,10 @@ namespace CIAO_VTopics_Receiver_Impl return new ConnectorStatusListener_exec_i (this->subscription_matched_); } - VTopics::TestTopicConn::CCM_Listener_ptr + ::VTopics::TestTopicConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { - return VTopics::TestTopicConn::CCM_Listener::_nil (); + return ::VTopics::TestTopicConnector::CCM_Listener::_nil (); } CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h index 5a611357d68..2922198c855 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h @@ -64,7 +64,7 @@ namespace CIAO_VTopics_Receiver_Impl virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr get_connector_status (void); - virtual VTopics::TestTopicConn::CCM_Listener_ptr + virtual ::VTopics::TestTopicConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual CCM_DDS::CCM_PortStatusListener_ptr diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl index aa69235d695..b0ff9966665 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl @@ -16,7 +16,7 @@ module VTopics { component Sender { - port TestTopicConn::DDS_Update info_write; + port TestTopicConnector::DDS_Update info_write; provides CCM_DDS::ConnectorStatusListener connector_status; }; }; diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp index d2a09c3cb23..f25c4b1d69f 100644 --- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp +++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopics_VTopics_Connector_Impl</string> + <string>create_VTopics_TestTopicConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopics_VTopics_Connector_Servant</string> + <string>create_VTopics_TestTopicConnector_DDS_State_Servant</string> </value> </value> </execParameter> @@ -123,7 +123,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopics_VTS_String_Connector_Impl</string> + <string>create_VTopics_TopicStringConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -134,7 +134,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopics_VTS_String_Connector_Servant</string> + <string>create_VTopics_TopicStringConnector_DDS_State_Servant</string> </value> </value> </execParameter> @@ -175,7 +175,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopics_VTS_Array_Connector_Impl</string> + <string>create_VTopics_TopicArrayConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -186,7 +186,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopics_VTS_Array_Connector_Servant</string> + <string>create_VTopics_TopicArrayConnector_DDS_State_Servant</string> </value> </value> </execParameter> @@ -227,7 +227,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopics_VTS_Seq_Connector_Impl</string> + <string>create_VTopics_TopicSeqConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -238,7 +238,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_VTopics_VTS_Seq_Connector_Servant</string> + <string>create_VTopics_TopicSeqConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/modules/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/modules/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc index 4805a2137bd..20298d45b51 100644 --- a/modules/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc +++ b/modules/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc @@ -3,7 +3,7 @@ project(BMClosedED_idl_gen) : componentidldefaults { custom_only = 1 after += BasicSP_idl_gen - idlflags += -I $(CIAO_ROOT)/examples/BasicSP \ + idlflags += -I.. \ -Wb,stub_export_macro=BMCLOSEDED_STUB_Export \ -Wb,stub_export_include=BMClosedED_stub_export.h \ -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export \ @@ -21,7 +21,7 @@ project(BMClosedED_lem_gen) : ciaoidldefaults { custom_only = 1 idlflags += -Wb,export_macro=BMCLOSEDED_EXEC_Export \ -Wb,export_include=BMClosedED_exec_export.h \ - -SS -I $(CIAO_ROOT)/examples/BasicSP + -SS -I.. IDL_Files { BMClosedEDE.idl @@ -33,7 +33,7 @@ project(BMClosedED_stub): ccm_stub { libpaths += ../lib after += BasicSP_stub BasicSP_lem_gen BMClosedED_idl_gen sharedname = BMClosedED_stub - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. libs += BasicSP_stub dynamicflags = BMCLOSEDED_STUB_BUILD_DLL @@ -57,7 +57,7 @@ project(BMClosedED_exec) : ciao_executor { sharedname = BMClosedED_exec libs += BMClosedED_stub libs += BasicSP_stub BasicSP_exec - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. libout = ../lib libpaths += ../lib @@ -84,7 +84,7 @@ project(BMClosedED_exec) : ciao_executor { project(BMClosedED_svnt) : ciao_servant { after += BasicSP_svnt BMClosedED_exec BasicSP_exec - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. sharedname = BMClosedED_svnt diff --git a/modules/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/modules/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc index b3c3a377bd5..5394d40fe49 100644 --- a/modules/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc +++ b/modules/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc @@ -3,7 +3,7 @@ project(BMDevice_idl_gen): componentidldefaults { custom_only = 1 after += BasicSP_idl_gen - idlflags += -I $(CIAO_ROOT)/examples/BasicSP \ + idlflags += -I.. \ -Wb,stub_export_macro=BMDEVICE_STUB_Export \ -Wb,stub_export_include=BMDevice_stub_export.h \ -Wb,skel_export_macro=BMDEVICE_SVNT_Export \ @@ -22,7 +22,7 @@ project(BMDevice_lem_gen) : ciaoidldefaults { idlflags += -Wb,export_macro=BMDEVICE_EXEC_Export \ -Wb,export_include=BMDevice_exec_export.h \ -SS \ - -I $(CIAO_ROOT)/examples/BasicSP + -I .. IDL_Files { BMDeviceE.idl @@ -34,7 +34,7 @@ project(BMDevice_stub): ccm_stub { libpaths += ../lib after += BasicSP_stub BMDevice_idl_gen sharedname = BMDevice_stub - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. libs += BasicSP_stub @@ -63,7 +63,7 @@ project(BMDevice_exec) : ciao_executor { libout = ../lib libpaths += ../lib - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. dynamicflags = BMDEVICE_EXEC_BUILD_DLL @@ -87,7 +87,7 @@ project(BMDevice_exec) : ciao_executor { project(BMDevice_svnt) : ciao_servant { after += BasicSP_svnt BMDevice_exec BasicSP_exec - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. sharedname = BMDevice_svnt diff --git a/modules/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/modules/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc index c3e3f300173..3cea12c030c 100644 --- a/modules/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc +++ b/modules/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc @@ -2,7 +2,7 @@ project(BMDisplay_idl_gen): componentidldefaults,anytypecode { custom_only = 1 - idlflags += -I $(CIAO_ROOT)/examples/BasicSP \ + idlflags += -I.. \ -Wb,stub_export_macro=BMDISPLAY_STUB_Export \ -Wb,stub_export_include=BMDisplay_stub_export.h \ -Wb,skel_export_macro=BMDISPLAY_SVNT_Export \ @@ -19,7 +19,7 @@ project(BMDisplay_lem_gen) : ciaoidldefaults { after += BasicSP_lem_gen BMDisplay_idl_gen custom_only = 1 - idlflags += -I $(CIAO_ROOT)/examples/BasicSP \ + idlflags += -I.. \ -Wb,export_macro=BMDISPLAY_EXEC_Export \ -Wb,export_include=BMDisplay_exec_export.h \ -SS @@ -33,7 +33,7 @@ project(BMDisplay_lem_gen) : ciaoidldefaults { project(BMDisplay_stub): ccm_stub { after += BasicSP_stub BMDisplay_idl_gen sharedname = BMDisplay_stub - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. libout = ../lib libpaths += ../lib @@ -63,7 +63,7 @@ project(BMDisplay_exec) : ciao_executor { sharedname = BMDisplay_exec libs += BMDisplay_stub libs += BasicSP_stub - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. libout = ../lib libpaths += ../lib @@ -89,7 +89,7 @@ project(BMDisplay_exec) : ciao_executor { project(BMDisplay_svnt) : ciao_servant { after += BasicSP_svnt BMDisplay_exec - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. sharedname = BMDisplay_svnt diff --git a/modules/CIAO/examples/BasicSP/EC/EC.mpc b/modules/CIAO/examples/BasicSP/EC/EC.mpc index ee27913422c..10bc2593f83 100644 --- a/modules/CIAO/examples/BasicSP/EC/EC.mpc +++ b/modules/CIAO/examples/BasicSP/EC/EC.mpc @@ -2,7 +2,7 @@ project(EC_idl_gen): componentidldefaults { custom_only = 1 - idlflags += -I $(CIAO_ROOT)/examples/BasicSP \ + idlflags += -I.. \ -Wb,stub_export_macro=EC_STUB_Export \ -Wb,stub_export_include=EC_stub_export.h \ -Wb,skel_export_macro=EC_SVNT_Export \ @@ -22,7 +22,7 @@ project(EC_lem_gen) : ciaoidldefaults { idlflags += -Wb,export_macro=EC_EXEC_Export \ -Wb,export_include=EC_exec_export.h \ -SS \ - -I $(CIAO_ROOT)/examples/BasicSP + -I.. IDL_Files { ECE.idl @@ -32,7 +32,7 @@ project(EC_lem_gen) : ciaoidldefaults { project(EC_stub): ccm_stub { after += BasicSP_stub EC_idl_gen sharedname = EC_stub - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. libpaths += .. libout = ../lib libpaths += ../lib @@ -61,7 +61,7 @@ project(EC_exec) : ciao_executor { after += EC_stub EC_lem_gen sharedname = EC_exec libs += EC_stub BasicSP_stub - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. libout = ../lib libpaths += ../lib @@ -87,7 +87,7 @@ project(EC_exec) : ciao_executor { project(EC_svnt) : ciao_servant { after += BasicSP_svnt EC_exec - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. sharedname = EC_svnt @@ -116,7 +116,7 @@ project (EC_client) : ccm_stub { after += EC_stub exename = client libs += EC_stub BasicSP_stub - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. libout = ../lib libpaths += ../lib @@ -137,7 +137,7 @@ project (EC_client) : ccm_stub { project (EC_controller) : ccm_stub { after += EC_stub exename = controller - includes += $(CIAO_ROOT)/examples/BasicSP + includes += .. libs += EC_stub BasicSP_stub libout = ../lib libpaths += ../lib diff --git a/modules/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl b/modules/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl index 69a6b9f6eba..8cbb28298b4 100644 --- a/modules/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl +++ b/modules/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl @@ -173,6 +173,43 @@ connector Comp3_T module B::second_B<iface, ifaceSeq> second_B_Inst; +module H +{ + module Nested_H<typename T, sequence <T> TSeq> + { + alias A::Nested<T, TSeq> NestedA; + interface B + { + void send (in T arg); + }; + connector Y + { + provides B myport; + provides NestedA::XX myxx; + }; + }; +}; + +module I +{ + module Nested_I<typename T, sequence <T> TSeq> + { + alias A::Nested<T, TSeq> NestedA; + interface B + { + void send (in T arg); + }; + connector Y + { + provides B myport; + provides NestedA::XX myxx; + }; + }; +}; + +module H::Nested_H<iface, ifaceSeq> nested_H_inst; +module I::Nested_I<iface, ifaceSeq> nested_I_inst; + module Ast<typename T, eventtype E, exception S, @@ -284,6 +321,20 @@ module M }; }; +module T +{ + struct X + { + unsigned long Z; + }; + typedef sequence <X> XSeq; +}; + +/// An instantiated template module can be a reopening +/// of an existing module. +module ::M::N < ::T::X> T; + + /* Support for native is there, but this results in non compiling code native NAT; diff --git a/modules/CIAO/tests/IDL_Test/IDL3_Plus/README b/modules/CIAO/tests/IDL_Test/IDL3_Plus/README index 5707a8d5bbb..73e6bf65d20 100644 --- a/modules/CIAO/tests/IDL_Test/IDL3_Plus/README +++ b/modules/CIAO/tests/IDL_Test/IDL3_Plus/README @@ -12,12 +12,3 @@ a wide variety of template-related IDL3+ constructs: - use of template parameters in contained IDL declarations - referenced template module usong 'alias' keyword - instantiated template module - -Currently only the TAO_IDL front end supports IDL3+ -template-related constructs, so this test covers parsing -and AST building only. As implementation proceeds on -the corresponding back end support, code generation, -compiling and linking will also be tested. - -Jeff Parsons -December 17, 2009 diff --git a/modules/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc b/modules/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc index 17431c6af2f..1887b42b476 100644 --- a/modules/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc +++ b/modules/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(TAO_IDL3_TO_IDL2_BE) : acelib, install, ciao_output, tao_idl_fe { +project(TAO_IDL3_TO_IDL2_BE) : acelib, install_lib, ciao_output, tao_idl_fe { sharedname = TAO_IDL3_TO_IDL2_BE dynamicflags = TAO_IDL3_TO_IDL2_BE_BUILD_DLL @@ -65,4 +65,9 @@ project(TAO_IDL3_TO_IDL2_EXE) : aceexe, install, ciao_output, tao_idl_mcpp, tao_ Header_Files { $(TAO_ROOT)/TAO_IDL/include/drv_extern.h } + + verbatim(gnuace, postinstall) { +" @mkdir -p $(INSTALL_PREFIX)/share/ciao/bin" +" ln -sf $(INSTALL_PREFIX)/bin/tao_idl3_to_idl2 $(INSTALL_PREFIX)/share/ciao/bin" + } } diff --git a/modules/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc b/modules/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc index 57db9772560..09d649ebe48 100644 --- a/modules/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc +++ b/modules/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CIAO_IDL3_TO_XMI_BE) : acelib, install, ciao_output, ciao_xml_utils, tao_idl_fe { +project(CIAO_IDL3_TO_XMI_BE) : acelib, install_lib, ciao_output, ciao_xml_utils, tao_idl_fe { sharedname = CIAO_IDL3_TO_XMI_BE dynamicflags = CIAO_IDL3_TO_XMI_BUILD_DLL diff --git a/modules/CIAO/tools/XML/XML.mpc b/modules/CIAO/tools/XML/XML.mpc index 398f2cfdd55..ec0bd02ab2d 100644 --- a/modules/CIAO/tools/XML/XML.mpc +++ b/modules/CIAO/tools/XML/XML.mpc @@ -1,10 +1,18 @@ // $Id$ -project (CIAO_XML_Utils) : acelib, xerces, ciao_lib { +project (CIAO_XML_Utils) : install, acelib, xerces, ciao_lib { sharedname += CIAO_XML_Utils dynamicflags = CIAO_XML_UTILS_BUILD_DLL includes += .. + specific { + install_dir = tools/XML + } + + Header_Files { + CIAO_XML_Utils_Export.h + } + Source_Files { XML_Error_Handler.cpp XercesString.cpp |